wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for building with ./configure --enable-asn=nocrypt. Added wolfCrypt test template for certpiv_test, pending test PIV certs to use.

Browse Source
This commit is contained in:
David Garske
2018-09-26 13:56:10 -07:00
parent 680a863054
commit 0c72dee315
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -1830,6 +1830,7 @@ else
if test "$ENABLED_ASN" = "nocrypt" if test "$ENABLED_ASN" = "nocrypt"
then then
AM_CFLAGS="$AM_CFLAGS -DNO_ASN_CRYPT" AM_CFLAGS="$AM_CFLAGS -DNO_ASN_CRYPT"
enable_pwdbased=no
fi fi
fi fi
fi fi
@@ -1851,7 +1852,7 @@ then
ENABLED_SLOWMATH=no ENABLED_SLOWMATH=no
fi fi
AM_CONDITIONAL([BUILD_ASN], [test "x$ENABLED_ASN" = "xyes"]) AM_CONDITIONAL([BUILD_ASN], [test "x$ENABLED_ASN" != "xno"])
# AES # AES

5
wolfcrypt/src/asn.c
View File

@@ -5803,6 +5803,9 @@ exit_cs:
#endif /* !NO_ASN_CRYPT */ #endif /* !NO_ASN_CRYPT */
(void)keyOID;
(void)sigOID;
WOLFSSL_LEAVE("ConfirmSignature", ret); WOLFSSL_LEAVE("ConfirmSignature", ret);
if (ret != WC_PENDING_E) { if (ret != WC_PENDING_E) {
@@ -7454,7 +7457,7 @@ int CheckCertSignature(const byte* cert, word32 certSz, void* heap, void* cm)
#endif #endif
return ret; return ret;
} }
#endif #endif /* WOLFSSL_SMALL_CERT_VERIFY */
int ParseCertRelative(DecodedCert* cert, int type, int verify, void* cm) int ParseCertRelative(DecodedCert* cert, int type, int verify, void* cm)
{ {

22
wolfcrypt/test/test.c
View File

@@ -360,6 +360,9 @@ int blob_test(void);
#ifdef WOLF_CRYPTO_DEV #ifdef WOLF_CRYPTO_DEV
int cryptodev_test(void); int cryptodev_test(void);
#endif #endif
#ifdef WOLFSSL_CERT_PIV
int certpiv_test(void);
#endif
/* General big buffer size for many tests. */ /* General big buffer size for many tests. */
#define FOURK_BUF 4096 #define FOURK_BUF 4096
@@ -1017,6 +1020,13 @@ initDefaultName();
printf( "crypto dev test passed!\n"); printf( "crypto dev test passed!\n");
#endif #endif
#ifdef WOLFSSL_CERT_PIV
if ( (ret = certpiv_test()) != 0)
return err_sys("cert piv test failed!\n", ret);
else
printf( "cert piv test passed!\n");
#endif
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
wolfAsync_DevClose(&devId); wolfAsync_DevClose(&devId);
#endif #endif
@@ -20318,6 +20328,18 @@ int cryptodev_test(void)
} }
#endif /* WOLF_CRYPTO_DEV */ #endif /* WOLF_CRYPTO_DEV */
#ifdef WOLFSSL_CERT_PIV
int certpiv_test(void)
{
/* TODO: Add test for wc_ParseCertPIV */
#if 0
wc_CertPIV piv;
ret = wc_ParseCertPIV(&piv, buf, totalSz);
#endif
return 0;
}
#endif /* WOLFSSL_CERT_PIV */
#undef ERROR_OUT #undef ERROR_OUT