2 files changed, 96 insertions, 49 deletions

diff --git a/src/regress/lib/libssl/Makefile b/src/regress/lib/libssl/Makefile
index bbd7d0721a..2a5fbb4119 100644
--- a/src/regress/lib/libssl/Makefile
+++ b/src/regress/lib/libssl/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.12 2003/06/16 03:15:14 mickey Exp $
+#       $OpenBSD: Makefile,v 1.13 2008/09/06 12:21:54 djm Exp $
 
 CLEANFILES+= testdsa.key testdsa.pem rsakey.pem rsacert.pem dsa512.pem
 
@@ -8,46 +8,53 @@ OPENSSL=/usr/sbin/openssl
 CLEAR1=p
 CIPHER=cipher
 CLEAR2=clear
+LIBCRYPTO=-lcrypto
 
+BFTEST=         bftest
 BNTEST=         bntest
+CASTTEST=       casttest
+DESTEST=        destest
+DHTEST=         dhtest
+DSATEST=        dsatest
+ECDHTEST=       ecdhtest
+ECDSATEST=      ecdsatest
 ECTEST=         ectest
+ENGINETEST=     enginetest
+EVPTEST=        evp_test
 EXPTEST=        exptest
-SHATEST=        shatest
-SHA1TEST=       sha1test
-RMDTEST=        rmdtest
+HMACTEST=       hmactest
+IGETEST=        igetest
 MD2TEST=        md2test
 MD4TEST=        md4test
 MD5TEST=        md5test
-HMACTEST=       hmactest
+RANDTEST=       randtest
 RC2TEST=        rc2test
 RC4TEST=        rc4test
-BFTEST=         bftest
-CASTTEST=       casttest
-DESTEST=        destest
-RANDTEST=       randtest
-DHTEST=         dhtest
-DSATEST=        dsatest
+RMDTEST=        rmdtest
 RSATEST=        rsa_test
-ENGINETEST=     enginetest
-EVPTEST=        evp_test
+SHA1TEST=       sha1test
+SHA256TEST=     sha256t
+SHA512TEST=     sha512t
+SHATEST=        shatest
 
 SSLDIR= ${.CURDIR}/../../../lib/libssl/src/crypto
-
-CFLAGS= -O -I${SSLDIR} -I${SSLDIR}/..
+CFLAGS= -O -g -Wall -I${SSLDIR} -I${SSLDIR}/..
 
 CLEANFILES+=    $(BNTEST).c $(ECTEST).c $(HMACTEST).c \
         $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
         $(RANDTEST).c $(DHTEST).c $(ENGINETEST).c \
         $(CASTTEST).c $(EXPTEST).c $(DSATEST).c $(RSATEST).c \
         $(EVPTEST).c $(DESTEST).c ${RC2TEST}.c ${RC4TEST}.c ${MD2TEST}.c \
-        ${MD4TEST}.c ${MD5TEST}.c ${BFTEST}.c
+        ${MD4TEST}.c ${MD5TEST}.c ${BFTEST}.c ${ECDHTEST}.c ${ECDSATEST}.c \
+        ${IGETEST}.c ${SHA256TEST}.c ${SHA512TEST}.c
 
 CLEANFILES+=    $(BNTEST) $(ECTEST) $(HMACTEST) \
         $(SHATEST) $(SHA1TEST) $(MDC2TEST) $(RMDTEST) \
         $(RANDTEST) $(DHTEST) $(ENGINETEST) \
         $(CASTTEST) $(EXPTEST) $(DSATEST) $(RSATEST) \
         $(EVPTEST) $(DESTEST) ${RC2TEST} ${RC4TEST} ${MD2TEST} ${MD4TEST} \
-        ${MD5TEST} ${BFTEST}
+        ${MD5TEST} ${BFTEST} ${ECDHTEST} ${ECDSATEST} ${IGETEST} \
+        ${SHA256TEST} ${SHA512TEST}
 
 CLEANFILES+= ${BNTEST}.out
 
@@ -57,28 +64,37 @@ OTESTS= ${ENGINETEST}  \
         ${SHATEST} ${SHA1TEST} ${HMACTEST} ${RMDTEST} ${MDC2TEST} \
         ${CASTTEST} ${BFTEST} ${RC2TEST} ${RC4TEST} ${DESTEST} \
         ${DHTEST} ${DSATEST} ${RSATEST} \
