Skip to content

Commit e1f1825

Browse files
olszomalmtrojnar
authored andcommitted
tests: fix check-privkey-prov argument and drop unused engines.cnf
1 parent 428aa38 commit e1f1825

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

tests/check-privkey-prov.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
6060
/* Load private key */
6161
private_key = load_pkey(argv[2], NULL);
6262
if (!private_key) {
63-
fprintf(stderr, "Cannot load private key: %s\n", argv[1]);
63+
fprintf(stderr, "Cannot load private key: %s\n", argv[2]);
6464
display_openssl_errors();
6565
goto cleanup;
6666
}

tests/provider-ec-check-privkey.softhsm

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ ${OPENSSL} x509 -in ${srcdir}/ec-cert.der -inform DER -outform PEM \
4545
CERTIFICATE="${outdir}/ec-cert.pem"
4646

4747
# Run the test
48-
${WRAPPER} ./check-privkey-prov ${CERTIFICATE} ${PRIVATE_KEY} \
49-
"${outdir}/engines.cnf"
48+
${WRAPPER} ./check-privkey-prov ${CERTIFICATE} ${PRIVATE_KEY}
5049
rc=$?
5150
if [[ $rc -eq 77 ]]; then
5251
echo "EC key test skipped."
@@ -57,8 +56,7 @@ elif [[ $rc -ne 0 ]]; then
5756
exit 1
5857
fi
5958

60-
./check-privkey-prov ${CERTIFICATE_URL} ${PRIVATE_KEY} \
61-
"${outdir}/engines.cnf"
59+
./check-privkey-prov ${CERTIFICATE_URL} ${PRIVATE_KEY}
6260
if [[ $? -ne 0 ]]; then
6361
echo "The private key loading couldn't get the public key from the certificate URL."
6462
exit 1

tests/provider-rsa-check-privkey.softhsm

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ ${OPENSSL} x509 -in ${srcdir}/rsa-cert.der -inform DER -outform PEM \
4545
CERTIFICATE="${outdir}/rsa-cert.pem"
4646

4747
# Run the test
48-
${WRAPPER} ./check-privkey-prov ${CERTIFICATE} ${PRIVATE_KEY} \
49-
"${outdir}/engines.cnf"
48+
${WRAPPER} ./check-privkey-prov ${CERTIFICATE} ${PRIVATE_KEY}
5049
rc=$?
5150
if [[ $rc -eq 77 ]]; then
5251
echo "RSA key test skipped."
@@ -57,8 +56,7 @@ elif [[ $rc -ne 0 ]]; then
5756
exit 1
5857
fi
5958

60-
./check-privkey-prov ${CERTIFICATE_URL} ${PRIVATE_KEY} \
61-
"${outdir}/engines.cnf"
59+
./check-privkey-prov ${CERTIFICATE_URL} ${PRIVATE_KEY}
6260
if [[ $? -ne 0 ]]; then
6361
echo "The private key loading couldn't get the public key from the certificate URL."
6462
exit 1

0 commit comments

Comments
 (0)