tests: pkcs1-pad: moved to cert-tests

diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am
index 664ee347cccca74305c41f8bbba2c32e615c5b31..5b520eb89cefbcf48b64dd45e4ea700211db5c7c 100644 (file)
--- a/tests/cert-tests/Makefile.am
+++ b/tests/cert-tests/Makefile.am
@@ -48,7 +48,8 @@ EXTRA_DIST = data/ca-no-pathlen.pem data/no-ca-or-pathlen.pem data/aki-cert.pem
        templates/template-tlsfeature.tmpl data/userid.pem \
        data/template-tlsfeature.pem data/template-tlsfeature.csr \
        templates/template-tlsfeature-crq.tmpl templates/arb-extensions.tmpl data/arb-extensions.pem \
-       data/arb-extensions.csr
+       data/arb-extensions.csr data/pkcs1-pad-ok.pem data/pkcs1-pad-broken.pem \
+       data/pkcs1-pad-ok2.pem data/pkcs1-pad-broken2.pem data/pkcs1-pad-broken3.pem
 
 dist_check_SCRIPTS = pathlen aki certtool invalid-sig email \
        pkcs7 pkcs7-broken-sigs privkey-import name-constraints certtool-long-cn crl provable-privkey \
@@ -64,7 +65,7 @@ endif
 
 if !WINDOWS
 dist_check_SCRIPTS += template-test pem-decoding othername-test krb5-test sha3-test md5-test \
-       tlsfeature-test template-exts-test
+       tlsfeature-test template-exts-test pkcs1-pad
 endif
 
 if ENABLE_DANE

diff --git a/tests/pkcs1-padding/pkcs1-pad-broken.pem b/tests/cert-tests/data/pkcs1-pad-broken.pem
similarity index 100%
rename from tests/pkcs1-padding/pkcs1-pad-broken.pem
rename to tests/cert-tests/data/pkcs1-pad-broken.pem

diff --git a/tests/pkcs1-padding/pkcs1-pad-broken2.pem b/tests/cert-tests/data/pkcs1-pad-broken2.pem
similarity index 100%
rename from tests/pkcs1-padding/pkcs1-pad-broken2.pem
rename to tests/cert-tests/data/pkcs1-pad-broken2.pem

diff --git a/tests/pkcs1-padding/pkcs1-pad-broken3.pem b/tests/cert-tests/data/pkcs1-pad-broken3.pem
similarity index 100%
rename from tests/pkcs1-padding/pkcs1-pad-broken3.pem
rename to tests/cert-tests/data/pkcs1-pad-broken3.pem

diff --git a/tests/pkcs1-padding/pkcs1-pad-ok.pem b/tests/cert-tests/data/pkcs1-pad-ok.pem
similarity index 100%
rename from tests/pkcs1-padding/pkcs1-pad-ok.pem
rename to tests/cert-tests/data/pkcs1-pad-ok.pem

diff --git a/tests/pkcs1-padding/pkcs1-pad-ok2.pem b/tests/cert-tests/data/pkcs1-pad-ok2.pem
similarity index 100%
rename from tests/pkcs1-padding/pkcs1-pad-ok2.pem
rename to tests/cert-tests/data/pkcs1-pad-ok2.pem

diff --git a/tests/pkcs1-padding/pkcs1-pad b/tests/cert-tests/pkcs1-pad
similarity index 90%
rename from tests/pkcs1-padding/pkcs1-pad
rename to tests/cert-tests/pkcs1-pad
index b5e9ca9c2b22674831024b7cc24091bcb2723c4a..fe10cf22d86bd6acb7eb7d2e052402ce81ba596a 100755 (executable)
--- a/tests/pkcs1-padding/pkcs1-pad
+++ b/tests/cert-tests/pkcs1-pad
@@ -42,8 +42,8 @@ TMPFILE2=pkcs1-pad-2.$$.tmp
 
 EXPECT1=2002
 
-datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/pkcs1-pad-ok.pem" | tee $TMPFILE1 >/dev/null 2>&1
-datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/pkcs1-pad-broken.pem" | tee $TMPFILE2 >/dev/null 2>&1
+datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/data/pkcs1-pad-ok.pem" | tee $TMPFILE1 >/dev/null 2>&1
+datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/data/pkcs1-pad-broken.pem" | tee $TMPFILE2 >/dev/null 2>&1
 
 out1oks=`grep 'Verified.' $TMPFILE1 | wc -l | tr -d " "`
 out2oks=`grep 'Verified.' $TMPFILE2 | wc -l | tr -d " "`
@@ -65,8 +65,8 @@ echo "PKCS1-PAD1 OK"
 
 EXPECT2=2002
 
-datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/pkcs1-pad-ok2.pem" | tee $TMPFILE1 >/dev/null 2>&1
-datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/pkcs1-pad-broken2.pem" | tee $TMPFILE2 >/dev/null 2>&1
+datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/data/pkcs1-pad-ok2.pem" | tee $TMPFILE1 >/dev/null 2>&1
+datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/data/pkcs1-pad-broken2.pem" | tee $TMPFILE2 >/dev/null 2>&1
 
 out1oks=`grep 'Verified.' $TMPFILE1 | wc -l | tr -d " "`
 out2oks=`grep 'Verified.' $TMPFILE2 | wc -l | tr -d " "`
@@ -90,7 +90,7 @@ echo "PKCS1-PAD2 OK"
 
 EXPECT3=02
 
-datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/pkcs1-pad-broken3.pem" | tee $TMPFILE1 >/dev/null 2>&1
+datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/data/pkcs1-pad-broken3.pem" | tee $TMPFILE1 >/dev/null 2>&1
 
 out1oks=`grep 'Verified.' $TMPFILE1 | wc -l | tr -d " "`
 out1fails=`grep 'Not verified.' $TMPFILE1 | wc -l | tr -d " "`

diff --git a/tests/pkcs1-padding/Makefile.am b/tests/pkcs1-padding/Makefile.am
deleted file mode 100644 (file)
index f72debd..0000000
--- a/tests/pkcs1-padding/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# Copyright (C) 2006, 2008, 2010, 2012 Free Software Foundation, Inc.
-#
-# Author: Simon Josefsson
-#
-# This file is part of GnuTLS.
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this file; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# For pkcs1-pad
-EXTRA_DIST = pkcs1-pad-ok.pem pkcs1-pad-broken.pem \
-       pkcs1-pad-ok2.pem pkcs1-pad-broken2.pem \
-       pkcs1-pad-broken3.pem
-
-dist_check_SCRIPTS = pkcs1-pad
-
-if !WINDOWS
-TESTS = pkcs1-pad
-endif
-
-TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
-       LC_ALL="C"                                              \
-       top_builddir="$(top_builddir)"                          \
-       srcdir="$(srcdir)"