-        ${ECTEST}
+        ${ECTEST} ${ECDHTEST} ${ECDSATEST} $(IGETEST) \
+        $(SHA256TEST) $(SHA512TEST)
 
 ${CLEAR1}: openssl.cnf
         cat ${.CURDIR}/openssl.cnf > ${CLEAR1}
 
 CLEANFILES+=${CLEAR1}
 
-ENCTARGETS=rc4 des-cfb des-ede-cfb des-ede3-cfb des-ofb des-ede-ofb des-ede3-ofb
-ENCTARGETS+=des-ecb des-ede des-ede3 desx des-cbc des-ede-cbc des-ede3-cbc
-ENCTARGETS+=rc2-ecb rc2-cfb rc2-ofb rc2-cbc bf-ecb bf-cfb bf-ofb bf-cbc rc4
-ENCTARGETS+=cast5-ecb cast5-cfb cast5-ofb cast5-cbc
+ENCTARGETS=aes-128-cbc aes-128-cfb aes-128-cfb1 aes-128-cfb8
+ENCTARGETS+=aes-128-ecb aes-128-ofb aes-192-cbc aes-192-cfb
+ENCTARGETS+=aes-192-cfb1 aes-192-cfb8 aes-192-ecb aes-192-ofb
+ENCTARGETS+=aes-256-cbc aes-256-cfb aes-256-cfb1 aes-256-cfb8
+ENCTARGETS+=aes-256-ecb aes-256-ofb
+ENCTARGETS+=bf-cbc bf-cfb bf-ecb bf-ofb
+ENCTARGETS+=cast-cbc cast5-cbc cast5-cfb cast5-ecb cast5-ofb
+ENCTARGETS+=des-cbc des-cfb des-cfb8 des-ecb des-ede
+ENCTARGETS+=des-ede-cbc des-ede-cfb des-ede-ofb des-ede3
+ENCTARGETS+=des-ede3-cbc des-ede3-cfb des-ede3-ofb des-ofb desx-cbc
+ENCTARGETS+=rc2-40-cbc rc2-64-cbc rc2-cbc rc2-cfb rc2-ecb rc2-ofb
+ENCTARGETS+=rc4 rc4-40
 
 .for ENC in ${ENCTARGETS}
 ${CIPHER}.${ENC}: ${CLEAR1}
-        ${OPENSSL} ${ENC} -bufsize 113 -e -k test < ${CLEAR1} > ${CIPHER}.${ENC}
+        ${OPENSSL} enc -${ENC} -bufsize 113 -e -k test < ${CLEAR1} > ${CIPHER}.${ENC}
 ${CIPHER}.${ENC}.b64: ${CLEAR1}
-        ${OPENSSL} ${ENC} -bufsize 113 -a -e -k test < ${CLEAR1} > ${CIPHER}.${ENC}.b64
+        ${OPENSSL} enc -${ENC} -bufsize 113 -a -e -k test < ${CLEAR1} > ${CIPHER}.${ENC}.b64
 
 ${CLEAR2}.${ENC}: ${CIPHER}.${ENC}
-        ${OPENSSL} ${ENC} -bufsize 157 -d -k test < ${CIPHER}.${ENC} > ${CLEAR2}.${ENC}
+        ${OPENSSL} enc -${ENC} -bufsize 157 -d -k test < ${CIPHER}.${ENC} > ${CLEAR2}.${ENC}
 ${CLEAR2}.${ENC}.b64: ${CIPHER}.${ENC}.b64
-        ${OPENSSL} ${ENC} -bufsize 157 -a -d -k test < ${CIPHER}.${ENC}.b64 > ${CLEAR2}.${ENC}.b64
+        ${OPENSSL} enc -${ENC} -bufsize 157 -a -d -k test < ${CIPHER}.${ENC}.b64 > ${CLEAR2}.${ENC}.b64
 
 ssl-enc-${ENC}: ${CLEAR1} ${CLEAR2}.${ENC}
         cmp ${CLEAR1} ${CLEAR2}.${ENC}
@@ -110,122 +126,152 @@ $(BNTEST).c: ${SSLDIR}/bn/bntest.c
         cp ${SSLDIR}/bn/bntest.c ${.OBJDIR}
 
 $(BNTEST): ${BNTEST}.c
