From 3b6de629ce8948fc91b06c070bbe994248fb6b4c Mon Sep 17 00:00:00 2001 From: jsing Date: Sat, 24 May 2014 13:32:46 +0000 Subject: [PATCH] Move the regress tests that are in lib/libssl to usr.sbin/openssl, since they are really testing openssl(1) (although this also tests libcrypto and libssl), rather than actual parts of the libssl library. Discussed with miod@ --- regress/usr.sbin/Makefile | 3 ++- regress/{lib/libssl => usr.sbin/openssl}/Makefile | 2 +- regress/{lib/libssl => usr.sbin/openssl}/README | 0 regress/{lib/libssl => usr.sbin/openssl}/openssl.cnf | 2 +- regress/{lib/libssl => usr.sbin/openssl}/test_client.sh | 2 +- regress/{lib/libssl => usr.sbin/openssl}/test_server.sh | 2 +- regress/{lib/libssl => usr.sbin/openssl}/testdsa.sh | 2 +- regress/{lib/libssl => usr.sbin/openssl}/testenc.sh | 2 +- regress/{lib/libssl => usr.sbin/openssl}/testrsa.sh | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) rename regress/{lib/libssl => usr.sbin/openssl}/Makefile (97%) rename regress/{lib/libssl => usr.sbin/openssl}/README (100%) rename regress/{lib/libssl => usr.sbin/openssl}/openssl.cnf (92%) rename regress/{lib/libssl => usr.sbin/openssl}/test_client.sh (81%) rename regress/{lib/libssl => usr.sbin/openssl}/test_server.sh (84%) rename regress/{lib/libssl => usr.sbin/openssl}/testdsa.sh (87%) rename regress/{lib/libssl => usr.sbin/openssl}/testenc.sh (95%) rename regress/{lib/libssl => usr.sbin/openssl}/testrsa.sh (87%) diff --git a/regress/usr.sbin/Makefile b/regress/usr.sbin/Makefile index 008810030d6..64d73516039 100644 --- a/regress/usr.sbin/Makefile +++ b/regress/usr.sbin/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.5 2013/09/04 22:37:49 bluhm Exp $ +# $OpenBSD: Makefile,v 1.6 2014/05/24 13:32:46 jsing Exp $ SUBDIR += mtree +SUBDIR += openssl SUBDIR += relayd .if defined(REGRESS_FULL) diff --git a/regress/lib/libssl/Makefile b/regress/usr.sbin/openssl/Makefile similarity index 97% rename from regress/lib/libssl/Makefile rename to regress/usr.sbin/openssl/Makefile index 20d2b9979db..4f4e3d13a10 100644 --- a/regress/lib/libssl/Makefile +++ b/regress/usr.sbin/openssl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2014/04/17 08:06:59 jsg Exp $ +# $OpenBSD: Makefile,v 1.1 2014/05/24 13:32:46 jsing Exp $ CLEANFILES+= testdsa.key testdsa.pem rsakey.pem rsacert.pem dsa512.pem diff --git a/regress/lib/libssl/README b/regress/usr.sbin/openssl/README similarity index 100% rename from regress/lib/libssl/README rename to regress/usr.sbin/openssl/README diff --git a/regress/lib/libssl/openssl.cnf b/regress/usr.sbin/openssl/openssl.cnf similarity index 92% rename from regress/lib/libssl/openssl.cnf rename to regress/usr.sbin/openssl/openssl.cnf index 9b6cf400c63..d2e85ad0e2a 100644 --- a/regress/lib/libssl/openssl.cnf +++ b/regress/usr.sbin/openssl/openssl.cnf @@ -1,4 +1,4 @@ -# $OpenBSD: openssl.cnf,v 1.2 2001/01/29 02:05:46 niklas Exp $ +# $OpenBSD: openssl.cnf,v 1.1 2014/05/24 13:32:46 jsing Exp $ # # SSLeay example configuration file. diff --git a/regress/lib/libssl/test_client.sh b/regress/usr.sbin/openssl/test_client.sh similarity index 81% rename from regress/lib/libssl/test_client.sh rename to regress/usr.sbin/openssl/test_client.sh index 4f17fad80e6..c51f68debfe 100644 --- a/regress/lib/libssl/test_client.sh +++ b/regress/usr.sbin/openssl/test_client.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: test_client.sh,v 1.3 2001/01/29 02:05:48 niklas Exp $ +# $OpenBSD: test_client.sh,v 1.1 2014/05/24 13:32:46 jsing Exp $ echo diff --git a/regress/lib/libssl/test_server.sh b/regress/usr.sbin/openssl/test_server.sh similarity index 84% rename from regress/lib/libssl/test_server.sh rename to regress/usr.sbin/openssl/test_server.sh index a9e2c84d4f3..cab89455275 100644 --- a/regress/lib/libssl/test_server.sh +++ b/regress/usr.sbin/openssl/test_server.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: test_server.sh,v 1.3 2001/01/29 02:05:48 niklas Exp $ +# $OpenBSD: test_server.sh,v 1.1 2014/05/24 13:32:46 jsing Exp $ echo This starts a tls1 mode server using the DSA certificate in ./server.pem diff --git a/regress/lib/libssl/testdsa.sh b/regress/usr.sbin/openssl/testdsa.sh similarity index 87% rename from regress/lib/libssl/testdsa.sh rename to regress/usr.sbin/openssl/testdsa.sh index 48526eec119..b895cb7c728 100644 --- a/regress/lib/libssl/testdsa.sh +++ b/regress/usr.sbin/openssl/testdsa.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: testdsa.sh,v 1.4 2001/01/29 02:05:48 niklas Exp $ +# $OpenBSD: testdsa.sh,v 1.1 2014/05/24 13:32:46 jsing Exp $ #Test DSA certificate generation of openssl diff --git a/regress/lib/libssl/testenc.sh b/regress/usr.sbin/openssl/testenc.sh similarity index 95% rename from regress/lib/libssl/testenc.sh rename to regress/usr.sbin/openssl/testenc.sh index 355e9cd923e..0f73f8e11fe 100644 --- a/regress/lib/libssl/testenc.sh +++ b/regress/usr.sbin/openssl/testenc.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: testenc.sh,v 1.6 2002/01/15 18:51:39 art Exp $ +# $OpenBSD: testenc.sh,v 1.1 2014/05/24 13:32:46 jsing Exp $ testsrc=$2/openssl.cnf diff --git a/regress/lib/libssl/testrsa.sh b/regress/usr.sbin/openssl/testrsa.sh similarity index 87% rename from regress/lib/libssl/testrsa.sh rename to regress/usr.sbin/openssl/testrsa.sh index 17c6abf7ce5..4488c311291 100644 --- a/regress/lib/libssl/testrsa.sh +++ b/regress/usr.sbin/openssl/testrsa.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: testrsa.sh,v 1.6 2002/01/02 15:13:18 art Exp $ +# $OpenBSD: testrsa.sh,v 1.1 2014/05/24 13:32:46 jsing Exp $ #Test RSA certificate generation of openssl -- 2.20.1