diff --git a/src/internal.c b/src/internal.c index f19d8fa10d..94e66c1095 100644 --- a/src/internal.c +++ b/src/internal.c @@ -27436,7 +27436,7 @@ static const char* wolfSSL_ERR_reason_error_string_OpenSSL(unsigned long e) return "certificate has expired"; case WOLFSSL_X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD: - return "certificate signature failure"; + return "format error in certificate's notBefore field"; case WOLFSSL_X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD: return "format error in certificate's notAfter field"; diff --git a/src/ssl_crypto.c b/src/ssl_crypto.c index 81f17c8dda..3393f25fef 100644 --- a/src/ssl_crypto.c +++ b/src/ssl_crypto.c @@ -2659,7 +2659,7 @@ void wolfSSL_DES_cbc_encrypt(const unsigned char* input, unsigned char* output, WOLFSSL_ENTER("wolfSSL_DES_cbc_encrypt"); #ifdef WOLFSSL_SMALL_STACK - des = (Des*)XMALLOC(sizeof(Des3), NULL, DYNAMIC_TYPE_CIPHER); + des = (Des*)XMALLOC(sizeof(Des), NULL, DYNAMIC_TYPE_CIPHER); if (des == NULL) { WOLFSSL_MSG("Failed to allocate memory for Des object"); } diff --git a/tests/api/test_certman.c b/tests/api/test_certman.c index 5ea6a8f3ee..f611010565 100644 --- a/tests/api/test_certman.c +++ b/tests/api/test_certman.c @@ -3519,3 +3519,19 @@ cleanup: #endif return EXPECT_RESULT(); } + +int test_wolfSSL_X509_V_ERR_strings(void) +{ + EXPECT_DECLS; +#if !defined(NO_ERROR_STRINGS) && (defined(OPENSSL_EXTRA) || \ + defined(OPENSSL_EXTRA_X509_SMALL) || \ + defined(HAVE_WEBSERVER) || defined(HAVE_MEMCACHED)) + ExpectStrEQ(wolfSSL_ERR_reason_error_string( + WOLFSSL_X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD), + "format error in certificate's notBefore field"); + ExpectStrEQ(wolfSSL_ERR_reason_error_string( + WOLFSSL_X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD), + "format error in certificate's notAfter field"); +#endif + return EXPECT_RESULT(); +} diff --git a/tests/api/test_certman.h b/tests/api/test_certman.h index 4d04943298..52bef8e1aa 100644 --- a/tests/api/test_certman.h +++ b/tests/api/test_certman.h @@ -50,6 +50,7 @@ int test_wolfSSL_CRL_unknown_critical_entry_ext(void); int test_wolfSSL_CertManagerCheckOCSPResponse(void); int test_various_pathlen_chains(void); int test_wolfSSL_CertManagerRejectMD5Cert(void); +int test_wolfSSL_X509_V_ERR_strings(void); #define TEST_CERTMAN_DECLS \ TEST_DECL_GROUP("certman", test_wolfSSL_CertManagerAPI), \ @@ -78,7 +79,8 @@ int test_wolfSSL_CertManagerRejectMD5Cert(void); TEST_DECL_GROUP("certman", test_wolfSSL_CRL_unknown_critical_entry_ext), \ TEST_DECL_GROUP("certman", test_wolfSSL_CertManagerCheckOCSPResponse), \ TEST_DECL_GROUP("certman", test_various_pathlen_chains), \ - TEST_DECL_GROUP("certman", test_wolfSSL_CertManagerRejectMD5Cert) + TEST_DECL_GROUP("certman", test_wolfSSL_CertManagerRejectMD5Cert), \ + TEST_DECL_GROUP("certman", test_wolfSSL_X509_V_ERR_strings) #endif /* WOLFCRYPT_TEST_CERTMAN_H */