@@ -68,6 +68,10 @@ nodist_noinst_HEADERS = \
68
68
crypt-hashes.h \
69
69
crypt-symbol-vers.h
70
70
noinst_HEADERS = \
71
+ lib/alg-argon2.h \
72
+ lib/alg-argon2-core.h \
73
+ lib/alg-argon2-encoding.h \
74
+ lib/alg-argon2-thread.h \
71
75
lib/alg-blake2b.h \
72
76
lib/alg-des.h \
73
77
lib/alg-gost3411-2012-const.h \
@@ -101,6 +105,11 @@ lib_LTLIBRARIES = \
101
105
libcrypt.la
102
106
103
107
libcrypt_la_SOURCES = \
108
+ lib/alg-argon2.c \
109
+ lib/alg-argon2-core.c \
110
+ lib/alg-argon2-encoding.c \
111
+ lib/alg-argon2-ref.c \
112
+ lib/alg-argon2-thread.c \
104
113
lib/alg-blake2b.c \
105
114
lib/alg-des-tables.c \
106
115
lib/alg-des.c \
@@ -116,6 +125,7 @@ libcrypt_la_SOURCES = \
116
125
lib/alg-sm3-hmac.c \
117
126
lib/alg-yescrypt-common.c \
118
127
lib/alg-yescrypt-opt.c \
128
+ lib/crypt-argon2.c \
119
129
lib/crypt-bcrypt.c \
120
130
lib/crypt-des.c \
121
131
lib/crypt-gensalt-static.c \
@@ -349,6 +359,9 @@ endif
349
359
# The list should otherwise be kept in alphabetical order.
350
360
351
361
check_PROGRAMS = \
362
+ test/ka-argon2d \
363
+ test/ka-argon2i \
364
+ test/ka-argon2id \
352
365
test/ka-bcrypt \
353
366
test/ka-bcrypt-a \
354
367
test/ka-bcrypt-x \
@@ -367,6 +380,7 @@ check_PROGRAMS = \
367
380
test/ka-sm3-yescrypt \
368
381
test/ka-sunmd5 \
369
382
test/ka-yescrypt \
383
+ test/alg-argon2 \
370
384
test/alg-blake2b \
371
385
test/alg-des \
372
386
test/alg-gost3411-2012 \
@@ -401,6 +415,9 @@ check_PROGRAMS = \
401
415
402
416
# All of the known-answer tests are compiled from the same source file,
403
417
# with different macros defined.
418
+ test_ka_argon2d_SOURCES = test/ka-tester.c
419
+ test_ka_argon2i_SOURCES = test/ka-tester.c
420
+ test_ka_argon2id_SOURCES = test/ka-tester.c
404
421
test_ka_bcrypt_SOURCES = test/ka-tester.c
405
422
test_ka_bcrypt_a_SOURCES = test/ka-tester.c
406
423
test_ka_bcrypt_x_SOURCES = test/ka-tester.c
@@ -420,6 +437,9 @@ test_ka_sm3_yescrypt_SOURCES = test/ka-tester.c
420
437
test_ka_sunmd5_SOURCES = test/ka-tester.c
421
438
test_ka_yescrypt_SOURCES = test/ka-tester.c
422
439
440
+ test_ka_argon2d_CPPFLAGS = $(AM_CPPFLAGS ) -DTEST_argon2d
441
+ test_ka_argon2i_CPPFLAGS = $(AM_CPPFLAGS ) -DTEST_argon2i
442
+ test_ka_argon2id_CPPFLAGS = $(AM_CPPFLAGS ) -DTEST_argon2id
423
443
test_ka_bcrypt_CPPFLAGS = $(AM_CPPFLAGS ) -DTEST_bcrypt
424
444
test_ka_bcrypt_a_CPPFLAGS = $(AM_CPPFLAGS ) -DTEST_bcrypt_a
425
445
test_ka_bcrypt_x_CPPFLAGS = $(AM_CPPFLAGS ) -DTEST_bcrypt_x
@@ -510,6 +530,9 @@ test_short_outbuf_LDADD = $(COMMON_TEST_OBJECTS)
510
530
test_preferred_method_LDADD = $(COMMON_TEST_OBJECTS )
511
531
test_special_char_salt_LDADD = $(COMMON_TEST_OBJECTS )
512
532
533
+ test_ka_argon2d_LDADD = $(COMMON_TEST_OBJECTS )
534
+ test_ka_argon2i_LDADD = $(COMMON_TEST_OBJECTS )
535
+ test_ka_argon2id_LDADD = $(COMMON_TEST_OBJECTS )
513
536
test_ka_bcrypt_LDADD = $(COMMON_TEST_OBJECTS )
514
537
test_ka_bcrypt_a_LDADD = $(COMMON_TEST_OBJECTS )
515
538
test_ka_bcrypt_x_LDADD = $(COMMON_TEST_OBJECTS )
@@ -537,6 +560,15 @@ test_ka_yescrypt_LDADD = $(COMMON_TEST_OBJECTS)
537
560
test_gensalt_LDADD = \
538
561
lib/libcrypt_la-util-xstrcpy.lo \
539
562
$(COMMON_TEST_OBJECTS )
563
+ test_alg_argon2_LDADD = \
564
+ lib/libcrypt_la-alg-argon2.lo \
565
+ lib/libcrypt_la-alg-argon2-core.lo \
566
+ lib/libcrypt_la-alg-argon2-encoding.lo \
567
+ lib/libcrypt_la-alg-argon2-ref.lo \
568
+ lib/libcrypt_la-alg-argon2-thread.lo \
569
+ lib/libcrypt_la-alg-blake2b.lo \
570
+ lib/libcrypt_la-util-xbzero.lo
571
+ # $(COMMON_TEST_OBJECTS)
540
572
test_alg_blake2b_LDADD = \
541
573
lib/libcrypt_la-alg-blake2b.lo \
542
574
lib/libcrypt_la-util-xbzero.lo \
0 commit comments