8 files changed, 418 insertions, 0 deletions

diff --git a/src/regress/lib/libssl/Makefile b/src/regress/lib/libssl/Makefile
new file mode 100644
index 0000000000..bbd7d0721a
--- /dev/null
+++ b/src/regress/lib/libssl/Makefile
@@ -0,0 +1,231 @@
+#       $OpenBSD: Makefile,v 1.12 2003/06/16 03:15:14 mickey Exp $
+
+CLEANFILES+= testdsa.key testdsa.pem rsakey.pem rsacert.pem dsa512.pem
+
+REGRESS_TARGETS=ossltests ssl-enc ssl-dsa ssl-rsa 
+
+OPENSSL=/usr/sbin/openssl
+CLEAR1=p
+CIPHER=cipher
+CLEAR2=clear
+
+BNTEST=         bntest
+ECTEST=         ectest
+EXPTEST=        exptest
+SHATEST=        shatest
+SHA1TEST=       sha1test
+RMDTEST=        rmdtest
+MD2TEST=        md2test
+MD4TEST=        md4test
+MD5TEST=        md5test
+HMACTEST=       hmactest
+RC2TEST=        rc2test
+RC4TEST=        rc4test
+BFTEST=         bftest
+CASTTEST=       casttest
+DESTEST=        destest
+RANDTEST=       randtest
+DHTEST=         dhtest
+DSATEST=        dsatest
+RSATEST=        rsa_test
+ENGINETEST=     enginetest
+EVPTEST=        evp_test
+
+SSLDIR= ${.CURDIR}/../../../lib/libssl/src/crypto
+
+CFLAGS= -O -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
+
+CLEANFILES+=    $(BNTEST) $(ECTEST) $(HMACTEST) \
+        $(SHATEST) $(SHA1TEST) $(MDC2TEST) $(RMDTEST) \
+        $(RANDTEST) $(DHTEST) $(ENGINETEST) \
+        $(CASTTEST) $(EXPTEST) $(DSATEST) $(RSATEST) \
+        $(EVPTEST) $(DESTEST) ${RC2TEST} ${RC4TEST} ${MD2TEST} ${MD4TEST} \
+        ${MD5TEST} ${BFTEST}
+
+CLEANFILES+= ${BNTEST}.out
+
+OTESTS= ${ENGINETEST}  \
+        ${EXPTEST} ${RANDTEST} \
+        ${MD2TEST} ${MD4TEST} ${MD5TEST} \
+        ${SHATEST} ${SHA1TEST} ${HMACTEST} ${RMDTEST} ${MDC2TEST} \
+        ${CASTTEST} ${BFTEST} ${RC2TEST} ${RC4TEST} ${DESTEST} \
+        ${DHTEST} ${DSATEST} ${RSATEST} \
+        ${ECTEST}
+
+${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
+
+.for ENC in ${ENCTARGETS}
+${CIPHER}.${ENC}: ${CLEAR1}
+        ${OPENSSL} ${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
+
+${CLEAR2}.${ENC}: ${CIPHER}.${ENC}
+        ${OPENSSL} ${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
+
+ssl-enc-${ENC}: ${CLEAR1} ${CLEAR2}.${ENC}
+        cmp ${CLEAR1} ${CLEAR2}.${ENC}
+ssl-enc-${ENC}.b64: ${CLEAR1} ${CLEAR2}.${ENC}.b64
+        cmp ${CLEAR1} ${CLEAR2}.${ENC}.b64
+
+REGRESS_TARGETS+=ssl-enc-${ENC} ssl-enc-${ENC}.b64
+CLEANFILES+=${CIPHER}.${ENC} ${CIPHER}.${ENC}.b64 ${CLEAR2}.${ENC} ${CLEAR2}.${ENC}.b64 .rnd
+.endfor
+
+ssl-enc:
+        sh ${.CURDIR}/testenc.sh ${.OBJDIR} ${.CURDIR}
+ssl-dsa:
+        sh ${.CURDIR}/testdsa.sh ${.OBJDIR} ${.CURDIR}
+ssl-rsa:
+        sh ${.CURDIR}/testrsa.sh ${.OBJDIR} ${.CURDIR}
+
+ossltests: ${OTESTS} ${BNTEST} ${EVPTEST}
+        @echo running ${BNTEST}, check ${.OBJDIR}/${BNTEST}.out if this fails.
+        ${.OBJDIR}/${BNTEST} > ${.OBJDIR}/${BNTEST}.out 2>&1
+.for OT in ${OTESTS}
+        @echo running ${OT}
+        ${.OBJDIR}/${OT} 
+.endfor
+        @echo running ${EVPTEST}
+        ${.OBJDIR}/${EVPTEST} ${SSLDIR}/evp/evptests.txt
+
+$(BNTEST).c: ${SSLDIR}/bn/bntest.c
+        cp ${SSLDIR}/bn/bntest.c ${.OBJDIR}
+
+$(BNTEST): ${BNTEST}.c
+        cc ${CFLAGS} -o $(BNTEST) ${BNTEST}.c -lcrypto
+
+$(EXPTEST).c: ${SSLDIR}/bn/exptest.c
+        cp ${SSLDIR}/bn/exptest.c ${.OBJDIR}
+
+$(EXPTEST): ${EXPTEST}.c
+        cc ${CFLAGS} -o $(EXPTEST) ${EXPTEST}.c -lcrypto
+
+$(ECTEST).c: ${SSLDIR}/ec/ectest.c
+        cp ${SSLDIR}/ec/ectest.c ${.OBJDIR}
+
+$(ECTEST): ${ECTEST}.c
+        cc ${CFLAGS} -o $(ECTEST) ${ECTEST}.c -lcrypto
+
+$(EVPTEST).c: ${SSLDIR}/evp/${EVPTEST}.c
+        cp ${SSLDIR}/evp/${EVPTEST}.c ${.OBJDIR}
+$(EVPTEST): ${EVPTEST}.c
+        cc ${CFLAGS} -o $(EVPTEST) ${EVPTEST}.c -lcrypto
+
+$(SHATEST).c: ${SSLDIR}/sha/${SHATEST}.c
+        cp ${SSLDIR}/sha/${SHATEST}.c ${.OBJDIR}
+$(SHATEST): ${SHATEST}.c
+        cc ${CFLAGS} -o $(SHATEST) ${SHATEST}.c -lcrypto
+
+$(SHA1TEST).c: ${SSLDIR}/sha/${SHA1TEST}.c
+        cp ${SSLDIR}/sha/${SHA1TEST}.c ${.OBJDIR}
+$(SHA1TEST): ${SHA1TEST}.c
+        cc ${CFLAGS} -o $(SHA1TEST) ${SHA1TEST}.c -lcrypto
+
+$(RANDTEST).c: ${SSLDIR}/rand/${RANDTEST}.c
+        cp ${SSLDIR}/rand/${RANDTEST}.c ${.OBJDIR}
+$(RANDTEST): ${RANDTEST}.c
+        cc ${CFLAGS} -o $(RANDTEST) ${RANDTEST}.c -lcrypto
+
+$(RMDTEST).c: ${SSLDIR}/ripemd/${RMDTEST}.c
+        cp ${SSLDIR}/ripemd/${RMDTEST}.c ${.OBJDIR}
+$(RMDTEST): ${RMDTEST}.c
+        cc ${CFLAGS} -o $(RMDTEST) ${RMDTEST}.c -lcrypto
+
+$(DHTEST).c: ${SSLDIR}/dh/${DHTEST}.c
+        cp ${SSLDIR}/dh/${DHTEST}.c ${.OBJDIR}
+
+$(DHTEST): ${DHTEST}.c
+        cc ${CFLAGS} -o $(DHTEST) ${DHTEST}.c -lcrypto
+
+$(ENGINETEST).c: ${SSLDIR}/engine/${ENGINETEST}.c
+        cp ${SSLDIR}/engine/${ENGINETEST}.c ${.OBJDIR}
+
+$(ENGINETEST): ${ENGINETEST}.c
+        cc ${CFLAGS} -o $(ENGINETEST) ${ENGINETEST}.c -lcrypto
+
+$(CASTTEST).c: ${SSLDIR}/cast/${CASTTEST}.c
+        cp ${SSLDIR}/cast/${CASTTEST}.c ${.OBJDIR}
+
+$(CASTTEST): ${CASTTEST}.c
+        cc ${CFLAGS} -o $(CASTTEST) ${CASTTEST}.c -lcrypto
+
+$(RSATEST).c: ${SSLDIR}/rsa/${RSATEST}.c
+        cp ${SSLDIR}/rsa/${RSATEST}.c ${.OBJDIR}
+
+$(RSATEST): ${RSATEST}.c
+        cc ${CFLAGS} -o $(RSATEST) ${RSATEST}.c -lcrypto
+
+$(DSATEST).c: ${SSLDIR}/dsa/${DSATEST}.c
+        cp ${SSLDIR}/dsa/${DSATEST}.c ${.OBJDIR}
+
+$(DSATEST): ${DSATEST}.c
+        cc ${CFLAGS} -o $(DSATEST) ${DSATEST}.c -lcrypto
+
+
+$(HMACTEST).c: ${SSLDIR}/hmac/${HMACTEST}.c
+        cp ${SSLDIR}/hmac/${HMACTEST}.c ${.OBJDIR}
+
+$(HMACTEST): ${HMACTEST}.c
+        cc ${CFLAGS} -o $(HMACTEST) ${HMACTEST}.c -lcrypto
+
+$(DESTEST).c: ${SSLDIR}/des/${DESTEST}.c
+        cp ${SSLDIR}/des/${DESTEST}.c ${.OBJDIR}
+
+$(DESTEST): ${DESTEST}.c
+        cc ${CFLAGS} -o $(DESTEST) ${DESTEST}.c -lcrypto
+
+$(BFTEST).c: ${SSLDIR}/bf/${BFTEST}.c
+        cp ${SSLDIR}/bf/${BFTEST}.c ${.OBJDIR}
+
+$(BFTEST): ${BFTEST}.c
+        cc ${CFLAGS} -o $(BFTEST) ${BFTEST}.c -lcrypto
+
+$(RC2TEST).c: ${SSLDIR}/rc2/${RC2TEST}.c
+        cp ${SSLDIR}/rc2/${RC2TEST}.c ${.OBJDIR}
+
+$(RC2TEST): ${RC2TEST}.c
+        cc ${CFLAGS} -o $(RC2TEST) ${RC2TEST}.c -lcrypto
+
+$(RC4TEST).c: ${SSLDIR}/rc4/${RC4TEST}.c
+        cp ${SSLDIR}/rc4/${RC4TEST}.c ${.OBJDIR}
+
+$(RC4TEST): ${RC4TEST}.c
+        cc ${CFLAGS} -o $(RC4TEST) ${RC4TEST}.c -lcrypto
+
+$(MD2TEST).c: ${SSLDIR}/md2/${MD2TEST}.c
+        cp ${SSLDIR}/md2/${MD2TEST}.c ${.OBJDIR}
+
+$(MD2TEST): ${MD2TEST}.c
+        cc ${CFLAGS} -o $(MD2TEST) ${MD2TEST}.c -lcrypto
+
+$(MD4TEST).c: ${SSLDIR}/md4/${MD4TEST}.c
+        cp ${SSLDIR}/md4/${MD4TEST}.c ${.OBJDIR}
+
+$(MD4TEST): ${MD4TEST}.c
+        cc ${CFLAGS} -o $(MD4TEST) ${MD4TEST}.c -lcrypto
+
+$(MD5TEST).c: ${SSLDIR}/md5/${MD5TEST}.c
+        cp ${SSLDIR}/md5/${MD5TEST}.c ${.OBJDIR}
+
+$(MD5TEST): ${MD5TEST}.c
+        cc ${CFLAGS} -o $(MD5TEST) ${MD5TEST}.c -lcrypto
+
+.include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/README b/src/regress/lib/libssl/README
new file mode 100644
index 0000000000..878feca400
--- /dev/null
+++ b/src/regress/lib/libssl/README
@@ -0,0 +1,6 @@
+testenc.sh tests encryption routines
+testdsa.sh tests DSA certificate generation
+test_server.sh starts a tls1 server using the above generated certificate
+test_client.sh starts a client to talk to the server.
+testrsa.sh tests RSA certificate generation
+
diff --git a/src/regress/lib/libssl/openssl.cnf b/src/regress/lib/libssl/openssl.cnf
new file mode 100644
index 0000000000..9b6cf400c6
--- /dev/null
+++ b/src/regress/lib/libssl/openssl.cnf
@@ -0,0 +1,29 @@
+#       $OpenBSD: openssl.cnf,v 1.2 2001/01/29 02:05:46 niklas Exp $
+
+#
+# SSLeay example configuration file.
+# This is mostly being used for generation of certificate requests.
+#
+# hacked by iang to do DSA certs - Server
+
+RANDFILE              = ./.rnd
+
+####################################################################
+[ req ]
+distinguished_name    = req_distinguished_name
+encrypt_rsa_key               = no
+
+[ req_distinguished_name ]
+countryName                   = Country Name (2 letter code)
+countryName_default           = CA
+countryName_value             = CA
+
+organizationName                = Organization Name (eg, company)
+organizationName_value          = Shake it Vera 
+
+0.commonName                  = Common Name (eg, YOUR name)
+0.commonName_value            = Wastelandus
+
+1.commonName                  = Common Name (eg, YOUR name)
+1.commonName_value            = Maximus
+
diff --git a/src/regress/lib/libssl/test_client.sh b/src/regress/lib/libssl/test_client.sh
new file mode 100644
index 0000000000..4f17fad80e
--- /dev/null
+++ b/src/regress/lib/libssl/test_client.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+#       $OpenBSD: test_client.sh,v 1.3 2001/01/29 02:05:48 niklas Exp $
+
+
+echo
+echo This starts a tls1 mode client to talk to the server run by 
+echo ./testserver.sh. You should start the server first. 
+echo
+echo type in this window after ssl negotiation and your output should
+echo be echoed by the server. 
+echo
+echo
+/usr/sbin/openssl s_client -tls1
diff --git a/src/regress/lib/libssl/test_server.sh b/src/regress/lib/libssl/test_server.sh
new file mode 100644
index 0000000000..a9e2c84d4f
--- /dev/null
+++ b/src/regress/lib/libssl/test_server.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+#       $OpenBSD: test_server.sh,v 1.3 2001/01/29 02:05:48 niklas Exp $
+
+
+echo This starts a tls1 mode server using the DSA certificate in ./server.pem
+echo Run ./testclient.sh in another window and type at it, you should 
+echo see the results of the ssl negotiation, and stuff you type in the client
+echo should echo in this window
+echo
+echo
+/usr/sbin/openssl s_server -tls1 -key testdsa.key -cert testdsa.pem
diff --git a/src/regress/lib/libssl/testdsa.sh b/src/regress/lib/libssl/testdsa.sh
new file mode 100644
index 0000000000..48526eec11
--- /dev/null
+++ b/src/regress/lib/libssl/testdsa.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+#       $OpenBSD: testdsa.sh,v 1.4 2001/01/29 02:05:48 niklas Exp $
+
+
+#Test DSA certificate generation of openssl
+
+cd $1
+
+# Generate DSA paramter set
+openssl dsaparam 512 -out dsa512.pem
+if [ $? != 0 ]; then
+        exit 1;
+fi
+
+
+# Denerate a DSA certificate
+openssl req -config $2/openssl.cnf -x509 -newkey dsa:dsa512.pem -out testdsa.pem -keyout testdsa.key
+if [ $? != 0 ]; then
+        exit 1;
+fi
+
+
+# Now check the certificate
+openssl x509 -text -in testdsa.pem
+if [ $? != 0 ]; then
+        exit 1;
+fi
+
+exit 0
diff --git a/src/regress/lib/libssl/testenc.sh b/src/regress/lib/libssl/testenc.sh
new file mode 100644
index 0000000000..355e9cd923
--- /dev/null
+++ b/src/regress/lib/libssl/testenc.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+#       $OpenBSD: testenc.sh,v 1.6 2002/01/15 18:51:39 art Exp $
+
+
+testsrc=$2/openssl.cnf
+test=$1/p
+cmd=/usr/sbin/openssl
+
+cd $1
+
+cat $testsrc >$test;
+
+echo cat
+$cmd enc < $test > $test.cipher
+$cmd enc < $test.cipher >$test.clear
+cmp $test $test.clear
+if [ $? != 0 ]
+then
+        exit 1
+else
+        /bin/rm $test.cipher $test.clear
+fi
+echo base64
+$cmd enc -a -e < $test > $test.cipher
+$cmd enc -a -d < $test.cipher >$test.clear
+cmp $test $test.clear
+if [ $? != 0 ]
+then
+        exit 1
+else
+        /bin/rm $test.cipher $test.clear
+fi
+
+/bin/rm -f $test
+exit 0
+
+# These tests are now done by the makefile.
+
+for i in rc4 \
+        des-cfb des-ede-cfb des-ede3-cfb \
+        des-ofb des-ede-ofb des-ede3-ofb \
+        des-ecb des-ede des-ede3 desx \
+        des-cbc des-ede-cbc des-ede3-cbc \
+        rc2-ecb rc2-cfb rc2-ofb rc2-cbc \
+        bf-ecb bf-cfb bf-ofb bf-cbc rc4 \
+        cast5-ecb cast5-cfb cast5-ofb cast5-cbc
+do
+        echo $i
+        $cmd $i -bufsize 113 -e -k test < $test > $test.$i.cipher
+        $cmd $i -bufsize 157 -d -k test < $test.$i.cipher >$test.$i.clear
+        cmp $test $test.$i.clear
+        if [ $? != 0 ]
+        then
+                exit 1
+        else
+                /bin/rm $test.$i.cipher $test.$i.clear
+        fi
+
+        echo $i base64
+        $cmd $i -bufsize 113 -a -e -k test < $test > $test.$i.cipher
+        $cmd $i -bufsize 157 -a -d -k test < $test.$i.cipher >$test.$i.clear
+        cmp $test $test.$i.clear
+        if [ $? != 0 ]
+        then
+                exit 1
+        else
+                /bin/rm $test.$i.cipher $test.$i.clear
+        fi
+done
+rm -f $test
diff --git a/src/regress/lib/libssl/testrsa.sh b/src/regress/lib/libssl/testrsa.sh
new file mode 100644
index 0000000000..17c6abf7ce
--- /dev/null
+++ b/src/regress/lib/libssl/testrsa.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+#       $OpenBSD: testrsa.sh,v 1.6 2002/01/02 15:13:18 art Exp $
+
+
+#Test RSA certificate generation of openssl
+
+cd $1
+
+# Generate RSA private key
+openssl genrsa -out rsakey.pem
+if [ $? != 0 ]; then
+        exit 1;
+fi
+
+
+# Generate an RSA certificate
+openssl req -config $2/openssl.cnf -key rsakey.pem -new -x509 -days 365 -out rsacert.pem
+if [ $? != 0 ]; then
+        exit 1;
+fi
+
+
+# Now check the certificate
+openssl x509 -text -in rsacert.pem
+if [ $? != 0 ]; then
+        exit 1;
+fi
+
+exit 0