Merge pull request #14 from bogdanadnan/dev

Dev
bogdanadnan · Jan 24, 2019 · 5b4b5e6 · 5b4b5e6
2 parents ddd6fe4 + 336821d
commit 5b4b5e6
Show file tree

Hide file tree

Showing 22 changed files with 1,241 additions and 543 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+################################################################################
+# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
+################################################################################
+
+.idea
+cmake-build-debug
diff --git a/algo-gate-api.c b/algo-gate-api.c
@@ -164,6 +164,7 @@ bool register_algo_gate( int algo, algo_gate_t *gate )
      case ALGO_ARGON2D250:   register_argon2d_crds_algo ( gate ); break;
      case ALGO_ARGON2D500:   register_argon2d_dyn_algo  ( gate ); break;
      case ALGO_ARGON2D4096:  register_argon2d4096_algo  ( gate ); break;
+     case ALGO_ARGON2AD:     register_argon2ad_urx_algo ( gate ); break;
 //     case ALGO_AXIOM:        register_axiom_algo        ( gate ); break;
      case ALGO_BASTION:      register_bastion_algo      ( gate ); break;
      case ALGO_BLAKE:        register_blake_algo        ( gate ); break;
@@ -294,6 +295,7 @@ const char* const algo_alias_map[][2] =
   { "argon2d-crds",      "argon2d250"   },
   { "argon2d-dyn",       "argon2d500"   },
   { "argon2d-uis",       "argon2d4096"  },
+  { "argon2ad-urx",      "argon2ad"     },
   { "bitcore",           "timetravel10" },
   { "bitzeny",           "yescryptr8"   },
   { "blake256r8",        "blakecoin"    },

diff --git a/algo/argon2/argon2d/argon2-gpu/CMakeLists.txt b/algo/argon2/argon2d/argon2-gpu/CMakeLists.txt
@@ -85,5 +85,5 @@ target_include_directories(argon2-opencl PRIVATE
     lib/argon2-opencl
 )
 target_link_libraries(argon2-opencl
-    argon2-gpu-common -lOpenCL
+    argon2-gpu-common ${OpenCL_LIBRARIES}
 )