64 lines
1.7 KiB
Diff
64 lines
1.7 KiB
Diff
diff -up argon2/src/Makevars.in.system argon2/src/Makevars.in
|
|
--- argon2/src/Makevars.in.system 2022-08-02 18:22:21.273766216 -0400
|
|
+++ argon2/src/Makevars.in 2022-08-02 18:23:16.861075821 -0400
|
|
@@ -1,13 +1,5 @@
|
|
-PKG_CFLAGS = $(SHLIB_OPENMP_CFLAGS) -I./argon2 @ADDL_CFLAGS@
|
|
-PKG_LIBS = $(SHLIB_OPENMP_CFLAGS)
|
|
-
|
|
-ARGON2_OBJS = \
|
|
- argon2/blake2/blake2b.o \
|
|
- argon2/argon2.o \
|
|
- argon2/core.o \
|
|
- argon2/encoding.o \
|
|
- argon2/@FILL_IMPL@ \
|
|
- argon2/thread.o
|
|
+PKG_CFLAGS = $(shell pkg-config --cflags libargon2) $(SHLIB_OPENMP_CFLAGS)
|
|
+PKG_LIBS = $(shell pkg-config --libs libargon2) -lb2 $(SHLIB_OPENMP_CFLAGS)
|
|
|
|
R_OBJS = \
|
|
argon2_native.o \
|
|
@@ -16,7 +8,7 @@ R_OBJS = \
|
|
pw_hash.o \
|
|
raw_as_char.o
|
|
|
|
-OBJECTS = $(ARGON2_OBJS) $(R_OBJS)
|
|
+OBJECTS = $(R_OBJS)
|
|
all: $(SHLIB)
|
|
$(SHLIB): $(OBJECTS)
|
|
|
|
diff -up argon2/src/pw_hash.c.system argon2/src/pw_hash.c
|
|
--- argon2/src/pw_hash.c.system 2022-08-02 18:24:09.600318328 -0400
|
|
+++ argon2/src/pw_hash.c 2022-08-02 18:24:55.957410456 -0400
|
|
@@ -25,7 +25,7 @@
|
|
*/
|
|
|
|
|
|
-#include "argon2/argon2.h"
|
|
+#include "argon2.h"
|
|
|
|
#include "common.h"
|
|
#include "random_uchars.h"
|
|
diff -up argon2/src/blake2.c.system argon2/src/blake2.c
|
|
--- argon2/src/blake2.c.system 2022-08-02 18:27:04.697443485 -0400
|
|
+++ argon2/src/blake2.c 2022-08-02 18:27:17.318740831 -0400
|
|
@@ -26,7 +26,7 @@
|
|
|
|
|
|
#include "common.h"
|
|
-#include "argon2/blake2/blake2.h"
|
|
+#include "blake2.h"
|
|
|
|
#define HASHLEN 64
|
|
|
|
diff -up argon2/src/raw_as_char.c.system argon2/src/raw_as_char.c
|
|
--- argon2/src/raw_as_char.c.system 2022-08-02 18:28:15.361108271 -0400
|
|
+++ argon2/src/raw_as_char.c 2022-08-02 18:28:40.613703208 -0400
|
|
@@ -30,7 +30,6 @@
|
|
#include <stdint.h>
|
|
|
|
#include "common.h"
|
|
-#include "argon2/blake2/blake2.h"
|
|
|
|
|
|
SEXP R_raw_as_char(SEXP rawvec_, SEXP upper_, SEXP spaces_)
|