-        cc ${CFLAGS} -o $(BNTEST) ${BNTEST}.c -lcrypto
+        cc ${CFLAGS} -o $(BNTEST) ${BNTEST}.c $(LIBCRYPTO)
 
 $(EXPTEST).c: ${SSLDIR}/bn/exptest.c
         cp ${SSLDIR}/bn/exptest.c ${.OBJDIR}
 
 $(EXPTEST): ${EXPTEST}.c
-        cc ${CFLAGS} -o $(EXPTEST) ${EXPTEST}.c -lcrypto
+        cc ${CFLAGS} -o $(EXPTEST) ${EXPTEST}.c $(LIBCRYPTO)
 
 $(ECTEST).c: ${SSLDIR}/ec/ectest.c
         cp ${SSLDIR}/ec/ectest.c ${.OBJDIR}
 
 $(ECTEST): ${ECTEST}.c
-        cc ${CFLAGS} -o $(ECTEST) ${ECTEST}.c -lcrypto
+        cc ${CFLAGS} -o $(ECTEST) ${ECTEST}.c $(LIBCRYPTO)
 
 $(EVPTEST).c: ${SSLDIR}/evp/${EVPTEST}.c
         cp ${SSLDIR}/evp/${EVPTEST}.c ${.OBJDIR}
 $(EVPTEST): ${EVPTEST}.c
-        cc ${CFLAGS} -o $(EVPTEST) ${EVPTEST}.c -lcrypto
+        cc ${CFLAGS} -o $(EVPTEST) ${EVPTEST}.c $(LIBCRYPTO)
 
 $(SHATEST).c: ${SSLDIR}/sha/${SHATEST}.c
         cp ${SSLDIR}/sha/${SHATEST}.c ${.OBJDIR}
 $(SHATEST): ${SHATEST}.c
-        cc ${CFLAGS} -o $(SHATEST) ${SHATEST}.c -lcrypto
+        cc ${CFLAGS} -o $(SHATEST) ${SHATEST}.c $(LIBCRYPTO)
 
 $(SHA1TEST).c: ${SSLDIR}/sha/${SHA1TEST}.c
         cp ${SSLDIR}/sha/${SHA1TEST}.c ${.OBJDIR}
 $(SHA1TEST): ${SHA1TEST}.c
-        cc ${CFLAGS} -o $(SHA1TEST) ${SHA1TEST}.c -lcrypto
+        cc ${CFLAGS} -o $(SHA1TEST) ${SHA1TEST}.c $(LIBCRYPTO)
 
 $(RANDTEST).c: ${SSLDIR}/rand/${RANDTEST}.c
         cp ${SSLDIR}/rand/${RANDTEST}.c ${.OBJDIR}
 $(RANDTEST): ${RANDTEST}.c
-        cc ${CFLAGS} -o $(RANDTEST) ${RANDTEST}.c -lcrypto
+        cc ${CFLAGS} -o $(RANDTEST) ${RANDTEST}.c $(LIBCRYPTO)
 
 $(RMDTEST).c: ${SSLDIR}/ripemd/${RMDTEST}.c
         cp ${SSLDIR}/ripemd/${RMDTEST}.c ${.OBJDIR}
 $(RMDTEST): ${RMDTEST}.c
-        cc ${CFLAGS} -o $(RMDTEST) ${RMDTEST}.c -lcrypto
+        cc ${CFLAGS} -o $(RMDTEST) ${RMDTEST}.c $(LIBCRYPTO)
 
 $(DHTEST).c: ${SSLDIR}/dh/${DHTEST}.c
         cp ${SSLDIR}/dh/${DHTEST}.c ${.OBJDIR}
 
 $(DHTEST): ${DHTEST}.c
-        cc ${CFLAGS} -o $(DHTEST) ${DHTEST}.c -lcrypto
+        cc ${CFLAGS} -o $(DHTEST) ${DHTEST}.c $(LIBCRYPTO)
 
 $(ENGINETEST).c: ${SSLDIR}/engine/${ENGINETEST}.c
         cp ${SSLDIR}/engine/${ENGINETEST}.c ${.OBJDIR}
 
 $(ENGINETEST): ${ENGINETEST}.c
