Move "ec" directory to "crypto" and move openssl implementation into crypto/openssl directory.

CMakeLists.txt

@@ -18,7 +18,6 @@ set (PROGRAM_EXE ${CMAKE_PROJECT_NAME})
 
 set (PROGRAM_SOURCE
 	src/string.cpp
-	src/ec/openssl.cpp
 	src/base58.cpp
 	src/checksum.cpp
 	src/WIF.cpp
@@ -46,6 +45,7 @@ endif()
 
 # Libraries
 find_package(OpenSSL 1.1 REQUIRED)
+set (PROGRAM_SOURCE ${PROGRAM_SOURCE} src/crypto/openssl/ec.cpp)
 
 if (USE_THREADS)
 	find_package(Threads)

src/WIF.h

@@ -25,7 +25,7 @@
 #define EOSIOKEYGEN_WIF_H
 
 #include <string>
-#include "ec/types.h"
+#include "crypto/types.h"
 
 namespace eoskeygen {
 

src/benchmark.cpp

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 #include <chrono>
-#include "ec/generate.h"
+#include "crypto/ec.h"
 #include "benchmark.h"
 
 using std::chrono::steady_clock;

src/crypto/ec.h

@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef EOSIOKEYGEN_EC_GENERATE_H
+#ifndef EOSIOKEYGEN_CRYPTO_EC_H
-#define EOSIOKEYGEN_EC_GENERATE_H
+#define EOSIOKEYGEN_CRYPTO_EC_H
 
 #include "types.h"
 
@@ -36,4 +36,4 @@ int ec_generate_key(struct ec_keypair *pair);
 
 } // namespace eoskeygen
 
-#endif /* EOSIOKEYGEN_EC_GENERATE_H */
+#endif /* EOSIOKEYGEN_CRYPTO_EC_H */

src/crypto/openssl/ec.cpp

@@ -24,7 +24,7 @@
 #include <openssl/ec.h>
 #include <openssl/bn.h>
 #include <openssl/hmac.h>
-#include "generate.h"
+#include "../ec.h"
 
 namespace eoskeygen {
 

src/crypto/types.h

@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef EOSIOKEYGEN_EC_TYPES_H
+#ifndef EOSIOKEYGEN_CRYPTO_TYPES_H
-#define EOSIOKEYGEN_EC_TYPES_H
+#define EOSIOKEYGEN_CRYPTO_TYPES_H
 
 #include <array>
 
@@ -47,4 +47,4 @@ struct ec_keypair {
 
 } // namespace eoskeygen
 
-#endif /* EOSIOKEYGEN_EC_TYPES_H */
+#endif /* EOSIOKEYGEN_CRYPTO_TYPES_H */

src/key_search.cpp

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 #include <string>
-#include "ec/generate.h"
+#include "crypto/ec.h"
 #include "key_search_helpers.h"
 #include "key_search.h"
 

src/key_search_helpers.h

@@ -25,7 +25,7 @@
 #define EOSIOKEYGEN_KEY_SEARCH_HELPERS_H
 
 #include "string.h"
-#include "ec/types.h"
+#include "crypto/types.h"
 
 namespace eoskeygen {
 

src/key_search_mt.cpp

@@ -25,7 +25,7 @@
 #include <thread>
 #include <mutex>
 #include <vector>
-#include "ec/generate.h"
+#include "crypto/ec.h"
 #include "key_search_helpers.h"
 #include "key_search.h"
 

src/main.cpp

@@ -28,7 +28,7 @@
 #include <cstring>
 #include "string.h"
 #include "WIF.h"
-#include "ec/generate.h"
+#include "crypto/ec.h"
 #include "key_search.h"
 #include "benchmark.h"