diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-06-02 09:44:52 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-07-17 17:08:01 +0200 |
| commit | e80dd2beb5392255ad619fd578bf86889794f28d (patch) | |
| tree | 75dc3cecb63b3bbad71ef8c5e052c1fb9121941b /tests/cert-tests | |
| parent | 4f0e7e9a5048d5dbf22369aa475bcb0078b863f5 (diff) | |
| download | gnutls-e80dd2beb5392255ad619fd578bf86889794f28d.tar.gz | |
tests: replaced rsa-pss/eddsa certtool options with --key-type
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'tests/cert-tests')
| -rwxr-xr-x | tests/cert-tests/certtool-eddsa | 4 | ||||
| -rwxr-xr-x | tests/cert-tests/certtool-rsa-pss | 4 | ||||
| -rwxr-xr-x | tests/cert-tests/rsa-pss-pad | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/cert-tests/certtool-eddsa b/tests/cert-tests/certtool-eddsa index cd3c43ee5a..1a9661a520 100755 --- a/tests/cert-tests/certtool-eddsa +++ b/tests/cert-tests/certtool-eddsa @@ -70,7 +70,7 @@ fi # Create an RSA-PSS private key, restricted to the use with RSA-PSS ${VALGRIND} "${CERTTOOL}" --generate-privkey --pkcs8 --password '' \ - --eddsa --outfile "$KEYFILE" + --key-type eddsa --outfile "$KEYFILE" rc=$? if test "${rc}" != "0"; then @@ -106,7 +106,7 @@ if test "${rc}" != "0"; then fi # Create an EdDSA certificate from an RSA key -${VALGRIND} "${CERTTOOL}" --generate-certificate --eddsa \ +${VALGRIND} "${CERTTOOL}" --generate-certificate --key-type eddsa \ --load-privkey ${KEYFILE} \ --load-ca-privkey "${srcdir}/../../doc/credentials/x509/ca-key.pem" \ --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" \ diff --git a/tests/cert-tests/certtool-rsa-pss b/tests/cert-tests/certtool-rsa-pss index 24a45a2d94..81417d199b 100755 --- a/tests/cert-tests/certtool-rsa-pss +++ b/tests/cert-tests/certtool-rsa-pss @@ -41,7 +41,7 @@ fi # Create an RSA-PSS private key, restricted to the use with RSA-PSS ${VALGRIND} "${CERTTOOL}" --generate-privkey --pkcs8 --password '' \ - --rsa-pss --hash $i --outfile "$OUTFILE" + --key-type rsa-pss --hash $i --outfile "$OUTFILE" rc=$? if test "${rc}" != "0"; then @@ -84,7 +84,7 @@ fi done # Create an RSA-PSS certificate from an RSA key -${VALGRIND} "${CERTTOOL}" --generate-certificate --rsa-pss \ +${VALGRIND} "${CERTTOOL}" --generate-certificate --key-type rsa-pss \ --load-privkey "${srcdir}/../../doc/credentials/x509/key-rsa.pem" \ --load-ca-privkey "${srcdir}/../../doc/credentials/x509/ca-key.pem" \ --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" \ diff --git a/tests/cert-tests/rsa-pss-pad b/tests/cert-tests/rsa-pss-pad index 8129d9adcb..e2eccfbe8e 100755 --- a/tests/cert-tests/rsa-pss-pad +++ b/tests/cert-tests/rsa-pss-pad @@ -43,7 +43,7 @@ check_for_datefudge for i in sha256 sha384 sha512;do datefudge -s "2007-04-22" \ -"${CERTTOOL}" --generate-self-signed --rsa-pss \ +"${CERTTOOL}" --generate-self-signed --key-type rsa-pss \ --load-privkey "${srcdir}/data/template-test.key" \ --template "${srcdir}/templates/template-test.tmpl" \ --outfile "${TMPFILE}" --hash $i 2>/dev/null |