-        cc ${CFLAGS} -o $(ENGINETEST) ${ENGINETEST}.c -lcrypto
+        cc ${CFLAGS} -o $(ENGINETEST) ${ENGINETEST}.c $(LIBCRYPTO)
 
 $(CASTTEST).c: ${SSLDIR}/cast/${CASTTEST}.c
         cp ${SSLDIR}/cast/${CASTTEST}.c ${.OBJDIR}
 
 $(CASTTEST): ${CASTTEST}.c
-        cc ${CFLAGS} -o $(CASTTEST) ${CASTTEST}.c -lcrypto
+        cc ${CFLAGS} -o $(CASTTEST) ${CASTTEST}.c $(LIBCRYPTO)
 
 $(RSATEST).c: ${SSLDIR}/rsa/${RSATEST}.c
         cp ${SSLDIR}/rsa/${RSATEST}.c ${.OBJDIR}
 
 $(RSATEST): ${RSATEST}.c
-        cc ${CFLAGS} -o $(RSATEST) ${RSATEST}.c -lcrypto
+        cc ${CFLAGS} -o $(RSATEST) ${RSATEST}.c $(LIBCRYPTO)
 
 $(DSATEST).c: ${SSLDIR}/dsa/${DSATEST}.c
         cp ${SSLDIR}/dsa/${DSATEST}.c ${.OBJDIR}
 
 $(DSATEST): ${DSATEST}.c
-        cc ${CFLAGS} -o $(DSATEST) ${DSATEST}.c -lcrypto
+        cc ${CFLAGS} -o $(DSATEST) ${DSATEST}.c $(LIBCRYPTO)
 
 
 $(HMACTEST).c: ${SSLDIR}/hmac/${HMACTEST}.c
         cp ${SSLDIR}/hmac/${HMACTEST}.c ${.OBJDIR}
 
 $(HMACTEST): ${HMACTEST}.c
-        cc ${CFLAGS} -o $(HMACTEST) ${HMACTEST}.c -lcrypto
+        cc ${CFLAGS} -o $(HMACTEST) ${HMACTEST}.c $(LIBCRYPTO)
 
 $(DESTEST).c: ${SSLDIR}/des/${DESTEST}.c
         cp ${SSLDIR}/des/${DESTEST}.c ${.OBJDIR}
 
 $(DESTEST): ${DESTEST}.c
-        cc ${CFLAGS} -o $(DESTEST) ${DESTEST}.c -lcrypto
+        cc ${CFLAGS} -o $(DESTEST) ${DESTEST}.c $(LIBCRYPTO)
 
 $(BFTEST).c: ${SSLDIR}/bf/${BFTEST}.c
         cp ${SSLDIR}/bf/${BFTEST}.c ${.OBJDIR}
 
 $(BFTEST): ${BFTEST}.c
-        cc ${CFLAGS} -o $(BFTEST) ${BFTEST}.c -lcrypto
+        cc ${CFLAGS} -o $(BFTEST) ${BFTEST}.c $(LIBCRYPTO)
 
 $(RC2TEST).c: ${SSLDIR}/rc2/${RC2TEST}.c
         cp ${SSLDIR}/rc2/${RC2TEST}.c ${.OBJDIR}
 
 $(RC2TEST): ${RC2TEST}.c
-        cc ${CFLAGS} -o $(RC2TEST) ${RC2TEST}.c -lcrypto
+        cc ${CFLAGS} -o $(RC2TEST) ${RC2TEST}.c $(LIBCRYPTO)
 
 $(RC4TEST).c: ${SSLDIR}/rc4/${RC4TEST}.c
         cp ${SSLDIR}/rc4/${RC4TEST}.c ${.OBJDIR}
 
 $(RC4TEST): ${RC4TEST}.c
-        cc ${CFLAGS} -o $(RC4TEST) ${RC4TEST}.c -lcrypto
+        cc ${CFLAGS} -o $(RC4TEST) ${RC4TEST}.c $(LIBCRYPTO)
 
 $(MD2TEST).c: ${SSLDIR}/md2/${MD2TEST}.c
         cp ${SSLDIR}/md2/${MD2TEST}.c ${.OBJDIR}
 
 $(MD2TEST): ${MD2TEST}.c
