From 93723b50b639d8dc717bc1bf463fd46e1b321239 Mon Sep 17 00:00:00 2001 From: djm <> Date: Sat, 13 Oct 2012 21:25:14 +0000 Subject: resolve conflicts --- src/lib/libcrypto/util/mkfiles.pl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/lib/libcrypto/util/mkfiles.pl') diff --git a/src/lib/libcrypto/util/mkfiles.pl b/src/lib/libcrypto/util/mkfiles.pl index 6d15831450..7d9a9d5e5c 100644 --- a/src/lib/libcrypto/util/mkfiles.pl +++ b/src/lib/libcrypto/util/mkfiles.pl @@ -15,6 +15,7 @@ my @dirs = ( "crypto/sha", "crypto/mdc2", "crypto/hmac", +"crypto/cmac", "crypto/ripemd", "crypto/des", "crypto/rc2", @@ -62,6 +63,7 @@ my @dirs = ( "crypto/pqueue", "crypto/whrlpool", "crypto/ts", +"crypto/srp", "ssl", "apps", "engines", -- cgit v1.2.3-55-g6feb