-        cc ${CFLAGS} -o $(MD2TEST) ${MD2TEST}.c -lcrypto
+        cc ${CFLAGS} -o $(MD2TEST) ${MD2TEST}.c $(LIBCRYPTO)
 
 $(MD4TEST).c: ${SSLDIR}/md4/${MD4TEST}.c
         cp ${SSLDIR}/md4/${MD4TEST}.c ${.OBJDIR}
 
 $(MD4TEST): ${MD4TEST}.c
-        cc ${CFLAGS} -o $(MD4TEST) ${MD4TEST}.c -lcrypto
+        cc ${CFLAGS} -o $(MD4TEST) ${MD4TEST}.c $(LIBCRYPTO)
 
 $(MD5TEST).c: ${SSLDIR}/md5/${MD5TEST}.c
         cp ${SSLDIR}/md5/${MD5TEST}.c ${.OBJDIR}
 
 $(MD5TEST): ${MD5TEST}.c
-        cc ${CFLAGS} -o $(MD5TEST) ${MD5TEST}.c -lcrypto
+        cc ${CFLAGS} -o $(MD5TEST) ${MD5TEST}.c $(LIBCRYPTO)
+
+$(ECDHTEST).c: ${SSLDIR}/ecdh/${ECDHTEST}.c
+        cp ${SSLDIR}/ecdh/${ECDHTEST}.c ${.OBJDIR}
+
+$(ECDHTEST): ${ECDHTEST}.c
+        cc ${CFLAGS} -o $(ECDHTEST) ${ECDHTEST}.c $(LIBCRYPTO)
+
+$(ECDSATEST).c: ${SSLDIR}/ecdsa/${ECDSATEST}.c
+        cp ${SSLDIR}/ecdsa/${ECDSATEST}.c ${.OBJDIR}
+
+$(ECDSATEST): ${ECDSATEST}.c
+        cc ${CFLAGS} -o $(ECDSATEST) ${ECDSATEST}.c $(LIBCRYPTO)
+
+$(IGETEST).c: ${SSLDIR}/../test/${IGETEST}.c
+        cp ${SSLDIR}/../test/${IGETEST}.c ${.OBJDIR}
+
+$(IGETEST): ${IGETEST}.c
+        cc ${CFLAGS} -o $(IGETEST) ${IGETEST}.c $(LIBCRYPTO)
+
+$(SHA256TEST).c: ${SSLDIR}/sha/${SHA256TEST}.c
+        cp ${SSLDIR}/sha/${SHA256TEST}.c ${.OBJDIR}
+
+$(SHA256TEST): ${SHA256TEST}.c
+        cc ${CFLAGS} -o $(SHA256TEST) ${SHA256TEST}.c $(LIBCRYPTO)
+
+$(SHA512TEST).c: ${SSLDIR}/sha/${SHA512TEST}.c
+        cp ${SSLDIR}/sha/${SHA512TEST}.c ${.OBJDIR}
+
+$(SHA512TEST): ${SHA512TEST}.c
+        cc ${CFLAGS} -o $(SHA512TEST) ${SHA512TEST}.c $(LIBCRYPTO)
 
 .include <bsd.regress.mk>
diff --git a/src/usr.sbin/openssl/Makefile b/src/usr.sbin/openssl/Makefile
index 179cf216f5..9ebadfaa10 100644
--- a/src/usr.sbin/openssl/Makefile
+++ b/src/usr.sbin/openssl/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.17 2005/04/29 05:42:55 djm Exp $
+#       $OpenBSD: Makefile,v 1.18 2008/09/06 12:21:52 djm Exp $
 
 PROG=   openssl
 LDADD=  -lssl -lcrypto
@@ -31,7 +31,8 @@ SRCS=	verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c\
         x509.c genrsa.c gendsa.c s_server.c s_client.c speed.c \
         s_time.c apps.c s_cb.c s_socket.c version.c sess_id.c \
         app_rand.c ciphers.c nseq.c pkcs12.c pkcs8.c spkac.c smime.c \
-        dhparam.c openssl.c rand.c rsautl.c engine.c ocsp.c prime.c
+        dhparam.c openssl.c rand.c rsautl.c engine.c ocsp.c prime.c \
+        cms.c ec.c ecparam.c
 
 .PATH:  ${SSLEAY_SRC}