diff --git a/configure.ac b/configure.ac index 6f68dcd4f..56c66677a 100644 --- a/configure.ac +++ b/configure.ac @@ -401,6 +401,21 @@ AC_ARG_ENABLE([haproxy], ) +# OpenSSL Coexist +AC_ARG_ENABLE([opensslcoexist], + [AS_HELP_STRING([--enable-opensslcoexist],[Enable coexistence of wolfssl/openssl (default: disabled)])], + [ ENABLED_OPENSSLCOEXIST=$enableval ], + [ ENABLED_OPENSSLCOEXIST=no ] + ) +if test "x$ENABLED_OPENSSLCOEXIST" = "xyes" +then + # make sure old names are disabled + enable_oldnames=no + + AM_CFLAGS="$AM_CFLAGS -DOPENSSL_COEXIST" +fi + + # OPENSSL Extra Compatibility AC_ARG_ENABLE([opensslextra], [AS_HELP_STRING([--enable-opensslextra],[Enable extra OpenSSL API, size+ (default: disabled)])], @@ -412,7 +427,7 @@ then ENABLED_OPENSSLEXTRA="yes" fi -if test "$ENABLED_OPENSSLEXTRA" = "yes" +if test "$ENABLED_OPENSSLEXTRA" = "yes" && test "x$ENABLED_OPENSSLCOEXIST" = "xno" then AM_CFLAGS="-DOPENSSL_EXTRA $AM_CFLAGS" fi @@ -2625,7 +2640,7 @@ then AM_CFLAGS="$AM_CFLAGS -DECC_SHAMIR" fi fi - if test "x$ENABLED_OPENSSLEXTRA" = "xno" + if test "x$ENABLED_OPENSSLEXTRA" = "xno" && test "x$ENABLED_OPENSSLCOEXIST" = "xno" then ENABLED_OPENSSLEXTRA="yes" AM_CFLAGS="-DOPENSSL_EXTRA $AM_CFLAGS" @@ -2723,7 +2738,7 @@ AC_ARG_ENABLE([lighty], if test "$ENABLED_LIGHTY" = "yes" then # Requires opensslextra make sure on - if test "x$ENABLED_OPENSSLEXTRA" = "xno" + if test "x$ENABLED_OPENSSLEXTRA" = "xno" && test "x$ENABLED_OPENSSLCOEXIST" = "xno" then ENABLED_OPENSSLEXTRA="yes" AM_CFLAGS="-DOPENSSL_EXTRA $AM_CFLAGS" @@ -2740,7 +2755,7 @@ if test "$ENABLED_HAPROXY" = "yes" then AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HAPROXY" # Requires opensslextra make sure on - if test "x$ENABLED_OPENSSLEXTRA" = "xno" + if test "x$ENABLED_OPENSSLEXTRA" = "xno" && test "x$ENABLED_OPENSSLCOEXIST" = "xno" then ENABLED_OPENSSLEXTRA="yes" AM_CFLAGS="-DOPENSSL_EXTRA $AM_CFLAGS" @@ -2769,7 +2784,7 @@ fi if test "$ENABLED_STUNNEL" = "yes" then # Requires opensslextra make sure on - if test "x$ENABLED_OPENSSLEXTRA" = "xno" + if test "x$ENABLED_OPENSSLEXTRA" = "xno" && test "x$ENABLED_OPENSSLCOEXIST" = "xno" then ENABLED_OPENSSLEXTRA="yes" AM_CFLAGS="-DOPENSSL_EXTRA $AM_CFLAGS" @@ -3474,6 +3489,20 @@ then fi +# Old name support for backwards compatibility +AC_ARG_ENABLE([oldnames], + [AS_HELP_STRING([--enable-oldnames],[Keep backwards compat with old names (default: enabled)])], + [ ENABLED_OLDNAMES=$enableval ], + [ ENABLED_OLDNAMES=yes ] + ) + +if test "x$ENABLED_OLDNAMES" = "xno" && test "x$ENABLED_OPENSSLCOEXIST" = "xno" +then + AM_CFLAGS="$AM_CFLAGS -DNO_OLD_RNGNAME -DNO_OLD_WC_NAMES -DNO_OLD_SSL_NAMES" +fi + + + # check if PSK was enabled for conditionally running psk.test script AM_CONDITIONAL([BUILD_PSK], [test "x$ENABLED_PSK" = "xyes"]) @@ -3871,6 +3900,8 @@ echo " * Single threaded: $ENABLED_SINGLETHREADED" echo " * Filesystem: $ENABLED_FILESYSTEM" echo " * OpenSSH Build: $ENABLED_OPENSSH" echo " * OpenSSL Extra API: $ENABLED_OPENSSLEXTRA" +echo " * OpenSSL Coexist: $ENABLED_OPENSSLCOEXIST" +echo " * Old Names: $ENABLED_OLDNAMES" echo " * Max Strength Build: $ENABLED_MAXSTRENGTH" echo " * Distro Build: $ENABLED_DISTRO" echo " * fastmath: $ENABLED_FASTMATH" diff --git a/examples/client/client.c b/examples/client/client.c index 2c230153f..a685ab21e 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -46,7 +46,7 @@ #include -#include "examples/client/client.h" +#include #ifndef NO_WOLFSSL_CLIENT @@ -106,14 +106,14 @@ static int NonBlockingSSL_Connect(WOLFSSL* ssl) error = wolfSSL_get_error(ssl, 0); sockfd = (SOCKET_T)wolfSSL_get_fd(ssl); - while (ret != SSL_SUCCESS && (error == SSL_ERROR_WANT_READ || - error == SSL_ERROR_WANT_WRITE || + while (ret != WOLF_SSL_SUCCESS && (error == WOLF_SSL_ERROR_WANT_READ || + error == WOLF_SSL_ERROR_WANT_WRITE || error == WC_PENDING_E)) { int currTimeout = 1; - if (error == SSL_ERROR_WANT_READ) + if (error == WOLF_SSL_ERROR_WANT_READ) printf("... client would read block\n"); - else if (error == SSL_ERROR_WANT_WRITE) + else if (error == WOLF_SSL_ERROR_WANT_WRITE) printf("... client would write block\n"); #ifdef WOLFSSL_ASYNC_CRYPT else if (error == WC_PENDING_E) { @@ -139,16 +139,16 @@ static int NonBlockingSSL_Connect(WOLFSSL* ssl) error = wolfSSL_get_error(ssl, 0); } else if (select_ret == TEST_TIMEOUT && !wolfSSL_dtls(ssl)) { - error = SSL_ERROR_WANT_READ; + error = WOLF_SSL_ERROR_WANT_READ; } #ifdef WOLFSSL_DTLS else if (select_ret == TEST_TIMEOUT && wolfSSL_dtls(ssl) && wolfSSL_dtls_got_timeout(ssl) >= 0) { - error = SSL_ERROR_WANT_READ; + error = WOLF_SSL_ERROR_WANT_READ; } #endif else { - error = SSL_FATAL_ERROR; + error = WOLF_SSL_FATAL_ERROR; } } @@ -162,7 +162,7 @@ static void ShowCiphers(void) int ret = wolfSSL_get_ciphers(ciphers, (int)sizeof(ciphers)); - if (ret == SSL_SUCCESS) + if (ret == WOLF_SSL_SUCCESS) printf("%s\n", ciphers); } @@ -232,20 +232,20 @@ static int ClientBenchmarkConnections(WOLFSSL_CTX* ctx, char* host, word16 port, #endif if (useX25519) { if (wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_X25519) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { err_sys("unable to use curve x25519"); } } #endif #endif - if (wolfSSL_set_fd(ssl, sockfd) != SSL_SUCCESS) { + if (wolfSSL_set_fd(ssl, sockfd) != WOLF_SSL_SUCCESS) { err_sys("error in setting fd"); } do { err = 0; /* reset error */ ret = wolfSSL_connect(ssl); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { err = wolfSSL_get_error(ssl, 0); #ifdef WOLFSSL_ASYNC_CRYPT if (err == WC_PENDING_E) { @@ -255,7 +255,7 @@ static int ClientBenchmarkConnections(WOLFSSL_CTX* ctx, char* host, word16 port, #endif } } while (err == WC_PENDING_E); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { err_sys("SSL_connect failed"); } @@ -307,7 +307,7 @@ static int ClientBenchmarkThroughput(WOLFSSL_CTX* ctx, char* host, word16 port, err_sys("unable to get SSL object"); tcp_connect(&sockfd, host, port, dtlsUDP, dtlsSCTP, ssl); - if (wolfSSL_set_fd(ssl, sockfd) != SSL_SUCCESS) { + if (wolfSSL_set_fd(ssl, sockfd) != WOLF_SSL_SUCCESS) { err_sys("error in setting fd"); } @@ -316,7 +316,7 @@ static int ClientBenchmarkThroughput(WOLFSSL_CTX* ctx, char* host, word16 port, #ifdef HAVE_CURVE25519 if (useX25519) { if (wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_X25519) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { err_sys("unable to use curve x25519"); } } @@ -326,7 +326,7 @@ static int ClientBenchmarkThroughput(WOLFSSL_CTX* ctx, char* host, word16 port, do { err = 0; /* reset error */ ret = wolfSSL_connect(ssl); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { err = wolfSSL_get_error(ssl, 0); #ifdef WOLFSSL_ASYNC_CRYPT if (err == WC_PENDING_E) { @@ -336,7 +336,7 @@ static int ClientBenchmarkThroughput(WOLFSSL_CTX* ctx, char* host, word16 port, #endif } } while (err == WC_PENDING_E); - if (ret == SSL_SUCCESS) { + if (ret == WOLF_SSL_SUCCESS) { /* Perform throughput test */ char *tx_buffer, *rx_buffer; @@ -411,7 +411,7 @@ static int ClientBenchmarkThroughput(WOLFSSL_CTX* ctx, char* host, word16 port, } else #endif - if (err != SSL_ERROR_WANT_READ) { + if (err != WOLF_SSL_ERROR_WANT_READ) { printf("SSL_read bench error %d\n", err); err_sys("SSL_read failed"); } @@ -528,7 +528,7 @@ static int StartTLS_Init(SOCKET_T* sockfd) err_sys("incorrect STARTTLS command received, expected 220"); } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* Closes down the SMTP connection */ @@ -581,10 +581,10 @@ static int SMTP_Shutdown(WOLFSSL* ssl, int wc_shutdown) printf("%s\n", tmpBuf); ret = wolfSSL_shutdown(ssl); - if (wc_shutdown && ret == SSL_SHUTDOWN_NOT_DONE) + if (wc_shutdown && ret == WOLF_SSL_SHUTDOWN_NOT_DONE) wolfSSL_shutdown(ssl); /* bidirectional shutdown */ - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } static void ClientWrite(WOLFSSL* ssl, char* msg, int msgSz) @@ -629,13 +629,13 @@ static void ClientRead(WOLFSSL* ssl, char* reply, int replyLen, int mustRead) } else #endif - if (err != SSL_ERROR_WANT_READ) { + if (err != WOLF_SSL_ERROR_WANT_READ) { printf("SSL_read reply error %d, %s\n", err, wolfSSL_ERR_error_string(err, buffer)); err_sys("SSL_read failed"); } } - } while (err == WC_PENDING_E || (mustRead && err == SSL_ERROR_WANT_READ)); + } while (err == WC_PENDING_E || (mustRead && err == WOLF_SSL_ERROR_WANT_READ)); if (ret > 0) { reply[ret] = 0; printf("%s\n", reply); @@ -1411,14 +1411,14 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) err_sys("unable to get ctx"); #ifdef SINGLE_THREADED - if (wolfSSL_CTX_new_rng(ctx) != SSL_SUCCESS) { + if (wolfSSL_CTX_new_rng(ctx) != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("Single Threaded new rng at CTX failed"); } #endif if (cipherList && !useDefCipherList) { - if (wolfSSL_CTX_set_cipher_list(ctx, cipherList) != SSL_SUCCESS) { + if (wolfSSL_CTX_set_cipher_list(ctx, cipherList) != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("client can't set cipher list 1"); } @@ -1461,7 +1461,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) defaultCipherList = "PSK-AES128-CBC-SHA256"; #endif if (wolfSSL_CTX_set_cipher_list(ctx,defaultCipherList) - !=SSL_SUCCESS) { + !=WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("client can't set cipher list 2"); } @@ -1477,7 +1477,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) if (cipherList == NULL || (cipherList && useDefCipherList)) { wolfSSL_CTX_allow_anon_cipher(ctx); if (wolfSSL_CTX_set_cipher_list(ctx,"ADH-AES128-SHA") - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("client can't set cipher list 4"); } @@ -1500,7 +1500,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #if defined(WOLFSSL_SNIFFER) if (cipherList == NULL) { /* don't use EDH, can't sniff tmp keys */ - if (wolfSSL_CTX_set_cipher_list(ctx, "AES128-SHA") != SSL_SUCCESS) { + if (wolfSSL_CTX_set_cipher_list(ctx, "AES128-SHA") != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("client can't set cipher list 3"); } @@ -1531,14 +1531,14 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) if (useClientCert){ #if !defined(NO_FILESYSTEM) if (wolfSSL_CTX_use_certificate_chain_file(ctx, ourCert) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("can't load client cert file, check file and run from" " wolfSSL home dir"); } - if (wolfSSL_CTX_use_PrivateKey_file(ctx, ourKey, SSL_FILETYPE_PEM) - != SSL_SUCCESS) { + if (wolfSSL_CTX_use_PrivateKey_file(ctx, ourKey, WOLF_SSL_FILETYPE_PEM) + != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("can't load client private key file, check file and run " "from wolfSSL home dir"); @@ -1552,7 +1552,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) if (!usePsk && !useAnon && !useVerifyCb) { #if !defined(NO_FILESYSTEM) if (wolfSSL_CTX_load_verify_locations(ctx, verifyCert,0) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("can't load ca file, Please run from wolfSSL home dir"); } @@ -1562,7 +1562,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #ifdef HAVE_ECC /* load ecc verify too, echoserver uses it by default w/ ecc */ #if !defined(NO_FILESYSTEM) - if (wolfSSL_CTX_load_verify_locations(ctx, eccCertFile, 0) != SSL_SUCCESS) { + if (wolfSSL_CTX_load_verify_locations(ctx, eccCertFile, 0) != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("can't load ecc ca file, Please run from wolfSSL home dir"); } @@ -1573,7 +1573,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #if defined(WOLFSSL_TRUST_PEER_CERT) && !defined(NO_FILESYSTEM) if (trustCert) { if ((ret = wolfSSL_CTX_trust_peer_cert(ctx, trustCert, - SSL_FILETYPE_PEM)) != SSL_SUCCESS) { + WOLF_SSL_FILETYPE_PEM)) != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("can't load trusted peer cert file"); } @@ -1581,11 +1581,11 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #endif /* WOLFSSL_TRUST_PEER_CERT && !NO_FILESYSTEM */ } if (useVerifyCb) - wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, myVerify); + wolfSSL_CTX_set_verify(ctx, WOLF_SSL_VERIFY_PEER, myVerify); else if (!usePsk && !useAnon && doPeerCheck == 0) - wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0); + wolfSSL_CTX_set_verify(ctx, WOLF_SSL_VERIFY_NONE, 0); else if (!usePsk && !useAnon && overrideDateErrors == 1) - wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, myDateCb); + wolfSSL_CTX_set_verify(ctx, WOLF_SSL_VERIFY_PEER, myDateCb); #endif /* !defined(NO_CERTS) */ #ifdef WOLFSSL_ASYNC_CRYPT @@ -1599,34 +1599,34 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #ifdef HAVE_SNI if (sniHostName) if (wolfSSL_CTX_UseSNI(ctx, 0, sniHostName, XSTRLEN(sniHostName)) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("UseSNI failed"); } #endif #ifdef HAVE_MAX_FRAGMENT if (maxFragment) - if (wolfSSL_CTX_UseMaxFragment(ctx, maxFragment) != SSL_SUCCESS) { + if (wolfSSL_CTX_UseMaxFragment(ctx, maxFragment) != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("UseMaxFragment failed"); } #endif #ifdef HAVE_TRUNCATED_HMAC if (truncatedHMAC) - if (wolfSSL_CTX_UseTruncatedHMAC(ctx) != SSL_SUCCESS) { + if (wolfSSL_CTX_UseTruncatedHMAC(ctx) != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("UseTruncatedHMAC failed"); } #endif #ifdef HAVE_SESSION_TICKET - if (wolfSSL_CTX_UseSessionTicket(ctx) != SSL_SUCCESS) { + if (wolfSSL_CTX_UseSessionTicket(ctx) != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("UseSessionTicket failed"); } #endif #ifdef HAVE_EXTENDED_MASTER if (disableExtMasterSecret) - if (wolfSSL_CTX_DisableExtendedMasterSecret(ctx) != SSL_SUCCESS) { + if (wolfSSL_CTX_DisableExtendedMasterSecret(ctx) != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("DisableExtendedMasterSecret failed"); } @@ -1634,11 +1634,11 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #if defined(HAVE_CURVE25519) && defined(HAVE_SUPPORTED_CURVES) if (useX25519) { if (wolfSSL_CTX_UseSupportedCurve(ctx, WOLFSSL_ECC_X25519) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { err_sys("unable to support X25519"); } if (wolfSSL_CTX_UseSupportedCurve(ctx, WOLFSSL_ECC_SECP256R1) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { err_sys("unable to support secp256r1"); } } @@ -1662,7 +1662,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) } #if defined(WOLFSSL_MDK_ARM) - wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0); + wolfSSL_CTX_set_verify(ctx, WOLF_SSL_VERIFY_NONE, 0); #endif #if defined(OPENSSL_EXTRA) @@ -1670,7 +1670,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) wolfSSL_CTX_free(ctx); err_sys("bad read ahead default value"); } - if (wolfSSL_CTX_set_read_ahead(ctx, 1) != SSL_SUCCESS) { + if (wolfSSL_CTX_set_read_ahead(ctx, 1) != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("error setting read ahead value"); } @@ -1688,7 +1688,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) if (doMcast) { #ifdef WOLFSSL_MULTICAST wolfSSL_CTX_mcast_set_member_id(ctx, mcastID); - if (wolfSSL_CTX_set_cipher_list(ctx, "WDM-NULL-SHA256") != SSL_SUCCESS) { + if (wolfSSL_CTX_set_cipher_list(ctx, "WDM-NULL-SHA256") != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("Couldn't set multicast cipher list."); } @@ -1711,7 +1711,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #ifdef HAVE_CURVE25519 if (useX25519) { if (wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_X25519) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { err_sys("unable to use curve x25519"); } } @@ -1719,13 +1719,13 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #ifdef HAVE_ECC #if defined(HAVE_ECC256) || defined(HAVE_ALL_CURVES) if (wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_SECP256R1) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { err_sys("unable to use curve secp256r1"); } #endif #if defined(HAVE_ECC384) || defined(HAVE_ALL_CURVES) if (wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_SECP384R1) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { err_sys("unable to use curve secp384r1"); } #endif @@ -1733,7 +1733,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) } if (onlyKeyShare == 0 || onlyKeyShare == 1) { #ifdef HAVE_FFDHE_2048 - if (wolfSSL_UseKeyShare(ssl, WOLFSSL_FFDHE_2048) != SSL_SUCCESS) { + if (wolfSSL_UseKeyShare(ssl, WOLFSSL_FFDHE_2048) != WOLF_SSL_SUCCESS) { err_sys("unable to use DH 2048-bit parameters"); } #endif @@ -1756,7 +1756,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) XMEMSET(sr, 0x5A, sizeof(sr)); if (wolfSSL_set_secret(ssl, 1, pms, sizeof(pms), cr, sr, suite) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { wolfSSL_CTX_free(ctx); err_sys("unable to set mcast secret"); } @@ -1778,7 +1778,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) switch (statusRequest) { case WOLFSSL_CSR_OCSP: if (wolfSSL_UseOCSPStapling(ssl, WOLFSSL_CSR_OCSP, - WOLFSSL_CSR_OCSP_USE_NONCE) != SSL_SUCCESS) { + WOLFSSL_CSR_OCSP_USE_NONCE) != WOLF_SSL_SUCCESS) { wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); err_sys("UseCertificateStatusRequest failed"); @@ -1796,7 +1796,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) case WOLFSSL_CSR2_OCSP: if (wolfSSL_UseOCSPStaplingV2(ssl, WOLFSSL_CSR2_OCSP, WOLFSSL_CSR2_OCSP_USE_NONCE) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); err_sys("UseCertificateStatusRequest failed"); @@ -1805,7 +1805,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) case WOLFSSL_CSR2_OCSP_MULTI: if (wolfSSL_UseOCSPStaplingV2(ssl, WOLFSSL_CSR2_OCSP_MULTI, 0) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); err_sys("UseCertificateStatusRequest failed"); @@ -1819,7 +1819,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #endif tcp_connect(&sockfd, host, port, dtlsUDP, dtlsSCTP, ssl); - if (wolfSSL_set_fd(ssl, sockfd) != SSL_SUCCESS) { + if (wolfSSL_set_fd(ssl, sockfd) != WOLF_SSL_SUCCESS) { wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); err_sys("error in setting fd"); @@ -1827,7 +1827,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) /* STARTTLS */ if (doSTARTTLS) { - if (StartTLS_Init(&sockfd) != SSL_SUCCESS) { + if (StartTLS_Init(&sockfd) != WOLF_SSL_SUCCESS) { wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); err_sys("error during STARTTLS protocol"); @@ -1840,18 +1840,18 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) wolfIO_SetTimeout(DEFAULT_TIMEOUT_SEC); #endif - if (wolfSSL_EnableCRL(ssl, WOLFSSL_CRL_CHECKALL) != SSL_SUCCESS) { + if (wolfSSL_EnableCRL(ssl, WOLFSSL_CRL_CHECKALL) != WOLF_SSL_SUCCESS) { wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); err_sys("can't enable crl check"); } - if (wolfSSL_LoadCRL(ssl, crlPemDir, SSL_FILETYPE_PEM, 0) - != SSL_SUCCESS) { + if (wolfSSL_LoadCRL(ssl, crlPemDir, WOLF_SSL_FILETYPE_PEM, 0) + != WOLF_SSL_SUCCESS) { wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); err_sys("can't load crl, check crlfile and date validity"); } - if (wolfSSL_SetCRL_Cb(ssl, CRL_CallBack) != SSL_SUCCESS) { + if (wolfSSL_SetCRL_Cb(ssl, CRL_CallBack) != WOLF_SSL_SUCCESS) { wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); err_sys("can't set crl callback"); @@ -1860,7 +1860,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #endif #ifdef HAVE_SECURE_RENEGOTIATION if (scr) { - if (wolfSSL_UseSecureRenegotiation(ssl) != SSL_SUCCESS) { + if (wolfSSL_UseSecureRenegotiation(ssl) != WOLF_SSL_SUCCESS) { wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); err_sys("can't enable secure renegotiation"); @@ -1887,7 +1887,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) do { err = 0; /* reset error */ ret = wolfSSL_connect(ssl); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { err = wolfSSL_get_error(ssl, 0); #ifdef WOLFSSL_ASYNC_CRYPT if (err == WC_PENDING_E) { @@ -1903,7 +1903,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) timeout.tv_usec = 0; ret = NonBlockingSSL_Connect(ssl); /* will keep retrying on timeout */ #endif - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { printf("wolfSSL_connect error %d, %s\n", err, wolfSSL_ERR_error_string(err, buffer)); wolfSSL_free(ssl); @@ -1953,7 +1953,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) if (doSTARTTLS) { if (XSTRNCMP(starttlsProt, "smtp", 4) == 0) { - if (SMTP_Shutdown(ssl, wc_shutdown) != SSL_SUCCESS) { + if (SMTP_Shutdown(ssl, wc_shutdown) != WOLF_SSL_SUCCESS) { wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); err_sys("error closing STARTTLS connection"); @@ -1975,7 +1975,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) word16 protocol_nameSz = 0; err = wolfSSL_ALPN_GetProtocol(ssl, &protocol_name, &protocol_nameSz); - if (err == SSL_SUCCESS) + if (err == WOLF_SSL_SUCCESS) printf("Received ALPN protocol : %s (%d)\n", protocol_name, protocol_nameSz); else if (err == SSL_ALPN_NOT_FOUND) @@ -1991,7 +1991,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) printf("not doing secure renegotiation on example with" " nonblocking yet"); } else { - if (wolfSSL_Rehandshake(ssl) != SSL_SUCCESS) { + if (wolfSSL_Rehandshake(ssl) != WOLF_SSL_SUCCESS) { err = wolfSSL_get_error(ssl, 0); printf("err = %d, %s\n", err, wolfSSL_ERR_error_string(err, buffer)); @@ -2056,7 +2056,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) if (dtlsUDP == 0) { /* don't send alert after "break" command */ ret = wolfSSL_shutdown(ssl); - if (wc_shutdown && ret == SSL_SHUTDOWN_NOT_DONE) + if (wc_shutdown && ret == WOLF_SSL_SHUTDOWN_NOT_DONE) wolfSSL_shutdown(ssl); /* bidirectional shutdown */ } #ifdef ATOMIC_USER @@ -2078,7 +2078,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #endif } tcp_connect(&sockfd, host, port, dtlsUDP, dtlsSCTP, sslResume); - if (wolfSSL_set_fd(sslResume, sockfd) != SSL_SUCCESS) { + if (wolfSSL_set_fd(sslResume, sockfd) != WOLF_SSL_SUCCESS) { wolfSSL_free(sslResume); wolfSSL_CTX_free(ctx); err_sys("error in setting fd"); @@ -2092,7 +2092,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #endif #ifdef HAVE_SECURE_RENEGOTIATION if (scr) { - if (wolfSSL_UseSecureRenegotiation(sslResume) != SSL_SUCCESS) { + if (wolfSSL_UseSecureRenegotiation(sslResume) != WOLF_SSL_SUCCESS) { wolfSSL_free(sslResume); wolfSSL_CTX_free(ctx); err_sys("can't enable secure renegotiation"); @@ -2108,23 +2108,23 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #ifdef WOLFSSL_TLS13 #ifdef HAVE_CURVE25519 if (useX25519) { - if (wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_X25519) != SSL_SUCCESS) { + if (wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_X25519) != WOLF_SSL_SUCCESS) { err_sys("unable to use curve x25519"); } } #endif #ifdef HAVE_ECC if (wolfSSL_UseKeyShare(sslResume, - WOLFSSL_ECC_SECP256R1) != SSL_SUCCESS) { + WOLFSSL_ECC_SECP256R1) != WOLF_SSL_SUCCESS) { err_sys("unable to use curve secp256r1"); } if (wolfSSL_UseKeyShare(sslResume, - WOLFSSL_ECC_SECP384R1) != SSL_SUCCESS) { + WOLFSSL_ECC_SECP384R1) != WOLF_SSL_SUCCESS) { err_sys("unable to use curve secp384r1"); } #endif #ifdef HAVE_FFDHE_2048 - if (wolfSSL_UseKeyShare(sslResume, WOLFSSL_FFDHE_2048) != SSL_SUCCESS) { + if (wolfSSL_UseKeyShare(sslResume, WOLFSSL_FFDHE_2048) != WOLF_SSL_SUCCESS) { err_sys("unable to use DH 2048-bit parameters"); } #endif @@ -2193,7 +2193,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) do { err = 0; /* reset error */ ret = wolfSSL_connect(sslResume); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { err = wolfSSL_get_error(sslResume, 0); #ifdef WOLFSSL_ASYNC_CRYPT if (err == WC_PENDING_E) { @@ -2210,7 +2210,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) timeout.tv_usec = 0; ret = NonBlockingSSL_Connect(ssl); /* will keep retrying on timeout */ #endif - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { printf("wolfSSL_connect resume error %d, %s\n", err, wolfSSL_ERR_error_string(err, buffer)); wolfSSL_free(sslResume); @@ -2233,7 +2233,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) printf("Sending ALPN accepted list : %s\n", alpnList); err = wolfSSL_ALPN_GetProtocol(sslResume, &protocol_name, &protocol_nameSz); - if (err == SSL_SUCCESS) + if (err == WOLF_SSL_SUCCESS) printf("Received ALPN protocol : %s (%d)\n", protocol_name, protocol_nameSz); else if (err == SSL_ALPN_NOT_FOUND) @@ -2329,7 +2329,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) } } if (ret < 0) { - if (err != SSL_ERROR_WANT_READ) { + if (err != WOLF_SSL_ERROR_WANT_READ) { printf("SSL_read resume error %d, %s\n", err, wolfSSL_ERR_error_string(err, buffer)); wolfSSL_free(sslResume); @@ -2354,7 +2354,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) } while (err == WC_PENDING_E); ret = wolfSSL_shutdown(sslResume); - if (wc_shutdown && ret == SSL_SHUTDOWN_NOT_DONE) + if (wc_shutdown && ret == WOLF_SSL_SHUTDOWN_NOT_DONE) wolfSSL_shutdown(sslResume); /* bidirectional shutdown */ wolfSSL_free(sslResume); diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c index 4e4afdf8d..897318db7 100644 --- a/examples/echoclient/echoclient.c +++ b/examples/echoclient/echoclient.c @@ -52,7 +52,7 @@ #include -#include "examples/echoclient/echoclient.h" +#include #ifndef NO_WOLFSSL_CLIENT @@ -135,11 +135,11 @@ void echoclient_test(void* args) #ifndef NO_FILESYSTEM #ifndef NO_RSA - if (SSL_CTX_load_verify_locations(ctx, caCertFile, 0) != SSL_SUCCESS) + if (SSL_CTX_load_verify_locations(ctx, caCertFile, 0) != WOLF_SSL_SUCCESS) err_sys("can't load ca file, Please run from wolfSSL home dir"); #endif #ifdef HAVE_ECC - if (SSL_CTX_load_verify_locations(ctx, eccCertFile, 0) != SSL_SUCCESS) + if (SSL_CTX_load_verify_locations(ctx, eccCertFile, 0) != WOLF_SSL_SUCCESS) err_sys("can't load ca file, Please run from wolfSSL home dir"); #endif #elif !defined(NO_CERTS) @@ -163,7 +163,7 @@ void echoclient_test(void* args) #else defaultCipherList = "PSK-AES128-CBC-SHA256"; #endif - if (CyaSSL_CTX_set_cipher_list(ctx,defaultCipherList) !=SSL_SUCCESS) + if (CyaSSL_CTX_set_cipher_list(ctx,defaultCipherList) !=WOLF_SSL_SUCCESS) err_sys("client can't set cipher list 2"); #endif } @@ -173,7 +173,7 @@ void echoclient_test(void* args) #endif #if defined(WOLFSSL_MDK_ARM) - CyaSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0); + CyaSSL_CTX_set_verify(ctx, WOLF_SSL_VERIFY_NONE, 0); #endif #ifdef WOLFSSL_ASYNC_CRYPT @@ -196,7 +196,7 @@ void echoclient_test(void* args) do { err = 0; /* Reset error */ ret = SSL_connect(ssl); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { err = SSL_get_error(ssl, 0); #ifdef WOLFSSL_ASYNC_CRYPT if (err == WC_PENDING_E) { @@ -206,7 +206,7 @@ void echoclient_test(void* args) #endif } } while (err == WC_PENDING_E); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { printf("SSL_connect error %d, %s\n", err, ERR_error_string(err, buffer)); err_sys("SSL_connect failed"); diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c index 77e6aa163..68bc1ea46 100644 --- a/examples/echoserver/echoserver.c +++ b/examples/echoserver/echoserver.c @@ -151,7 +151,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args) #error "no valid server method built in" #endif ctx = CyaSSL_CTX_new(method); - /* CyaSSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF); */ + /* CyaSSL_CTX_set_session_cache_mode(ctx, WOLF_SSL_SESS_CACHE_OFF); */ #if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) CyaSSL_CTX_set_default_passwd_cb(ctx, PasswordCallBack); @@ -168,37 +168,37 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args) if (doPSK == 0) { #if defined(HAVE_NTRU) && defined(WOLFSSL_STATIC_RSA) /* ntru */ - if (CyaSSL_CTX_use_certificate_file(ctx, ntruCertFile, SSL_FILETYPE_PEM) - != SSL_SUCCESS) + if (CyaSSL_CTX_use_certificate_file(ctx, ntruCertFile, WOLF_SSL_FILETYPE_PEM) + != WOLF_SSL_SUCCESS) err_sys("can't load ntru cert file, " "Please run from wolfSSL home dir"); if (CyaSSL_CTX_use_NTRUPrivateKey_file(ctx, ntruKeyFile) - != SSL_SUCCESS) + != WOLF_SSL_SUCCESS) err_sys("can't load ntru key file, " "Please run from wolfSSL home dir"); #elif defined(HAVE_ECC) && !defined(CYASSL_SNIFFER) /* ecc */ - if (CyaSSL_CTX_use_certificate_file(ctx, eccCertFile, SSL_FILETYPE_PEM) - != SSL_SUCCESS) + if (CyaSSL_CTX_use_certificate_file(ctx, eccCertFile, WOLF_SSL_FILETYPE_PEM) + != WOLF_SSL_SUCCESS) err_sys("can't load server cert file, " "Please run from wolfSSL home dir"); - if (CyaSSL_CTX_use_PrivateKey_file(ctx, eccKeyFile, SSL_FILETYPE_PEM) - != SSL_SUCCESS) + if (CyaSSL_CTX_use_PrivateKey_file(ctx, eccKeyFile, WOLF_SSL_FILETYPE_PEM) + != WOLF_SSL_SUCCESS) err_sys("can't load server key file, " "Please run from wolfSSL home dir"); #elif defined(NO_CERTS) /* do nothing, just don't load cert files */ #else /* normal */ - if (CyaSSL_CTX_use_certificate_file(ctx, svrCertFile, SSL_FILETYPE_PEM) - != SSL_SUCCESS) + if (CyaSSL_CTX_use_certificate_file(ctx, svrCertFile, WOLF_SSL_FILETYPE_PEM) + != WOLF_SSL_SUCCESS) err_sys("can't load server cert file, " "Please run from wolfSSL home dir"); - if (CyaSSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, SSL_FILETYPE_PEM) - != SSL_SUCCESS) + if (CyaSSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, WOLF_SSL_FILETYPE_PEM) + != WOLF_SSL_SUCCESS) err_sys("can't load server key file, " "Please run from wolfSSL home dir"); #endif @@ -228,7 +228,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args) #else defaultCipherList = "PSK-AES128-CBC-SHA256"; #endif - if (CyaSSL_CTX_set_cipher_list(ctx, defaultCipherList) != SSL_SUCCESS) + if (CyaSSL_CTX_set_cipher_list(ctx, defaultCipherList) != WOLF_SSL_SUCCESS) err_sys("server can't set cipher list 2"); #endif } @@ -280,7 +280,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args) wolfSSL_dtls_set_peer(ssl, &client, client_len); #endif #if !defined(NO_FILESYSTEM) && !defined(NO_DH) && !defined(NO_ASN) - CyaSSL_SetTmpDH_file(ssl, dhParamFile, SSL_FILETYPE_PEM); + CyaSSL_SetTmpDH_file(ssl, dhParamFile, WOLF_SSL_FILETYPE_PEM); #elif !defined(NO_DH) SetDH(ssl); /* will repick suites with DHE, higher than PSK */ #endif @@ -288,7 +288,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args) do { err = 0; /* Reset error */ ret = CyaSSL_accept(ssl); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { err = CyaSSL_get_error(ssl, 0); #ifdef WOLFSSL_ASYNC_CRYPT if (err == WC_PENDING_E) { @@ -298,7 +298,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args) #endif } } while (err == WC_PENDING_E); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { printf("SSL_accept error = %d, %s\n", err, CyaSSL_ERR_error_string(err, buffer)); printf("SSL_accept failed\n"); @@ -337,7 +337,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args) } } while (err == WC_PENDING_E); if (ret <= 0) { - if (err != SSL_ERROR_WANT_READ && err != SSL_ERROR_ZERO_RETURN){ + if (err != WOLF_SSL_ERROR_WANT_READ && err != WOLF_SSL_ERROR_ZERO_RETURN){ printf("SSL_read echo error %d, %s!\n", err, CyaSSL_ERR_error_string(err, buffer)); } diff --git a/examples/sctp/sctp-client-dtls.c b/examples/sctp/sctp-client-dtls.c index f07051795..8ec1ef7e8 100644 --- a/examples/sctp/sctp-client-dtls.c +++ b/examples/sctp/sctp-client-dtls.c @@ -71,11 +71,11 @@ int main() err_sys("ctx new dtls client failed"); ret = wolfSSL_CTX_dtls_set_sctp(ctx); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) err_sys("set sctp mode failed"); ret = wolfSSL_CTX_load_verify_locations(ctx, cacert, NULL); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) err_sys("ca cert error"); WOLFSSL* ssl = wolfSSL_new(ctx); @@ -85,12 +85,12 @@ int main() wolfSSL_set_fd(ssl, sd); ret = wolfSSL_connect(ssl); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) err_sys("ssl connect failed"); printf("TLS version is %s\n", wolfSSL_get_version(ssl)); printf("Cipher Suite is %s\n", - wolfSSL_CIPHER_get_name(wolfSSL_get_current_cipher(ssl))); + wolfSSL_CIPHER_get_name(wolfSSL_get_current_cipher(ssl))); wolfSSL_write(ssl, response, (int)strlen(response)); int got = wolfSSL_read(ssl, buffer, sizeof(buffer)); diff --git a/examples/sctp/sctp-server-dtls.c b/examples/sctp/sctp-server-dtls.c index e64c888db..6a4cf3717 100644 --- a/examples/sctp/sctp-server-dtls.c +++ b/examples/sctp/sctp-server-dtls.c @@ -77,15 +77,15 @@ int main() err_sys("ctx new dtls server failed"); ret = wolfSSL_CTX_dtls_set_sctp(ctx); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) err_sys("set sctp mode failed"); - ret = wolfSSL_CTX_use_PrivateKey_file(ctx, key, SSL_FILETYPE_PEM); - if (ret != SSL_SUCCESS) + ret = wolfSSL_CTX_use_PrivateKey_file(ctx, key, WOLF_SSL_FILETYPE_PEM); + if (ret != WOLF_SSL_SUCCESS) err_sys("use private key error"); - ret = wolfSSL_CTX_use_certificate_file(ctx, cert, SSL_FILETYPE_PEM); - if (ret != SSL_SUCCESS) + ret = wolfSSL_CTX_use_certificate_file(ctx, cert, WOLF_SSL_FILETYPE_PEM); + if (ret != WOLF_SSL_SUCCESS) err_sys("use cert error"); WOLFSSL* ssl = wolfSSL_new(ctx); @@ -95,12 +95,12 @@ int main() wolfSSL_set_fd(ssl, client_sd); ret = wolfSSL_accept(ssl); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) err_sys("ssl accept failed"); printf("TLS version is %s\n", wolfSSL_get_version(ssl)); printf("Cipher Suite is %s\n", - wolfSSL_CIPHER_get_name(wolfSSL_get_current_cipher(ssl))); + wolfSSL_CIPHER_get_name(wolfSSL_get_current_cipher(ssl))); int got = wolfSSL_read(ssl, buffer, sizeof(buffer)); if (got > 0) { diff --git a/examples/server/server.c b/examples/server/server.c index 7bcc83c20..cbdab53e8 100644 --- a/examples/server/server.c +++ b/examples/server/server.c @@ -132,15 +132,15 @@ static int NonBlockingSSL_Accept(SSL* ssl) SOCKET_T sockfd = (SOCKET_T)CyaSSL_get_fd(ssl); int select_ret = 0; - while (ret != SSL_SUCCESS && (error == SSL_ERROR_WANT_READ || - error == SSL_ERROR_WANT_WRITE || + while (ret != WOLF_SSL_SUCCESS && (error == WOLF_SSL_ERROR_WANT_READ || + error == WOLF_SSL_ERROR_WANT_WRITE || error == WC_PENDING_E)) { int currTimeout = 1; - if (error == SSL_ERROR_WANT_READ) { + if (error == WOLF_SSL_ERROR_WANT_READ) { /* printf("... server would read block\n"); */ } - else if (error == SSL_ERROR_WANT_WRITE) { + else if (error == WOLF_SSL_ERROR_WANT_WRITE) { /* printf("... server would write block\n"); */ } #ifdef WOLFSSL_ASYNC_CRYPT @@ -168,16 +168,16 @@ static int NonBlockingSSL_Accept(SSL* ssl) error = SSL_get_error(ssl, 0); } else if (select_ret == TEST_TIMEOUT && !CyaSSL_dtls(ssl)) { - error = SSL_ERROR_WANT_READ; + error = WOLF_SSL_ERROR_WANT_READ; } #ifdef CYASSL_DTLS else if (select_ret == TEST_TIMEOUT && CyaSSL_dtls(ssl) && CyaSSL_dtls_got_timeout(ssl) >= 0) { - error = SSL_ERROR_WANT_READ; + error = WOLF_SSL_ERROR_WANT_READ; } #endif else { - error = SSL_FATAL_ERROR; + error = WOLF_SSL_FATAL_ERROR; } } @@ -222,8 +222,8 @@ int ServerEchoData(SSL* ssl, int clientfd, int echoData, int throughput) } else #endif - if (err != SSL_ERROR_WANT_READ && - err != SSL_ERROR_ZERO_RETURN) { + if (err != WOLF_SSL_ERROR_WANT_READ && + err != WOLF_SSL_ERROR_ZERO_RETURN) { printf("SSL_read echo error %d\n", err); err_sys_ex(runWithErrors, "SSL_read failed"); } @@ -304,7 +304,7 @@ static void ServerRead(WOLFSSL* ssl, char* input, int inputLen) } else #endif - if (err != SSL_ERROR_WANT_READ) { + if (err != WOLF_SSL_ERROR_WANT_READ) { printf("SSL_read input error %d, %s\n", err, ERR_error_string(err, buffer)); err_sys_ex(runWithErrors, "SSL_read failed"); @@ -335,7 +335,7 @@ static void ServerWrite(WOLFSSL* ssl, const char* output, int outputLen) } #endif } - } while (err == WC_PENDING_E || err == SSL_ERROR_WANT_WRITE); + } while (err == WC_PENDING_E || err == WOLF_SSL_ERROR_WANT_WRITE); if (ret != outputLen) { printf("SSL_write msg error %d, %s\n", err, ERR_error_string(err, buffer)); @@ -918,13 +918,13 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #endif /* DEBUG_WOLFSSL */ if (wolfSSL_CTX_load_static_memory(&ctx, method, memory, sizeof(memory),0,1) - != SSL_SUCCESS) + != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "unable to load static memory and create ctx"); /* load in a buffer for IO */ if (wolfSSL_CTX_load_static_memory(&ctx, NULL, memoryIO, sizeof(memoryIO), WOLFMEM_IO_POOL_FIXED | WOLFMEM_TRACK_STATS, 1) - != SSL_SUCCESS) + != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "unable to load static memory and create ctx"); #else ctx = SSL_CTX_new(method(NULL)); @@ -940,7 +940,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #endif if (cipherList && !useDefCipherList) { - if (SSL_CTX_set_cipher_list(ctx, cipherList) != SSL_SUCCESS) + if (SSL_CTX_set_cipher_list(ctx, cipherList) != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "server can't set cipher list 1"); } @@ -972,7 +972,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) if ((!usePsk || usePskPlus) && !useAnon) { #if !defined(NO_FILESYSTEM) if (SSL_CTX_use_certificate_chain_file(ctx, ourCert) - != SSL_SUCCESS) + != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "can't load server cert file, check file and run from" " wolfSSL home dir"); #else @@ -983,17 +983,17 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #endif #ifndef NO_DH - if (wolfSSL_CTX_SetMinDhKey_Sz(ctx, (word16)minDhKeyBits) != SSL_SUCCESS) { + if (wolfSSL_CTX_SetMinDhKey_Sz(ctx, (word16)minDhKeyBits) != WOLF_SSL_SUCCESS) { err_sys_ex(runWithErrors, "Error setting minimum DH key size"); } #endif #ifndef NO_RSA - if (wolfSSL_CTX_SetMinRsaKey_Sz(ctx, minRsaKeyBits) != SSL_SUCCESS){ + if (wolfSSL_CTX_SetMinRsaKey_Sz(ctx, minRsaKeyBits) != WOLF_SSL_SUCCESS){ err_sys_ex(runWithErrors, "Error setting minimum RSA key size"); } #endif #ifdef HAVE_ECC - if (wolfSSL_CTX_SetMinEccKey_Sz(ctx, minEccKeyBits) != SSL_SUCCESS){ + if (wolfSSL_CTX_SetMinEccKey_Sz(ctx, minEccKeyBits) != WOLF_SSL_SUCCESS){ err_sys_ex(runWithErrors, "Error setting minimum ECC key size"); } #endif @@ -1001,7 +1001,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #ifdef HAVE_NTRU if (useNtruKey) { if (CyaSSL_CTX_use_NTRUPrivateKey_file(ctx, ourKey) - != SSL_SUCCESS) + != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "can't load ntru key file, " "Please run from wolfSSL home dir"); } @@ -1009,8 +1009,8 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #if !defined(NO_CERTS) if (!useNtruKey && (!usePsk || usePskPlus) && !useAnon) { #if !defined(NO_FILESYSTEM) - if (SSL_CTX_use_PrivateKey_file(ctx, ourKey, SSL_FILETYPE_PEM) - != SSL_SUCCESS) + if (SSL_CTX_use_PrivateKey_file(ctx, ourKey, WOLF_SSL_FILETYPE_PEM) + != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "can't load server private key file, check file and run " "from wolfSSL home dir"); #else @@ -1042,7 +1042,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #else defaultCipherList = "PSK-AES128-CBC-SHA256"; #endif - if (SSL_CTX_set_cipher_list(ctx, defaultCipherList) != SSL_SUCCESS) + if (SSL_CTX_set_cipher_list(ctx, defaultCipherList) != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "server can't set cipher list 2"); } #endif @@ -1052,7 +1052,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #ifdef HAVE_ANON CyaSSL_CTX_allow_anon_cipher(ctx); if (cipherList == NULL || (cipherList && useDefCipherList)) { - if (SSL_CTX_set_cipher_list(ctx, "ADH-AES128-SHA") != SSL_SUCCESS) + if (SSL_CTX_set_cipher_list(ctx, "ADH-AES128-SHA") != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "server can't set cipher list 4"); } #endif @@ -1062,15 +1062,15 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) /* if not using PSK, verify peer with certs if using PSK Plus then verify peer certs except PSK suites */ if (doCliCertCheck && (usePsk == 0 || usePskPlus) && useAnon == 0) { - SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | - ((usePskPlus)? SSL_VERIFY_FAIL_EXCEPT_PSK : - SSL_VERIFY_FAIL_IF_NO_PEER_CERT),0); - if (SSL_CTX_load_verify_locations(ctx, verifyCert, 0) != SSL_SUCCESS) + SSL_CTX_set_verify(ctx, WOLF_SSL_VERIFY_PEER | + ((usePskPlus)? WOLF_SSL_VERIFY_FAIL_EXCEPT_PSK : + WOLF_SSL_VERIFY_FAIL_IF_NO_PEER_CERT),0); + if (SSL_CTX_load_verify_locations(ctx, verifyCert, 0) != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "can't load ca file, Please run from wolfSSL home dir"); #ifdef WOLFSSL_TRUST_PEER_CERT if (trustCert) { if ((ret = wolfSSL_CTX_trust_peer_cert(ctx, trustCert, - SSL_FILETYPE_PEM)) != SSL_SUCCESS) { + WOLF_SSL_FILETYPE_PEM)) != WOLF_SSL_SUCCESS) { err_sys_ex(runWithErrors, "can't load trusted peer cert file"); } } @@ -1081,7 +1081,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #if defined(CYASSL_SNIFFER) /* don't use EDH, can't sniff tmp keys */ if (cipherList == NULL) { - if (SSL_CTX_set_cipher_list(ctx, "AES128-SHA") != SSL_SUCCESS) + if (SSL_CTX_set_cipher_list(ctx, "AES128-SHA") != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "server can't set cipher list 3"); } #endif @@ -1089,7 +1089,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #ifdef HAVE_SNI if (sniHostName) if (CyaSSL_CTX_UseSNI(ctx, CYASSL_SNI_HOST_NAME, sniHostName, - XSTRLEN(sniHostName)) != SSL_SUCCESS) + XSTRLEN(sniHostName)) != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "UseSNI failed"); #endif @@ -1144,7 +1144,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) if (doMcast) { #ifdef WOLFSSL_MULTICAST wolfSSL_CTX_mcast_set_member_id(ctx, mcastID); - if (wolfSSL_CTX_set_cipher_list(ctx, "WDM-NULL-SHA256") != SSL_SUCCESS) + if (wolfSSL_CTX_set_cipher_list(ctx, "WDM-NULL-SHA256") != WOLF_SSL_SUCCESS) err_sys("Couldn't set multicast cipher list."); #endif } @@ -1157,7 +1157,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #endif #ifdef WOLFSSL_SEND_HRR_COOKIE - if (hrrCookie && wolfSSL_send_hrr_cookie(ssl, NULL, 0) != SSL_SUCCESS) { + if (hrrCookie && wolfSSL_send_hrr_cookie(ssl, NULL, 0) != WOLF_SSL_SUCCESS) { err_sys("unable to set use of cookie with HRR msg"); } #endif @@ -1185,7 +1185,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) XMEMSET(sr, 0x5A, sizeof(sr)); if (wolfSSL_set_secret(ssl, 1, pms, sizeof(pms), cr, sr, suite) - != SSL_SUCCESS) + != WOLF_SSL_SUCCESS) err_sys("unable to set mcast secret"); #endif } @@ -1197,12 +1197,12 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #ifdef HAVE_CRL_MONITOR crlFlags = CYASSL_CRL_MONITOR | CYASSL_CRL_START_MON; #endif - if (CyaSSL_EnableCRL(ssl, 0) != SSL_SUCCESS) + if (CyaSSL_EnableCRL(ssl, 0) != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "unable to enable CRL"); - if (CyaSSL_LoadCRL(ssl, crlPemDir, SSL_FILETYPE_PEM, crlFlags) - != SSL_SUCCESS) + if (CyaSSL_LoadCRL(ssl, crlPemDir, WOLF_SSL_FILETYPE_PEM, crlFlags) + != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "unable to load CRL"); - if (CyaSSL_SetCRL_Cb(ssl, CRL_CallBack) != SSL_SUCCESS) + if (CyaSSL_SetCRL_Cb(ssl, CRL_CallBack) != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "unable to set CRL callback url"); #endif #ifdef HAVE_OCSP @@ -1218,13 +1218,13 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #endif #if defined(HAVE_CERTIFICATE_STATUS_REQUEST) \ || defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2) - if (wolfSSL_CTX_EnableOCSPStapling(ctx) != SSL_SUCCESS) + if (wolfSSL_CTX_EnableOCSPStapling(ctx) != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "can't enable OCSP Stapling Certificate Manager"); - if (SSL_CTX_load_verify_locations(ctx, "certs/ocsp/intermediate1-ca-cert.pem", 0) != SSL_SUCCESS) + if (SSL_CTX_load_verify_locations(ctx, "certs/ocsp/intermediate1-ca-cert.pem", 0) != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "can't load ca file, Please run from wolfSSL home dir"); - if (SSL_CTX_load_verify_locations(ctx, "certs/ocsp/intermediate2-ca-cert.pem", 0) != SSL_SUCCESS) + if (SSL_CTX_load_verify_locations(ctx, "certs/ocsp/intermediate2-ca-cert.pem", 0) != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "can't load ca file, Please run from wolfSSL home dir"); - if (SSL_CTX_load_verify_locations(ctx, "certs/ocsp/intermediate3-ca-cert.pem", 0) != SSL_SUCCESS) + if (SSL_CTX_load_verify_locations(ctx, "certs/ocsp/intermediate3-ca-cert.pem", 0) != WOLF_SSL_SUCCESS) err_sys_ex(runWithErrors, "can't load ca file, Please run from wolfSSL home dir"); #endif #ifdef HAVE_PK_CALLBACKS @@ -1241,7 +1241,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) dtlsUDP, dtlsSCTP, serverReadyFile ? 1 : 0, doListen); doListen = 0; /* Don't listen next time */ - if (SSL_set_fd(ssl, clientfd) != SSL_SUCCESS) { + if (SSL_set_fd(ssl, clientfd) != WOLF_SSL_SUCCESS) { err_sys_ex(runWithErrors, "error in setting fd"); } @@ -1273,7 +1273,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) if ((usePsk == 0 || usePskPlus) || useAnon == 1 || cipherList != NULL || needDH == 1) { #if !defined(NO_FILESYSTEM) && !defined(NO_DH) && !defined(NO_ASN) - CyaSSL_SetTmpDH_file(ssl, ourDhParam, SSL_FILETYPE_PEM); + CyaSSL_SetTmpDH_file(ssl, ourDhParam, WOLF_SSL_FILETYPE_PEM); #elif !defined(NO_DH) SetDH(ssl); /* repick suites with DHE, higher priority than PSK */ #endif @@ -1298,7 +1298,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) err = 0; /* reset error */ ret = wolfSSL_read_early_data(ssl, input, sizeof(input)-1, &len); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { err = SSL_get_error(ssl, 0); #ifdef WOLFSSL_ASYNC_CRYPT if (err == WC_PENDING_E) { @@ -1317,7 +1317,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) do { err = 0; /* reset error */ ret = SSL_accept(ssl); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { err = SSL_get_error(ssl, 0); #ifdef WOLFSSL_ASYNC_CRYPT if (err == WC_PENDING_E) { @@ -1331,7 +1331,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #else ret = NonBlockingSSL_Accept(ssl); #endif - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { err = SSL_get_error(ssl, 0); printf("SSL_accept error %d, %s\n", err, ERR_error_string(err, buffer)); @@ -1385,7 +1385,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) word16 protocol_nameSz = 0, listSz = 0; err = wolfSSL_ALPN_GetProtocol(ssl, &protocol_name, &protocol_nameSz); - if (err == SSL_SUCCESS) + if (err == WOLF_SSL_SUCCESS) printf("Sent ALPN protocol : %s (%d)\n", protocol_name, protocol_nameSz); else if (err == SSL_ALPN_NOT_FOUND) @@ -1394,7 +1394,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) printf("Getting ALPN protocol name failed\n"); err = wolfSSL_ALPN_GetPeerProtocol(ssl, &list, &listSz); - if (err == SSL_SUCCESS) + if (err == WOLF_SSL_SUCCESS) printf("List of protocol names sent by Client: %s (%d)\n", list, listSz); else @@ -1407,17 +1407,17 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) #if defined(WOLFSSL_TLS13) && defined(WOLFSSL_POST_HANDSHAKE_AUTH) if (postHandAuth) { - SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | - ((usePskPlus)? SSL_VERIFY_FAIL_EXCEPT_PSK : - SSL_VERIFY_FAIL_IF_NO_PEER_CERT),0); + SSL_CTX_set_verify(ctx, WOLF_SSL_VERIFY_PEER | + ((usePskPlus)? WOLF_SSL_VERIFY_FAIL_EXCEPT_PSK : + WOLF_SSL_VERIFY_FAIL_IF_NO_PEER_CERT),0); if (SSL_CTX_load_verify_locations(ctx, verifyCert, 0) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { err_sys_ex(runWithErrors, "can't load ca file, Please run from wolfSSL home dir"); } #ifdef WOLFSSL_TRUST_PEER_CERT if (trustCert) { if ((ret = wolfSSL_CTX_trust_peer_cert(ctx, trustCert, - SSL_FILETYPE_PEM)) != SSL_SUCCESS) { + WOLF_SSL_FILETYPE_PEM)) != WOLF_SSL_SUCCESS) { err_sys_ex(runWithErrors, "can't load trusted peer cert file"); } } @@ -1471,7 +1471,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) if (dtlsUDP == 0) { ret = SSL_shutdown(ssl); - if (wc_shutdown && ret == SSL_SHUTDOWN_NOT_DONE) + if (wc_shutdown && ret == WOLF_SSL_SHUTDOWN_NOT_DONE) SSL_shutdown(ssl); /* bidirectional shutdown */ } /* display collected statistics */ diff --git a/src/bio.c b/src/bio.c index 6b123c19a..b9f7c3d8d 100644 --- a/src/bio.c +++ b/src/bio.c @@ -75,11 +75,11 @@ long wolfSSL_BIO_get_mem_ptr(WOLFSSL_BIO *bio, WOLFSSL_BUF_MEM **ptr) WOLFSSL_ENTER("BIO_get_mem_ptr"); if (bio == NULL || ptr == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } *ptr = (WOLFSSL_BUF_MEM*)(bio->mem); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /*** TBD ***/ @@ -99,19 +99,19 @@ int wolfSSL_BIO_set_write_buf_size(WOLFSSL_BIO *bio, long size) WOLFSSL_ENTER("wolfSSL_BIO_set_write_buf_size"); if (bio == NULL || bio->type != BIO_BIO || size < 0) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* if already in pair then do not change size */ if (bio->pair != NULL) { WOLFSSL_MSG("WOLFSSL_BIO is paired, free from pair before changing"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } bio->wrSz = (int)size; if (bio->wrSz < 0) { WOLFSSL_MSG("Unexpected negative size value"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (bio->mem != NULL) { @@ -121,12 +121,12 @@ int wolfSSL_BIO_set_write_buf_size(WOLFSSL_BIO *bio, long size) bio->mem = (byte*)XMALLOC(bio->wrSz, bio->heap, DYNAMIC_TYPE_OPENSSL); if (bio->mem == NULL) { WOLFSSL_MSG("Memory allocation error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } bio->wrIdx = 0; bio->rdIdx = 0; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -140,31 +140,31 @@ int wolfSSL_BIO_make_bio_pair(WOLFSSL_BIO *b1, WOLFSSL_BIO *b2) if (b1 == NULL || b2 == NULL) { WOLFSSL_LEAVE("wolfSSL_BIO_make_bio_pair", BAD_FUNC_ARG); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* both are expected to be of type BIO and not already paired */ if (b1->type != BIO_BIO || b2->type != BIO_BIO || b1->pair != NULL || b2->pair != NULL) { WOLFSSL_MSG("Expected type BIO and not already paired"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* set default write size if not already set */ if (b1->mem == NULL && wolfSSL_BIO_set_write_buf_size(b1, - WOLFSSL_BIO_SIZE) != SSL_SUCCESS) { - return SSL_FAILURE; + WOLFSSL_BIO_SIZE) != WOLF_SSL_SUCCESS) { + return WOLF_SSL_FAILURE; } if (b2->mem == NULL && wolfSSL_BIO_set_write_buf_size(b2, - WOLFSSL_BIO_SIZE) != SSL_SUCCESS) { - return SSL_FAILURE; + WOLFSSL_BIO_SIZE) != WOLF_SSL_SUCCESS) { + return WOLF_SSL_FAILURE; } b1->pair = b2; b2->pair = b1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -173,12 +173,12 @@ int wolfSSL_BIO_ctrl_reset_read_request(WOLFSSL_BIO *b) WOLFSSL_ENTER("wolfSSL_BIO_ctrl_reset_read_request"); if (b == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } b->readRq = 0; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -219,7 +219,7 @@ int wolfSSL_BIO_nread(WOLFSSL_BIO *bio, char **buf, int num) if (bio == NULL || buf == NULL) { WOLFSSL_MSG("NULL argument passed in"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (bio->pair != NULL) { @@ -362,17 +362,17 @@ long wolfSSL_BIO_set_fp(WOLFSSL_BIO *bio, XFILE fp, int c) if (bio == NULL || fp == NULL) { WOLFSSL_LEAVE("wolfSSL_BIO_set_fp", BAD_FUNC_ARG); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (bio->type != BIO_FILE) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } bio->close = (byte)c; bio->file = fp; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -381,16 +381,16 @@ long wolfSSL_BIO_get_fp(WOLFSSL_BIO *bio, XFILE* fp) WOLFSSL_ENTER("wolfSSL_BIO_get_fp"); if (bio == NULL || fp == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (bio->type != BIO_FILE) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } *fp = bio->file; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* overwrites file */ @@ -399,7 +399,7 @@ int wolfSSL_BIO_write_filename(WOLFSSL_BIO *bio, char *name) WOLFSSL_ENTER("wolfSSL_BIO_write_filename"); if (bio == NULL || name == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (bio->type == BIO_FILE) { @@ -409,14 +409,14 @@ int wolfSSL_BIO_write_filename(WOLFSSL_BIO *bio, char *name) bio->file = XFOPEN(name, "w"); if (bio->file == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } bio->close = BIO_CLOSE; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } diff --git a/src/crl.c b/src/crl.c index 198b0cf91..62e627619 100755 --- a/src/crl.c +++ b/src/crl.c @@ -421,11 +421,11 @@ static int AddCRL(WOLFSSL_CRL* crl, DecodedCRL* dcrl, const byte* buff, } -/* Load CRL File of type, SSL_SUCCESS on ok */ +/* Load CRL File of type, WOLF_SSL_SUCCESS on ok */ int BufferLoadCRL(WOLFSSL_CRL* crl, const byte* buff, long sz, int type, int noVerify) { - int ret = SSL_SUCCESS; + int ret = WOLF_SSL_SUCCESS; const byte* myBuffer = buff; /* if DER ok, otherwise switch */ DerBuffer* der = NULL; #ifdef WOLFSSL_SMALL_STACK @@ -439,7 +439,7 @@ int BufferLoadCRL(WOLFSSL_CRL* crl, const byte* buff, long sz, int type, if (crl == NULL || buff == NULL || sz == 0) return BAD_FUNC_ARG; - if (type == SSL_FILETYPE_PEM) { + if (type == WOLF_SSL_FILETYPE_PEM) { int eccKey = 0; /* not used */ EncryptedInfo info; info.ctx = NULL; @@ -484,7 +484,7 @@ int BufferLoadCRL(WOLFSSL_CRL* crl, const byte* buff, long sz, int type, FreeDer(&der); - return ret ? ret : SSL_SUCCESS; /* convert 0 to SSL_SUCCESS */ + return ret ? ret : WOLF_SSL_SUCCESS; /* convert 0 to WOLF_SSL_SUCCESS */ } @@ -540,8 +540,8 @@ static int SwapLists(WOLFSSL_CRL* crl) } if (crl->monitors[0].path) { - ret = LoadCRL(tmp, crl->monitors[0].path, SSL_FILETYPE_PEM, 0); - if (ret != SSL_SUCCESS) { + ret = LoadCRL(tmp, crl->monitors[0].path, WOLF_SSL_FILETYPE_PEM, 0); + if (ret != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("PEM LoadCRL on dir change failed"); FreeCRL(tmp, 0); #ifdef WOLFSSL_SMALL_STACK @@ -552,8 +552,8 @@ static int SwapLists(WOLFSSL_CRL* crl) } if (crl->monitors[1].path) { - ret = LoadCRL(tmp, crl->monitors[1].path, SSL_FILETYPE_ASN1, 0); - if (ret != SSL_SUCCESS) { + ret = LoadCRL(tmp, crl->monitors[1].path, WOLF_SSL_FILETYPE_ASN1, 0); + if (ret != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("DER LoadCRL on dir change failed"); FreeCRL(tmp, 0); #ifdef WOLFSSL_SMALL_STACK @@ -884,7 +884,7 @@ static void* DoMonitor(void* arg) /* Start Monitoring the CRL path(s) in a thread */ static int StartMonitorCRL(WOLFSSL_CRL* crl) { - int ret = SSL_SUCCESS; + int ret = WOLF_SSL_SUCCESS; WOLFSSL_ENTER("StartMonitorCRL"); @@ -948,10 +948,10 @@ static int StartMonitorCRL(WOLFSSL_CRL* crl) #if !defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR) -/* Load CRL path files of type, SSL_SUCCESS on ok */ +/* Load CRL path files of type, WOLF_SSL_SUCCESS on ok */ int LoadCRL(WOLFSSL_CRL* crl, const char* path, int type, int monitor) { - int ret = SSL_SUCCESS; + int ret = WOLF_SSL_SUCCESS; char* name = NULL; #ifdef WOLFSSL_SMALL_STACK ReadDirCtx* readCtx = NULL; @@ -974,7 +974,7 @@ int LoadCRL(WOLFSSL_CRL* crl, const char* path, int type, int monitor) ret = wc_ReadDirFirst(readCtx, path, &name); while (ret == 0 && name) { int skip = 0; - if (type == SSL_FILETYPE_PEM) { + if (type == WOLF_SSL_FILETYPE_PEM) { if (XSTRSTR(name, ".pem") == NULL) { WOLFSSL_MSG("not .pem file, skipping"); skip = 1; @@ -990,14 +990,14 @@ int LoadCRL(WOLFSSL_CRL* crl, const char* path, int type, int monitor) } if (!skip && ProcessFile(NULL, name, type, CRL_TYPE, NULL, 0, crl) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("CRL file load failed, continuing"); } ret = wc_ReadDirNext(readCtx, path, &name); } wc_ReadDirClose(readCtx); - ret = SSL_SUCCESS; /* load failures not reported, for backwards compat */ + ret = WOLF_SSL_SUCCESS; /* load failures not reported, for backwards compat */ #ifdef WOLFSSL_SMALL_STACK XFREE(readCtx, crl->heap, DYNAMIC_TYPE_TMP_BUFFER); @@ -1015,14 +1015,14 @@ int LoadCRL(WOLFSSL_CRL* crl, const char* path, int type, int monitor) XSTRNCPY(pathBuf, path, pathLen); pathBuf[pathLen] = '\0'; /* Null Terminate */ - if (type == SSL_FILETYPE_PEM) { + if (type == WOLF_SSL_FILETYPE_PEM) { /* free old path before setting a new one */ if (crl->monitors[0].path) { XFREE(crl->monitors[0].path, crl->heap, DYNAMIC_TYPE_CRL_MONITOR); } crl->monitors[0].path = pathBuf; - crl->monitors[0].type = SSL_FILETYPE_PEM; + crl->monitors[0].type = WOLF_SSL_FILETYPE_PEM; } else { /* free old path before setting a new one */ if (crl->monitors[1].path) { @@ -1030,7 +1030,7 @@ int LoadCRL(WOLFSSL_CRL* crl, const char* path, int type, int monitor) DYNAMIC_TYPE_CRL_MONITOR); } crl->monitors[1].path = pathBuf; - crl->monitors[1].type = SSL_FILETYPE_ASN1; + crl->monitors[1].type = WOLF_SSL_FILETYPE_ASN1; } if (monitor & WOLFSSL_CRL_START_MON) { diff --git a/src/internal.c b/src/internal.c index dce0ff717..04f1316d0 100755 --- a/src/internal.c +++ b/src/internal.c @@ -1081,7 +1081,7 @@ static int ExportPeerInfo(WOLFSSL* ssl, byte* exp, word32 len, byte ver) WOLFSSL_MSG("No get peer call back set"); return BAD_FUNC_ARG; } - if (ssl->ctx->CBGetPeer(ssl, ip, &ipSz, &port, &fam) != SSL_SUCCESS) { + if (ssl->ctx->CBGetPeer(ssl, ip, &ipSz, &port, &fam) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("Get peer callback error"); return SOCKET_ERROR_E; } @@ -1136,7 +1136,7 @@ static int ImportPeerInfo(WOLFSSL* ssl, byte* buf, word32 len, byte ver) WOLFSSL_MSG("No set peer function"); return BAD_FUNC_ARG; } - if (ssl->ctx->CBSetPeer(ssl, ip, ipSz, port, fam) != SSL_SUCCESS) { + if (ssl->ctx->CBSetPeer(ssl, ip, ipSz, port, fam) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("Error setting peer info"); return SOCKET_ERROR_E; } @@ -2940,25 +2940,25 @@ static void SetDigest(WOLFSSL* ssl, int hashAlgo) #ifndef NO_SHA case sha_mac: ssl->buffers.digest.buffer = ssl->hsHashes->certHashes.sha; - ssl->buffers.digest.length = SHA_DIGEST_SIZE; + ssl->buffers.digest.length = WC_SHA_DIGEST_SIZE; break; #endif /* !NO_SHA */ #ifndef NO_SHA256 case sha256_mac: ssl->buffers.digest.buffer = ssl->hsHashes->certHashes.sha256; - ssl->buffers.digest.length = SHA256_DIGEST_SIZE; + ssl->buffers.digest.length = WC_SHA256_DIGEST_SIZE; break; #endif /* !NO_SHA256 */ #ifdef WOLFSSL_SHA384 case sha384_mac: ssl->buffers.digest.buffer = ssl->hsHashes->certHashes.sha384; - ssl->buffers.digest.length = SHA384_DIGEST_SIZE; + ssl->buffers.digest.length = WC_SHA384_DIGEST_SIZE; break; #endif /* WOLFSSL_SHA384 */ #ifdef WOLFSSL_SHA512 case sha512_mac: ssl->buffers.digest.buffer = ssl->hsHashes->certHashes.sha512; - ssl->buffers.digest.length = SHA512_DIGEST_SIZE; + ssl->buffers.digest.length = WC_SHA512_DIGEST_SIZE; break; #endif /* WOLFSSL_SHA512 */ } /* switch */ @@ -3901,7 +3901,7 @@ int DhAgree(WOLFSSL* ssl, DhKey* dhKey, ctx parent factory writeDup flag indicating this is a write dup only - SSL_SUCCESS return value on success */ + WOLF_SSL_SUCCESS return value on success */ int SetSSL_CTX(WOLFSSL* ssl, WOLFSSL_CTX* ctx, int writeDup) { byte havePSK = 0; @@ -4097,7 +4097,7 @@ int SetSSL_CTX(WOLFSSL* ssl, WOLFSSL_CTX* ctx, int writeDup) ssl->readAhead = ctx->readAhead; #endif - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } int InitHandshakeHashes(WOLFSSL* ssl) @@ -4410,7 +4410,7 @@ int InitSSL(WOLFSSL* ssl, WOLFSSL_CTX* ctx, int writeDup) /* Initialize SSL with the appropriate fields from it's ctx */ /* requires valid arrays and suites unless writeDup ing */ - if ((ret = SetSSL_CTX(ssl, ctx, writeDup)) != SSL_SUCCESS) + if ((ret = SetSSL_CTX(ssl, ctx, writeDup)) != WOLF_SSL_SUCCESS) return ret; ssl->options.dtls = ssl->version.major == DTLS_MAJOR; @@ -6636,13 +6636,13 @@ static const byte PAD2[PAD_MD5] = static int BuildMD5(WOLFSSL* ssl, Hashes* hashes, const byte* sender) { int ret; - byte md5_result[MD5_DIGEST_SIZE]; + byte md5_result[WC_MD5_DIGEST_SIZE]; #ifdef WOLFSSL_SMALL_STACK - Md5* md5 = (Md5*)XMALLOC(sizeof(Md5), ssl->heap, DYNAMIC_TYPE_HASHCTX); + wc_Md5* md5 = (wc_Md5*)XMALLOC(sizeof(wc_Md5), ssl->heap, DYNAMIC_TYPE_HASHCTX); if (md5 == NULL) return MEMORY_E; #else - Md5 md5[1]; + wc_Md5 md5[1]; #endif /* make md5 inner */ @@ -6664,7 +6664,7 @@ static int BuildMD5(WOLFSSL* ssl, Hashes* hashes, const byte* sender) if (ret == 0) ret = wc_Md5Update(md5, PAD2, PAD_MD5); if (ret == 0) - ret = wc_Md5Update(md5, md5_result, MD5_DIGEST_SIZE); + ret = wc_Md5Update(md5, md5_result, WC_MD5_DIGEST_SIZE); if (ret == 0) ret = wc_Md5Final(md5, hashes->md5); wc_Md5Free(md5); @@ -6683,13 +6683,13 @@ static int BuildMD5(WOLFSSL* ssl, Hashes* hashes, const byte* sender) static int BuildSHA(WOLFSSL* ssl, Hashes* hashes, const byte* sender) { int ret; - byte sha_result[SHA_DIGEST_SIZE]; + byte sha_result[WC_SHA_DIGEST_SIZE]; #ifdef WOLFSSL_SMALL_STACK - Sha* sha = (Sha*)XMALLOC(sizeof(Sha), ssl->heap, DYNAMIC_TYPE_HASHCTX); + wc_Sha* sha = (wc_Sha*)XMALLOC(sizeof(wc_Sha), ssl->heap, DYNAMIC_TYPE_HASHCTX); if (sha == NULL) return MEMORY_E; #else - Sha sha[1]; + wc_Sha sha[1]; #endif /* make sha inner */ ret = wc_ShaCopy(&ssl->hsHashes->hashSha, sha); /* Save current position */ @@ -6710,7 +6710,7 @@ static int BuildSHA(WOLFSSL* ssl, Hashes* hashes, const byte* sender) if (ret == 0) ret = wc_ShaUpdate(sha, PAD2, PAD_SHA); if (ret == 0) - ret = wc_ShaUpdate(sha, sha_result, SHA_DIGEST_SIZE); + ret = wc_ShaUpdate(sha, sha_result, WC_SHA_DIGEST_SIZE); if (ret == 0) ret = wc_ShaFinal(sha, hashes->sha); wc_ShaFree(sha); @@ -6731,9 +6731,9 @@ static int BuildFinished(WOLFSSL* ssl, Hashes* hashes, const byte* sender) int ret = 0; #ifdef WOLFSSL_SHA384 #ifdef WOLFSSL_SMALL_STACK - Sha384* sha384; + wc_Sha384* sha384; #else - Sha384 sha384[1]; + wc_Sha384 sha384[1]; #endif /* WOLFSSL_SMALL_STACK */ #endif /* WOLFSSL_SHA384 */ @@ -6742,7 +6742,7 @@ static int BuildFinished(WOLFSSL* ssl, Hashes* hashes, const byte* sender) #ifdef WOLFSSL_SHA384 #ifdef WOLFSSL_SMALL_STACK - sha384 = (Sha384*)XMALLOC(sizeof(Sha384), ssl->heap, DYNAMIC_TYPE_HASHCTX); + sha384 = (wc_Sha384*)XMALLOC(sizeof(wc_Sha384), ssl->heap, DYNAMIC_TYPE_HASHCTX); if (sha384 == NULL) return MEMORY_E; #endif /* WOLFSSL_SMALL_STACK */ @@ -8205,7 +8205,7 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx, /* already verified above */ ret = AddCA(ssl->ctx->cm, &add, WOLFSSL_CHAIN_CA, 0); if (ret == 1) { - ret = 0; /* SSL_SUCCESS for external */ + ret = 0; /* WOLF_SSL_SUCCESS for external */ } } else if (ret != 0) { @@ -8363,7 +8363,7 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx, /* compare against previous time */ if (XMEMCMP(args->dCert->subjectHash, ssl->secure_renegotiation->subject_hash, - SHA_DIGEST_SIZE) != 0) { + WC_SHA_DIGEST_SIZE) != 0) { WOLFSSL_MSG( "Peer sent different cert during scr, fatal"); args->fatal = 1; @@ -8374,7 +8374,7 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx, /* cache peer's hash */ if (args->fatal == 0) { XMEMCPY(ssl->secure_renegotiation->subject_hash, - args->dCert->subjectHash, SHA_DIGEST_SIZE); + args->dCert->subjectHash, WC_SHA_DIGEST_SIZE); } } #endif /* HAVE_SECURE_RENEGOTIATION */ @@ -11136,7 +11136,7 @@ static int SanityCheckCipherText(WOLFSSL* ssl, word32 encryptSz) static INLINE void Md5Rounds(int rounds, const byte* data, int sz) { - Md5 md5; + wc_Md5 md5; int i; wc_InitMd5(&md5); /* no error check on purpose, dummy round */ @@ -11151,7 +11151,7 @@ static INLINE void Md5Rounds(int rounds, const byte* data, int sz) /* do a dummy sha round */ static INLINE void ShaRounds(int rounds, const byte* data, int sz) { - Sha sha; + wc_Sha sha; int i; wc_InitSha(&sha); /* no error check on purpose, dummy round */ @@ -11167,7 +11167,7 @@ static INLINE void ShaRounds(int rounds, const byte* data, int sz) static INLINE void Sha256Rounds(int rounds, const byte* data, int sz) { - Sha256 sha256; + wc_Sha256 sha256; int i; wc_InitSha256(&sha256); /* no error check on purpose, dummy round */ @@ -11186,7 +11186,7 @@ static INLINE void Sha256Rounds(int rounds, const byte* data, int sz) static INLINE void Sha384Rounds(int rounds, const byte* data, int sz) { - Sha384 sha384; + wc_Sha384 sha384; int i; wc_InitSha384(&sha384); /* no error check on purpose, dummy round */ @@ -11205,7 +11205,7 @@ static INLINE void Sha384Rounds(int rounds, const byte* data, int sz) static INLINE void Sha512Rounds(int rounds, const byte* data, int sz) { - Sha512 sha512; + wc_Sha512 sha512; int i; wc_InitSha512(&sha512); /* no error check on purpose, dummy round */ @@ -11428,7 +11428,7 @@ int DoApplicationData(WOLFSSL* ssl, byte* input, word32* inOutIdx) if (ssl->earlyData) { if (ssl->earlyDataSz + dataSz > ssl->options.maxEarlyDataSz) { SendAlert(ssl, alert_fatal, unexpected_message); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->earlyDataSz += dataSz; } @@ -12298,8 +12298,8 @@ static int SSL_hmac(WOLFSSL* ssl, byte* digest, const byte* in, word32 sz, word32 padSz = ssl->specs.pad_size; int ret = 0; - Md5 md5; - Sha sha; + wc_Md5 md5; + wc_Sha sha; /* data */ byte seq[SEQ_SZ]; @@ -12411,11 +12411,11 @@ static int SSL_hmac(WOLFSSL* ssl, byte* digest, const byte* in, word32 sz, static int BuildMD5_CertVerify(WOLFSSL* ssl, byte* digest) { int ret; - byte md5_result[MD5_DIGEST_SIZE]; + byte md5_result[WC_MD5_DIGEST_SIZE]; #ifdef WOLFSSL_SMALL_STACK - Md5* md5 = (Md5*)XMALLOC(sizeof(Md5), ssl->heap, DYNAMIC_TYPE_HASHCTX); + wc_Md5* md5 = (wc_Md5*)XMALLOC(sizeof(wc_Md5), ssl->heap, DYNAMIC_TYPE_HASHCTX); #else - Md5 md5[1]; + wc_Md5 md5[1]; #endif /* make md5 inner */ @@ -12435,7 +12435,7 @@ static int BuildMD5_CertVerify(WOLFSSL* ssl, byte* digest) if (ret == 0) ret = wc_Md5Update(md5, PAD2, PAD_MD5); if (ret == 0) - ret = wc_Md5Update(md5, md5_result, MD5_DIGEST_SIZE); + ret = wc_Md5Update(md5, md5_result, WC_MD5_DIGEST_SIZE); if (ret == 0) ret = wc_Md5Final(md5, digest); wc_Md5Free(md5); @@ -12455,11 +12455,11 @@ static int BuildMD5_CertVerify(WOLFSSL* ssl, byte* digest) static int BuildSHA_CertVerify(WOLFSSL* ssl, byte* digest) { int ret; - byte sha_result[SHA_DIGEST_SIZE]; + byte sha_result[WC_SHA_DIGEST_SIZE]; #ifdef WOLFSSL_SMALL_STACK - Sha* sha = (Sha*)XMALLOC(sizeof(Sha), ssl->heap, DYNAMIC_TYPE_HASHCTX); + wc_Sha* sha = (wc_Sha*)XMALLOC(sizeof(wc_Sha), ssl->heap, DYNAMIC_TYPE_HASHCTX); #else - Sha sha[1]; + wc_Sha sha[1]; #endif /* make sha inner */ @@ -12479,7 +12479,7 @@ static int BuildSHA_CertVerify(WOLFSSL* ssl, byte* digest) if (ret == 0) ret = wc_ShaUpdate(sha, PAD2, PAD_SHA); if (ret == 0) - ret = wc_ShaUpdate(sha, sha_result, SHA_DIGEST_SIZE); + ret = wc_ShaUpdate(sha, sha_result, WC_SHA_DIGEST_SIZE); if (ret == 0) ret = wc_ShaFinal(sha, digest); wc_ShaFree(sha); @@ -13179,7 +13179,7 @@ int SendCertificateRequest(WOLFSSL* ssl) word32 i = RECORD_HEADER_SZ + HANDSHAKE_HEADER_SZ; word32 dnLen = 0; #ifdef WOLFSSL_NGINX - STACK_OF(WOLFSSL_X509_NAME)* names; + WOLF_STACK_OF(WOLFSSL_X509_NAME)* names; #endif int typeTotal = 1; /* only 1 for now */ @@ -13782,7 +13782,7 @@ int SendData(WOLFSSL* ssl, const void* data, int sz) if (ssl->options.handShakeState != HANDSHAKE_DONE) { int err; WOLFSSL_MSG("handshake not complete, trying to finish"); - if ( (err = wolfSSL_negotiate(ssl)) != SSL_SUCCESS) { + if ( (err = wolfSSL_negotiate(ssl)) != WOLF_SSL_SUCCESS) { /* if async would block return WANT_WRITE */ if (ssl->error == WC_PENDING_E) { return WOLFSSL_CBIO_ERR_WANT_WRITE; @@ -13939,7 +13939,7 @@ int ReceiveData(WOLFSSL* ssl, byte* output, int sz, int peek) if (ssl->options.handShakeState != HANDSHAKE_DONE) { int err; WOLFSSL_MSG("Handshake not complete, trying to finish"); - if ( (err = wolfSSL_negotiate(ssl)) != SSL_SUCCESS) { + if ( (err = wolfSSL_negotiate(ssl)) != WOLF_SSL_SUCCESS) { #ifdef WOLFSSL_ASYNC_CRYPT /* if async would block return WANT_WRITE */ if (ssl->error == WC_PENDING_E) { @@ -13956,7 +13956,7 @@ startScr: int err; ssl->secure_renegotiation->startScr = 0; /* only start once */ WOLFSSL_MSG("Need to start scr, server requested"); - if ( (err = wolfSSL_Rehandshake(ssl)) != SSL_SUCCESS) + if ( (err = wolfSSL_Rehandshake(ssl)) != WOLF_SSL_SUCCESS) return err; } #endif @@ -14204,7 +14204,7 @@ const char* wolfSSL_ERR_reason_error_string(unsigned long e) return "peer subject name mismatch"; case WANT_READ : - case SSL_ERROR_WANT_READ : + case WOLF_SSL_ERROR_WANT_READ : return "non-blocking socket wants data to be read"; case NOT_READY_ERROR : @@ -14217,7 +14217,7 @@ const char* wolfSSL_ERR_reason_error_string(unsigned long e) return "record layer version error"; case WANT_WRITE : - case SSL_ERROR_WANT_WRITE : + case WOLF_SSL_ERROR_WANT_WRITE : return "non-blocking socket write buffer full"; case BUFFER_ERROR : @@ -14278,7 +14278,7 @@ const char* wolfSSL_ERR_reason_error_string(unsigned long e) return "cant decode peer key"; case ZERO_RETURN: - case SSL_ERROR_ZERO_RETURN: + case WOLF_SSL_ERROR_ZERO_RETURN: return "peer sent close notify alert"; case ECC_CURVETYPE_ERROR: @@ -16331,7 +16331,7 @@ void PickHashSigAlgo(WOLFSSL* ssl, const byte* hashSigAlgo, if (ticket == NULL) return MEMORY_E; ret = TLSX_UseSessionTicket(&ssl->extensions, ticket, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; idSz = 0; } @@ -22372,12 +22372,12 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx, #endif /* NO_SHA && NO_SHA256 */ #if !defined(NO_SHA) && defined(NO_SHA256) - cookieType = SHA; - cookieSz = SHA_DIGEST_SIZE; + cookieType = WC_SHA; + cookieSz = WC_SHA_DIGEST_SIZE; #endif /* NO_SHA */ #ifndef NO_SHA256 - cookieType = SHA256; - cookieSz = SHA256_DIGEST_SIZE; + cookieType = WC_SHA256; + cookieSz = WC_SHA256_DIGEST_SIZE; #endif /* NO_SHA256 */ ret = wc_HmacSetKey(&cookieHmac, cookieType, ssl->buffers.dtlsCookieSecret.buffer, @@ -22605,7 +22605,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx, int ret = 0; ret = TLSX_AddEmptyRenegotiationInfo(&ssl->extensions, ssl->heap); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) return ret; } #endif /* HAVE_SERVER_RENEGOTIATION_INFO */ @@ -23622,7 +23622,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx, if (ssl->options.side != WOLFSSL_SERVER_END) { WOLFSSL_MSG("Client received client keyexchange, attack?"); WOLFSSL_ERROR(ssl->error = SIDE_ERROR); - ERROR_OUT(SSL_FATAL_ERROR, exit_dcke); + ERROR_OUT(WOLF_SSL_FATAL_ERROR, exit_dcke); } if (ssl->options.clientState < CLIENT_HELLO_COMPLETE) { diff --git a/src/keys.c b/src/keys.c index 938387ec1..c50ad39cc 100644 --- a/src/keys.c +++ b/src/keys.c @@ -68,7 +68,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CHACHA20_256_KEY_SIZE; @@ -87,7 +87,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CHACHA20_256_KEY_SIZE; @@ -106,7 +106,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CHACHA20_256_KEY_SIZE; @@ -124,7 +124,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CHACHA20_256_KEY_SIZE; @@ -143,7 +143,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CHACHA20_256_KEY_SIZE; @@ -162,7 +162,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CHACHA20_256_KEY_SIZE; @@ -181,7 +181,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CHACHA20_256_KEY_SIZE; @@ -201,7 +201,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecdhe_psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CHACHA20_256_KEY_SIZE; @@ -221,7 +221,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = dhe_psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CHACHA20_256_KEY_SIZE; @@ -253,7 +253,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -269,7 +269,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -285,7 +285,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -301,7 +301,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -317,7 +317,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -333,7 +333,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -349,7 +349,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -365,7 +365,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -381,7 +381,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -398,7 +398,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -415,7 +415,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = DES3_KEY_SIZE; @@ -432,7 +432,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = DES3_KEY_SIZE; @@ -449,7 +449,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = RC4_KEY_SIZE; @@ -466,7 +466,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = RC4_KEY_SIZE; @@ -483,7 +483,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = DES3_KEY_SIZE; @@ -500,7 +500,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = DES3_KEY_SIZE; @@ -517,7 +517,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = RC4_KEY_SIZE; @@ -534,7 +534,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = RC4_KEY_SIZE; @@ -551,7 +551,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -568,7 +568,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -585,7 +585,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -602,7 +602,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -619,7 +619,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -636,7 +636,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -653,7 +653,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -671,7 +671,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -689,7 +689,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -707,7 +707,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -725,7 +725,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -743,7 +743,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -761,7 +761,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -779,7 +779,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 1; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -797,7 +797,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -815,7 +815,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -833,7 +833,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -851,7 +851,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ecc_diffie_hellman_kea; ssl->specs.sig_algo = ecc_dsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = 0; @@ -868,7 +868,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecdhe_psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = 0; @@ -886,7 +886,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = ecdhe_psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -905,7 +905,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -923,7 +923,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -941,7 +941,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -960,7 +960,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -979,7 +979,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -998,7 +998,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -1017,7 +1017,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = dhe_psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1036,7 +1036,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = dhe_psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -1066,7 +1066,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = 0; ssl->specs.sig_algo = 0; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1084,7 +1084,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = 0; ssl->specs.sig_algo = 0; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -1102,7 +1102,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = 0; ssl->specs.sig_algo = 0; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CHACHA20_256_KEY_SIZE; @@ -1121,7 +1121,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = 0; ssl->specs.sig_algo = 0; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1139,7 +1139,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = 0; ssl->specs.sig_algo = 0; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1165,7 +1165,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = RC4_KEY_SIZE; @@ -1182,7 +1182,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ntru_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = RC4_KEY_SIZE; @@ -1199,7 +1199,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = md5_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = MD5_DIGEST_SIZE; + ssl->specs.hash_size = WC_MD5_DIGEST_SIZE; ssl->specs.pad_size = PAD_MD5; ssl->specs.static_ecdh = 0; ssl->specs.key_size = RC4_KEY_SIZE; @@ -1216,7 +1216,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = DES3_KEY_SIZE; @@ -1233,7 +1233,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ntru_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = DES3_KEY_SIZE; @@ -1250,7 +1250,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1267,7 +1267,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1284,7 +1284,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = 0; @@ -1301,7 +1301,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = 0; @@ -1318,7 +1318,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ntru_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1335,7 +1335,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -1352,7 +1352,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -1369,7 +1369,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = ntru_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -1386,7 +1386,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1405,7 +1405,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -1424,7 +1424,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = dhe_psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1443,7 +1443,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = dhe_psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -1462,7 +1462,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1480,7 +1480,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -1498,7 +1498,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = dhe_psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1516,7 +1516,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = dhe_psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -1534,7 +1534,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1552,7 +1552,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -1570,7 +1570,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = 0; @@ -1588,7 +1588,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = 0; @@ -1606,7 +1606,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = 0; @@ -1624,7 +1624,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = dhe_psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = 0; @@ -1642,7 +1642,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = dhe_psk_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = 0; @@ -1660,7 +1660,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1677,7 +1677,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = DES3_KEY_SIZE; @@ -1694,7 +1694,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -1711,7 +1711,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1728,7 +1728,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -1745,7 +1745,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = md5_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = MD5_DIGEST_SIZE; + ssl->specs.hash_size = WC_MD5_DIGEST_SIZE; ssl->specs.pad_size = PAD_MD5; ssl->specs.static_ecdh = 0; ssl->specs.key_size = HC_128_KEY_SIZE; @@ -1762,7 +1762,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = HC_128_KEY_SIZE; @@ -1830,7 +1830,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = RABBIT_KEY_SIZE; @@ -1847,7 +1847,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1865,7 +1865,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -1883,7 +1883,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -1901,7 +1901,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha384_mac; ssl->specs.kea = diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA384_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA384_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_256_KEY_SIZE; @@ -1919,7 +1919,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CAMELLIA_128_KEY_SIZE; @@ -1936,7 +1936,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CAMELLIA_256_KEY_SIZE; @@ -1953,7 +1953,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CAMELLIA_128_KEY_SIZE; @@ -1970,7 +1970,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CAMELLIA_256_KEY_SIZE; @@ -1987,7 +1987,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CAMELLIA_128_KEY_SIZE; @@ -2004,7 +2004,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CAMELLIA_256_KEY_SIZE; @@ -2021,7 +2021,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CAMELLIA_128_KEY_SIZE; @@ -2038,7 +2038,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = diffie_hellman_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = CAMELLIA_256_KEY_SIZE; @@ -2055,7 +2055,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = diffie_hellman_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = AES_128_KEY_SIZE; @@ -2073,7 +2073,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha_mac; ssl->specs.kea = rsa_kea; ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = SHA_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; ssl->specs.static_ecdh = 0; ssl->specs.key_size = IDEA_KEY_SIZE; @@ -2090,7 +2090,7 @@ int SetCipherSpecs(WOLFSSL* ssl) ssl->specs.mac_algorithm = sha256_mac; ssl->specs.kea = no_kea; ssl->specs.sig_algo = anonymous_sa_algo; - ssl->specs.hash_size = SHA256_DIGEST_SIZE; + ssl->specs.hash_size = WC_SHA256_DIGEST_SIZE; ssl->specs.pad_size = PAD_SHA; break; @@ -3130,7 +3130,7 @@ int DeriveKeys(WOLFSSL* ssl) int length = 2 * ssl->specs.hash_size + 2 * ssl->specs.key_size + 2 * ssl->specs.iv_size; - int rounds = (length + MD5_DIGEST_SIZE - 1 ) / MD5_DIGEST_SIZE, i; + int rounds = (length + WC_MD5_DIGEST_SIZE - 1 ) / WC_MD5_DIGEST_SIZE, i; int ret = 0; #ifdef WOLFSSL_SMALL_STACK @@ -3138,28 +3138,28 @@ int DeriveKeys(WOLFSSL* ssl) byte* md5Input; byte* shaInput; byte* keyData; - Md5* md5; - Sha* sha; + wc_Md5* md5; + wc_Sha* sha; #else - byte shaOutput[SHA_DIGEST_SIZE]; - byte md5Input[SECRET_LEN + SHA_DIGEST_SIZE]; + byte shaOutput[WC_SHA_DIGEST_SIZE]; + byte md5Input[SECRET_LEN + WC_SHA_DIGEST_SIZE]; byte shaInput[KEY_PREFIX + SECRET_LEN + 2 * RAN_LEN]; - byte keyData[KEY_PREFIX * MD5_DIGEST_SIZE]; - Md5 md5[1]; - Sha sha[1]; + byte keyData[KEY_PREFIX * WC_MD5_DIGEST_SIZE]; + wc_Md5 md5[1]; + wc_Sha sha[1]; #endif #ifdef WOLFSSL_SMALL_STACK - shaOutput = (byte*)XMALLOC(SHA_DIGEST_SIZE, + shaOutput = (byte*)XMALLOC(WC_SHA_DIGEST_SIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER); - md5Input = (byte*)XMALLOC(SECRET_LEN + SHA_DIGEST_SIZE, + md5Input = (byte*)XMALLOC(SECRET_LEN + WC_SHA_DIGEST_SIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER); shaInput = (byte*)XMALLOC(KEY_PREFIX + SECRET_LEN + 2 * RAN_LEN, NULL, DYNAMIC_TYPE_TMP_BUFFER); - keyData = (byte*)XMALLOC(KEY_PREFIX * MD5_DIGEST_SIZE, + keyData = (byte*)XMALLOC(KEY_PREFIX * WC_MD5_DIGEST_SIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER); - md5 = (Md5*)XMALLOC(sizeof(Md5), NULL, DYNAMIC_TYPE_TMP_BUFFER); - sha = (Sha*)XMALLOC(sizeof(Sha), NULL, DYNAMIC_TYPE_TMP_BUFFER); + md5 = (wc_Md5*)XMALLOC(sizeof(wc_Md5), NULL, DYNAMIC_TYPE_TMP_BUFFER); + sha = (wc_Sha*)XMALLOC(sizeof(wc_Sha), NULL, DYNAMIC_TYPE_TMP_BUFFER); if (shaOutput == NULL || md5Input == NULL || shaInput == NULL || keyData == NULL || md5 == NULL || sha == NULL) { @@ -3203,12 +3203,12 @@ int DeriveKeys(WOLFSSL* ssl) ret = wc_ShaFinal(sha, shaOutput); } - XMEMCPY(md5Input + SECRET_LEN, shaOutput, SHA_DIGEST_SIZE); + XMEMCPY(md5Input + SECRET_LEN, shaOutput, WC_SHA_DIGEST_SIZE); if (ret == 0) { - ret = wc_Md5Update(md5, md5Input, SECRET_LEN + SHA_DIGEST_SIZE); + ret = wc_Md5Update(md5, md5Input, SECRET_LEN + WC_SHA_DIGEST_SIZE); } if (ret == 0) { - ret = wc_Md5Final(md5, keyData + i * MD5_DIGEST_SIZE); + ret = wc_Md5Final(md5, keyData + i * WC_MD5_DIGEST_SIZE); } } @@ -3258,14 +3258,14 @@ static int MakeSslMasterSecret(WOLFSSL* ssl) byte* shaOutput; byte* md5Input; byte* shaInput; - Md5* md5; - Sha* sha; + wc_Md5* md5; + wc_Sha* sha; #else - byte shaOutput[SHA_DIGEST_SIZE]; - byte md5Input[ENCRYPT_LEN + SHA_DIGEST_SIZE]; + byte shaOutput[WC_SHA_DIGEST_SIZE]; + byte md5Input[ENCRYPT_LEN + WC_SHA_DIGEST_SIZE]; byte shaInput[PREFIX + ENCRYPT_LEN + 2 * RAN_LEN]; - Md5 md5[1]; - Sha sha[1]; + wc_Md5 md5[1]; + wc_Sha sha[1]; #endif #ifdef SHOW_SECRETS @@ -3279,14 +3279,14 @@ static int MakeSslMasterSecret(WOLFSSL* ssl) #endif #ifdef WOLFSSL_SMALL_STACK - shaOutput = (byte*)XMALLOC(SHA_DIGEST_SIZE, + shaOutput = (byte*)XMALLOC(WC_SHA_DIGEST_SIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER); - md5Input = (byte*)XMALLOC(ENCRYPT_LEN + SHA_DIGEST_SIZE, + md5Input = (byte*)XMALLOC(ENCRYPT_LEN + WC_SHA_DIGEST_SIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER); shaInput = (byte*)XMALLOC(PREFIX + ENCRYPT_LEN + 2 * RAN_LEN, NULL, DYNAMIC_TYPE_TMP_BUFFER); - md5 = (Md5*)XMALLOC(sizeof(Md5), NULL, DYNAMIC_TYPE_TMP_BUFFER); - sha = (Sha*)XMALLOC(sizeof(Sha), NULL, DYNAMIC_TYPE_TMP_BUFFER); + md5 = (wc_Md5*)XMALLOC(sizeof(wc_Md5), NULL, DYNAMIC_TYPE_TMP_BUFFER); + sha = (wc_Sha*)XMALLOC(sizeof(wc_Sha), NULL, DYNAMIC_TYPE_TMP_BUFFER); if (shaOutput == NULL || md5Input == NULL || shaInput == NULL || md5 == NULL || sha == NULL) { @@ -3331,14 +3331,14 @@ static int MakeSslMasterSecret(WOLFSSL* ssl) ret = wc_ShaFinal(sha, shaOutput); } idx = pmsSz; /* preSz */ - XMEMCPY(md5Input + idx, shaOutput, SHA_DIGEST_SIZE); - idx += SHA_DIGEST_SIZE; + XMEMCPY(md5Input + idx, shaOutput, WC_SHA_DIGEST_SIZE); + idx += WC_SHA_DIGEST_SIZE; if (ret == 0) { ret = wc_Md5Update(md5, md5Input, idx); } if (ret == 0) { ret = wc_Md5Final(md5, - &ssl->arrays->masterSecret[i * MD5_DIGEST_SIZE]); + &ssl->arrays->masterSecret[i * WC_MD5_DIGEST_SIZE]); } } diff --git a/src/ocsp.c b/src/ocsp.c index 4554b24b0..05c5148a9 100644 --- a/src/ocsp.c +++ b/src/ocsp.c @@ -471,11 +471,11 @@ int wolfSSL_OCSP_resp_find_status(WOLFSSL_OCSP_BASICRESP *bs, WOLFSSL_ASN1_TIME** nextupd) { if (bs == NULL || id == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; /* Only supporting one certificate status in asn.c. */ if (CompareOcspReqResp(id, bs) != 0) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; if (status != NULL) *status = bs->status->status; @@ -490,7 +490,7 @@ int wolfSSL_OCSP_resp_find_status(WOLFSSL_OCSP_BASICRESP *bs, if (revtime != NULL) *revtime = NULL; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } const char *wolfSSL_OCSP_cert_status_str(long s) @@ -515,7 +515,7 @@ int wolfSSL_OCSP_check_validity(WOLFSSL_ASN1_TIME* thisupd, (void)sec; (void)maxsec; /* Dates validated in DecodeSingleResponse. */ - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } void wolfSSL_OCSP_CERTID_free(WOLFSSL_OCSP_CERTID* certId) @@ -581,19 +581,19 @@ void wolfSSL_OCSP_BASICRESP_free(WOLFSSL_OCSP_BASICRESP* basicResponse) /* Signature verified in DecodeBasicOcspResponse. * But no store available to verify certificate. */ int wolfSSL_OCSP_basic_verify(WOLFSSL_OCSP_BASICRESP *bs, - STACK_OF(WOLFSSL_X509) *certs, WOLFSSL_X509_STORE *st, unsigned long flags) + WOLF_STACK_OF(WOLFSSL_X509) *certs, WOLFSSL_X509_STORE *st, unsigned long flags) { DecodedCert cert; - int ret = SSL_SUCCESS; + int ret = WOLF_SSL_SUCCESS; (void)certs; if (flags & OCSP_NOVERIFY) - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; InitDecodedCert(&cert, bs->cert, bs->certSz, NULL); if (ParseCertRelative(&cert, CERT_TYPE, VERIFY, st->cm) < 0) - ret = SSL_FAILURE; + ret = WOLF_SSL_FAILURE; FreeDecodedCert(&cert); return ret; diff --git a/src/sniffer.c b/src/sniffer.c index a835996a2..755f86c8e 100644 --- a/src/sniffer.c +++ b/src/sniffer.c @@ -339,17 +339,17 @@ typedef struct FinCaputre { typedef struct HsHashes { #ifndef NO_OLD_TLS #ifndef NO_SHA - Sha hashSha; + wc_Sha hashSha; #endif #ifndef NO_MD5 - Md5 hashMd5; + wc_Md5 hashMd5; #endif #endif #ifndef NO_SHA256 - Sha256 hashSha256; + wc_Sha256 hashSha256; #endif #ifdef WOLFSSL_SHA384 - Sha384 hashSha384; + wc_Sha384 hashSha384; #endif } HsHashes; @@ -619,18 +619,18 @@ static int HashCopy(HS_Hashes* d, HsHashes* s) { #ifndef NO_OLD_TLS #ifndef NO_SHA - XMEMCPY(&d->hashSha, &s->hashSha, sizeof(Sha)); + XMEMCPY(&d->hashSha, &s->hashSha, sizeof(wc_Sha)); #endif #ifndef NO_MD5 - XMEMCPY(&d->hashMd5, &s->hashMd5, sizeof(Md5)); + XMEMCPY(&d->hashMd5, &s->hashMd5, sizeof(wc_Md5)); #endif #endif #ifndef NO_SHA256 - XMEMCPY(&d->hashSha256, &s->hashSha256, sizeof(Sha256)); + XMEMCPY(&d->hashSha256, &s->hashSha256, sizeof(wc_Sha256)); #endif #ifdef WOLFSSL_SHA384 - XMEMCPY(&d->hashSha384, &s->hashSha384, sizeof(Sha384)); + XMEMCPY(&d->hashSha384, &s->hashSha384, sizeof(wc_Sha384)); #endif return 0; @@ -1183,7 +1183,7 @@ static int LoadKeyFile(byte** keyBuf, word32* keyBufSz, return -1; } - if (typeKey == SSL_FILETYPE_PEM) { + if (typeKey == WOLF_SSL_FILETYPE_PEM) { byte* saveBuf = (byte*)malloc(fileSz); int saveBufSz = 0; @@ -1228,8 +1228,8 @@ static int SetNamedPrivateKey(const char* name, const char* address, int port, { SnifferServer* sniffer; int ret; - int type = (typeKey == FILETYPE_PEM) ? SSL_FILETYPE_PEM : - SSL_FILETYPE_ASN1; + int type = (typeKey == FILETYPE_PEM) ? WOLF_SSL_FILETYPE_PEM : + WOLF_SSL_FILETYPE_ASN1; int isNew = 0; word32 serverIp; @@ -1306,7 +1306,7 @@ static int SetNamedPrivateKey(const char* name, const char* address, int port, sniffer->ctx, (void*)password); } ret = SSL_CTX_use_PrivateKey_file(sniffer->ctx, keyFile, type); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { SetError(KEY_FILE_STR, error, NULL, 0); if (isNew) FreeSnifferServer(sniffer); @@ -1825,7 +1825,7 @@ static int ProcessClientHello(const byte* input, int* sslBytes, *sslBytes + HANDSHAKE_HEADER_SZ + RECORD_HEADER_SZ, WOLFSSL_SNI_HOST_NAME, name, &nameSz); - if (ret == SSL_SUCCESS) { + if (ret == WOLF_SSL_SUCCESS) { NamedKey* namedKey; if (nameSz >= sizeof(name)) @@ -1838,7 +1838,7 @@ static int ProcessClientHello(const byte* input, int* sslBytes, XSTRNCMP((char*)name, namedKey->name, nameSz) == 0) { if (wolfSSL_use_PrivateKey_buffer(session->sslServer, namedKey->key, namedKey->keySz, - SSL_FILETYPE_ASN1) != SSL_SUCCESS) { + WOLF_SSL_FILETYPE_ASN1) != WOLF_SSL_SUCCESS) { wc_UnLockMutex(&session->context->namedKeysMutex); SetError(CLIENT_HELLO_LATE_KEY_STR, error, session, FATAL_ERROR_STATE); @@ -3596,7 +3596,7 @@ int ssl_GetSessionStats(unsigned int* active, unsigned int* total, ret = wolfSSL_get_session_stats(active, total, peak, maxSessions); - if (ret == SSL_SUCCESS) + if (ret == WOLF_SSL_SUCCESS) return 0; else { SetError(BAD_SESSION_STATS, error, NULL, 0); diff --git a/src/ssl.c b/src/ssl.c index 620b9c52f..e69ddc590 100755 --- a/src/ssl.c +++ b/src/ssl.c @@ -143,7 +143,7 @@ int wolfSSL_CTX_dtls_set_export(WOLFSSL_CTX* ctx, wc_dtls_export func) ctx->dtls_export = func; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -161,7 +161,7 @@ int wolfSSL_dtls_set_export(WOLFSSL* ssl, wc_dtls_export func) ssl->dtls_export = func; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -233,7 +233,7 @@ int wolfSSL_send_session(WOLFSSL* ssl) /* if no error ret has size of buffer */ ret = ssl->dtls_export(ssl, buf, ret, NULL); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { XFREE(buf, ssl->heap, DYNAMIC_TYPE_TMP_BUFFER); return ret; } @@ -264,7 +264,7 @@ WOLFSSL_CTX* wolfSSL_CTX_new_ex(WOLFSSL_METHOD* method, void* heap) if (initRefCount == 0) { /* user no longer forced to call Init themselves */ int ret = wolfSSL_Init(); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("wolfSSL_Init failed"); WOLFSSL_LEAVE("WOLFSSL_CTX_new", 0); if (method != NULL) { @@ -317,7 +317,7 @@ void wolfSSL_CTX_free(WOLFSSL_CTX* ctx) #ifdef SINGLE_THREADED /* no locking in single threaded mode, allow a CTX level rng to be shared with - * WOLFSSL objects, SSL_SUCCESS on ok */ + * WOLFSSL objects, WOLF_SSL_SUCCESS on ok */ int wolfSSL_CTX_new_rng(WOLFSSL_CTX* ctx) { WC_RNG* rng; @@ -343,7 +343,7 @@ int wolfSSL_CTX_new_rng(WOLFSSL_CTX* ctx) } ctx->rng = rng; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif @@ -446,7 +446,7 @@ static int DupSSL(WOLFSSL* dup, WOLFSSL* ssl) return BAD_MUTEX_E; } ssl->dupWrite->dupCount = 2; /* both sides have a count to start */ - dup->dupWrite = ssl->dupWrite ; /* each side uses */ + dup->dupWrite = ssl->dupWrite; /* each side uses */ /* copy write parts over to dup writer */ XMEMCPY(&dup->specs, &ssl->specs, sizeof(CipherSpecs)); @@ -572,7 +572,7 @@ int wolfSSL_set_fd(WOLFSSL* ssl, int fd) } ret = wolfSSL_set_read_fd(ssl, fd); - if (ret == SSL_SUCCESS) { + if (ret == WOLF_SSL_SUCCESS) { ret = wolfSSL_set_write_fd(ssl, fd); } @@ -598,8 +598,8 @@ int wolfSSL_set_read_fd(WOLFSSL* ssl, int fd) } #endif - WOLFSSL_LEAVE("SSL_set_read_fd", SSL_SUCCESS); - return SSL_SUCCESS; + WOLFSSL_LEAVE("SSL_set_read_fd", WOLF_SSL_SUCCESS); + return WOLF_SSL_SUCCESS; } @@ -621,8 +621,8 @@ int wolfSSL_set_write_fd(WOLFSSL* ssl, int fd) } #endif - WOLFSSL_LEAVE("SSL_set_write_fd", SSL_SUCCESS); - return SSL_SUCCESS; + WOLFSSL_LEAVE("SSL_set_write_fd", WOLF_SSL_SUCCESS); + return WOLF_SSL_SUCCESS; } @@ -698,7 +698,7 @@ int wolfSSL_get_ciphers(char* buf, int len) else return BUFFER_E; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } const char* wolfSSL_get_shared_ciphers(WOLFSSL* ssl, char* buf, int len) @@ -755,14 +755,14 @@ int wolfSSL_dtls_set_peer(WOLFSSL* ssl, void* peer, unsigned int peerSz) XMEMCPY(sa, peer, peerSz); ssl->buffers.dtlsCtx.peer.sa = sa; ssl->buffers.dtlsCtx.peer.sz = peerSz; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } - return SSL_FAILURE; + return WOLF_SSL_FAILURE; #else (void)ssl; (void)peer; (void)peerSz; - return SSL_NOT_IMPLEMENTED; + return WOLF_SSL_NOT_IMPLEMENTED; #endif } @@ -770,7 +770,7 @@ int wolfSSL_dtls_get_peer(WOLFSSL* ssl, void* peer, unsigned int* peerSz) { #ifdef WOLFSSL_DTLS if (ssl == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (peer != NULL && peerSz != NULL @@ -778,14 +778,14 @@ int wolfSSL_dtls_get_peer(WOLFSSL* ssl, void* peer, unsigned int* peerSz) && ssl->buffers.dtlsCtx.peer.sa != NULL) { *peerSz = ssl->buffers.dtlsCtx.peer.sz; XMEMCPY(peer, ssl->buffers.dtlsCtx.peer.sa, *peerSz); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } - return SSL_FAILURE; + return WOLF_SSL_FAILURE; #else (void)ssl; (void)peer; (void)peerSz; - return SSL_NOT_IMPLEMENTED; + return WOLF_SSL_NOT_IMPLEMENTED; #endif } @@ -800,7 +800,7 @@ int wolfSSL_CTX_dtls_set_sctp(WOLFSSL_CTX* ctx) return BAD_FUNC_ARG; ctx->dtlsSctp = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -812,7 +812,7 @@ int wolfSSL_dtls_set_sctp(WOLFSSL* ssl) return BAD_FUNC_ARG; ssl->options.dtlsSctp = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -822,7 +822,7 @@ int wolfSSL_CTX_dtls_set_mtu(WOLFSSL_CTX* ctx, word16 newMtu) return BAD_FUNC_ARG; ctx->dtlsMtuSz = newMtu; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -833,11 +833,11 @@ int wolfSSL_dtls_set_mtu(WOLFSSL* ssl, word16 newMtu) if (newMtu > MAX_RECORD_SIZE) { ssl->error = BAD_FUNC_ARG; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } ssl->dtlsMtuSz = newMtu; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -856,7 +856,7 @@ int wolfSSL_dtls_get_drop_stats(WOLFSSL* ssl, if (ssl == NULL) ret = BAD_FUNC_ARG; else { - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; if (macDropCount != NULL) *macDropCount = ssl->macDropCount; if (replayDropCount != NULL) @@ -891,7 +891,7 @@ int wolfSSL_CTX_mcast_set_member_id(WOLFSSL_CTX* ctx, word16 id) } if (ret == 0) - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; WOLFSSL_LEAVE("wolfSSL_CTX_mcast_set_member_id()", ret); return ret; } @@ -982,12 +982,12 @@ int wolfSSL_set_secret(WOLFSSL* ssl, word16 epoch, #endif } FreeHandshakeResources(ssl); - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; } else { if (ssl) ssl->error = ret; - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } WOLFSSL_LEAVE("wolfSSL_set_secret()", ret); return ret; @@ -999,7 +999,7 @@ int wolfSSL_set_secret(WOLFSSL* ssl, word16 epoch, int wolfSSL_mcast_peer_add(WOLFSSL* ssl, word16 peerId, int remove) { WOLFSSL_DTLS_PEERSEQ* p = NULL; - int ret = SSL_SUCCESS; + int ret = WOLF_SSL_SUCCESS; int i; WOLFSSL_ENTER("wolfSSL_mcast_peer_add()"); @@ -1094,7 +1094,7 @@ int wolfSSL_CTX_mcast_set_highwater_cb(WOLFSSL_CTX* ctx, word32 maxSeq, ctx->mcastSecondSeq = second; ctx->mcastMaxSeq = maxSeq; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -1105,7 +1105,7 @@ int wolfSSL_mcast_set_highwater_ctx(WOLFSSL* ssl, void* ctx) ssl->mcastHwCbCtx = ctx; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* WOLFSSL_DTLS */ @@ -1116,10 +1116,10 @@ int wolfSSL_mcast_set_highwater_ctx(WOLFSSL* ssl, void* ctx) #endif /* WOLFSSL_LEANPSK */ -/* return underlying connect or accept, SSL_SUCCESS on ok */ +/* return underlying connect or accept, WOLF_SSL_SUCCESS on ok */ int wolfSSL_negotiate(WOLFSSL* ssl) { - int err = SSL_FATAL_ERROR; + int err = WOLF_SSL_FATAL_ERROR; WOLFSSL_ENTER("wolfSSL_negotiate"); #ifndef NO_WOLFSSL_SERVER @@ -1184,22 +1184,22 @@ int wolfSSL_GetObjectSize(void) printf("sizeof keys = %lu\n", sizeof(Keys)); printf("sizeof Hashes(2) = %lu\n", sizeof(Hashes)); #ifndef NO_MD5 - printf("\tsizeof MD5 = %lu\n", sizeof(Md5)); + printf("\tsizeof MD5 = %lu\n", sizeof(wc_Md5)); #endif #ifndef NO_SHA - printf("\tsizeof SHA = %lu\n", sizeof(Sha)); + printf("\tsizeof SHA = %lu\n", sizeof(wc_Sha)); #endif #ifdef WOLFSSL_SHA224 - printf(" sizeof SHA224 = %lu\n", sizeof(Sha224)); + printf("\tsizeof SHA224 = %lu\n", sizeof(wc_Sha224)); #endif #ifndef NO_SHA256 - printf("\tsizeof SHA256 = %lu\n", sizeof(Sha256)); + printf("\tsizeof SHA256 = %lu\n", sizeof(wc_Sha256)); #endif #ifdef WOLFSSL_SHA384 - printf("\tsizeof SHA384 = %lu\n", sizeof(Sha384)); + printf("\tsizeof SHA384 = %lu\n", sizeof(wc_Sha384)); #endif #ifdef WOLFSSL_SHA384 - printf("\tsizeof SHA512 = %lu\n", sizeof(Sha512)); + printf("\tsizeof SHA512 = %lu\n", sizeof(wc_Sha512)); #endif printf("sizeof Buffers = %lu\n", sizeof(Buffers)); printf("sizeof Options = %lu\n", sizeof(Options)); @@ -1256,7 +1256,7 @@ int wolfSSL_CTX_load_static_memory(WOLFSSL_CTX** ctx, wolfSSL_method_func method heap = (WOLFSSL_HEAP*)buf; idx += sizeof(WOLFSSL_HEAP); if (wolfSSL_init_memory_heap(heap) != 0) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } hint = (WOLFSSL_HEAP_HINT*)(buf + idx); idx += sizeof(WOLFSSL_HEAP_HINT); @@ -1271,7 +1271,7 @@ int wolfSSL_CTX_load_static_memory(WOLFSSL_CTX** ctx, wolfSSL_method_func method #ifdef WOLFSSL_HEAP_TEST /* do not load in memory if test has been set */ if ((*ctx)->heap == (void*)WOLFSSL_HEAP_TEST) { - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif hint = (WOLFSSL_HEAP_HINT*)((*ctx)->heap); @@ -1280,7 +1280,7 @@ int wolfSSL_CTX_load_static_memory(WOLFSSL_CTX** ctx, wolfSSL_method_func method if (wolfSSL_load_static_memory(buf + idx, sz - idx, flag, heap) != 1) { WOLFSSL_MSG("Error partitioning memory"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* create ctx if needed */ @@ -1288,7 +1288,7 @@ int wolfSSL_CTX_load_static_memory(WOLFSSL_CTX** ctx, wolfSSL_method_func method *ctx = wolfSSL_CTX_new_ex(method(hint), hint); if (*ctx == NULL) { WOLFSSL_MSG("Error creating ctx"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } @@ -1305,7 +1305,7 @@ int wolfSSL_CTX_load_static_memory(WOLFSSL_CTX** ctx, wolfSSL_method_func method (void)max; (void)method; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -1411,7 +1411,7 @@ int wolfSSL_CTX_SetMinEccKey_Sz(WOLFSSL_CTX* ctx, short keySz) #ifndef NO_CERTS ctx->cm->minEccKeySz = keySz / 8; #endif - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -1423,7 +1423,7 @@ int wolfSSL_SetMinEccKey_Sz(WOLFSSL* ssl, short keySz) } ssl->options.minEccKeySz = keySz / 8; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* !NO_RSA */ @@ -1438,7 +1438,7 @@ int wolfSSL_CTX_SetMinRsaKey_Sz(WOLFSSL_CTX* ctx, short keySz) ctx->minRsaKeySz = keySz / 8; ctx->cm->minRsaKeySz = keySz / 8; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -1450,12 +1450,12 @@ int wolfSSL_SetMinRsaKey_Sz(WOLFSSL* ssl, short keySz) } ssl->options.minRsaKeySz = keySz / 8; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* !NO_RSA */ #ifndef NO_DH -/* server Diffie-Hellman parameters, SSL_SUCCESS on ok */ +/* server Diffie-Hellman parameters, WOLF_SSL_SUCCESS on ok */ int wolfSSL_SetTmpDH(WOLFSSL* ssl, const unsigned char* p, int pSz, const unsigned char* g, int gSz) { @@ -1517,10 +1517,10 @@ int wolfSSL_SetTmpDH(WOLFSSL* ssl, const unsigned char* p, int pSz, ssl->options.haveStaticECC, ssl->options.side); WOLFSSL_LEAVE("wolfSSL_SetTmpDH", 0); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } -/* server ctx Diffie-Hellman parameters, SSL_SUCCESS on ok */ +/* server ctx Diffie-Hellman parameters, WOLF_SSL_SUCCESS on ok */ int wolfSSL_CTX_SetTmpDH(WOLFSSL_CTX* ctx, const unsigned char* p, int pSz, const unsigned char* g, int gSz) { @@ -1552,7 +1552,7 @@ int wolfSSL_CTX_SetTmpDH(WOLFSSL_CTX* ctx, const unsigned char* p, int pSz, ctx->haveDH = 1; WOLFSSL_LEAVE("wolfSSL_CTX_SetTmpDH", 0); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -1562,7 +1562,7 @@ int wolfSSL_CTX_SetMinDhKey_Sz(WOLFSSL_CTX* ctx, word16 keySz) return BAD_FUNC_ARG; ctx->minDhKeySz = keySz / 8; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -1572,7 +1572,7 @@ int wolfSSL_SetMinDhKey_Sz(WOLFSSL* ssl, word16 keySz) return BAD_FUNC_ARG; ssl->options.minDhKeySz = keySz / 8; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -1599,7 +1599,7 @@ int wolfSSL_write(WOLFSSL* ssl, const void* data, int sz) #ifdef WOLFSSL_EARLY_DATA if (ssl->earlyData && (ret = wolfSSL_negotiate(ssl)) < 0) { ssl->error = ret; - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->earlyData = 0; #endif @@ -1624,12 +1624,12 @@ int wolfSSL_write(WOLFSSL* ssl, const void* data, int sz) if (ret != 0) { ssl->error = ret; /* high priority fatal error */ - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (dupErr != 0) { WOLFSSL_MSG("Write dup error from other side"); ssl->error = dupErr; - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } #endif @@ -1643,7 +1643,7 @@ int wolfSSL_write(WOLFSSL* ssl, const void* data, int sz) WOLFSSL_LEAVE("SSL_write()", ret); if (ret < 0) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; else return ret; } @@ -1702,7 +1702,7 @@ static int wolfSSL_read_internal(WOLFSSL* ssl, void* data, int sz, int peek) WOLFSSL_LEAVE("wolfSSL_read_internal()", ret); if (ret < 0) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; else return ret; } @@ -1745,7 +1745,7 @@ int wolfSSL_mcast_read(WOLFSSL* ssl, word16* id, void* data, int sz) #ifdef WOLFSSL_ASYNC_CRYPT -/* let's use async hardware, SSL_SUCCESS on ok */ +/* let's use async hardware, WOLF_SSL_SUCCESS on ok */ int wolfSSL_UseAsync(WOLFSSL* ssl, int devId) { if (ssl == NULL) @@ -1753,11 +1753,11 @@ int wolfSSL_UseAsync(WOLFSSL* ssl, int devId) ssl->devId = devId; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } -/* let's use async hardware, SSL_SUCCESS on ok */ +/* let's use async hardware, WOLF_SSL_SUCCESS on ok */ int wolfSSL_CTX_UseAsync(WOLFSSL_CTX* ctx, int devId) { if (ctx == NULL) @@ -1765,7 +1765,7 @@ int wolfSSL_CTX_UseAsync(WOLFSSL_CTX* ctx, int devId) ctx->devId = devId; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* WOLFSSL_ASYNC_CRYPT */ @@ -1987,7 +1987,7 @@ int wolfSSL_UseSupportedCurve(WOLFSSL* ssl, word16 name) case WOLFSSL_FFDHE_6144: case WOLFSSL_FFDHE_8192: if (!IsAtLeastTLSv1_3(ssl->version)) - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; break; #endif @@ -2106,7 +2106,7 @@ int wolfSSL_UseALPN(WOLFSSL* ssl, char *protocol_name_list, char *list, *ptr, *token[10]; word16 len; int idx = 0; - int ret = SSL_FAILURE; + int ret = WOLF_SSL_FAILURE; WOLFSSL_ENTER("wolfSSL_UseALPN"); @@ -2148,7 +2148,7 @@ int wolfSSL_UseALPN(WOLFSSL* ssl, char *protocol_name_list, ret = TLSX_UseALPN(&ssl->extensions, token[idx], len, options, ssl->heap); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("TLSX_UseALPN failure"); break; } @@ -2184,7 +2184,7 @@ int wolfSSL_ALPN_GetPeerProtocol(WOLFSSL* ssl, char **list, word16 *listSz) XSTRNCPY(*list, ssl->alpn_client_list, (*listSz)+1); (*list)[*listSz] = 0; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -2198,7 +2198,7 @@ int wolfSSL_ALPN_FreePeerProtocol(WOLFSSL* ssl, char **list) XFREE(*list, ssl->heap, DYNAMIC_TYPE_TLSX); *list = NULL; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* HAVE_ALPN */ @@ -2214,7 +2214,7 @@ int wolfSSL_UseSecureRenegotiation(WOLFSSL* ssl) if (ssl) ret = TLSX_UseSecureRenegotiation(&ssl->extensions, ssl->heap); - if (ret == SSL_SUCCESS) { + if (ret == WOLF_SSL_SUCCESS) { TLSX* extension = TLSX_Find(ssl->extensions, TLSX_RENEGOTIATION_INFO); if (extension) @@ -2281,7 +2281,7 @@ int wolfSSL_Rehandshake(WOLFSSL* ssl) /* Session Ticket */ #if !defined(NO_WOLFSSL_SERVER) && defined(HAVE_SESSION_TICKET) -/* SSL_SUCCESS on ok */ +/* WOLF_SSL_SUCCESS on ok */ int wolfSSL_CTX_set_TicketEncCb(WOLFSSL_CTX* ctx, SessionTicketEncCb cb) { if (ctx == NULL) @@ -2289,10 +2289,10 @@ int wolfSSL_CTX_set_TicketEncCb(WOLFSSL_CTX* ctx, SessionTicketEncCb cb) ctx->ticketEncCb = cb; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } -/* set hint interval, SSL_SUCCESS on ok */ +/* set hint interval, WOLF_SSL_SUCCESS on ok */ int wolfSSL_CTX_set_TicketHint(WOLFSSL_CTX* ctx, int hint) { if (ctx == NULL) @@ -2300,10 +2300,10 @@ int wolfSSL_CTX_set_TicketHint(WOLFSSL_CTX* ctx, int hint) ctx->ticketHint = hint; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } -/* set user context, SSL_SUCCESS on ok */ +/* set user context, WOLF_SSL_SUCCESS on ok */ int wolfSSL_CTX_set_TicketEncCtx(WOLFSSL_CTX* ctx, void* userCtx) { if (ctx == NULL) @@ -2311,7 +2311,7 @@ int wolfSSL_CTX_set_TicketEncCtx(WOLFSSL_CTX* ctx, void* userCtx) ctx->ticketEncCtx = userCtx; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* !defined(NO_WOLFSSL_CLIENT) && defined(HAVE_SESSION_TICKET) */ @@ -2347,7 +2347,7 @@ WOLFSSL_API int wolfSSL_get_SessionTicket(WOLFSSL* ssl, else *bufSz = 0; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } WOLFSSL_API int wolfSSL_set_SessionTicket(WOLFSSL* ssl, const byte* buf, @@ -2383,7 +2383,7 @@ WOLFSSL_API int wolfSSL_set_SessionTicket(WOLFSSL* ssl, const byte* buf, } ssl->session.ticketLen = (word16)bufSz; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -2396,7 +2396,7 @@ WOLFSSL_API int wolfSSL_set_SessionTicket_cb(WOLFSSL* ssl, ssl->session_ticket_cb = cb; ssl->session_ticket_ctx = ctx; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif @@ -2411,7 +2411,7 @@ int wolfSSL_CTX_DisableExtendedMasterSecret(WOLFSSL_CTX* ctx) ctx->haveEMS = 0; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -2422,7 +2422,7 @@ int wolfSSL_DisableExtendedMasterSecret(WOLFSSL* ssl) ssl->options.haveEMS = 0; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif @@ -2476,19 +2476,19 @@ int wolfSSL_recv(WOLFSSL* ssl, void* data, int sz, int flags) #endif -/* SSL_SUCCESS on ok */ +/* WOLF_SSL_SUCCESS on ok */ int wolfSSL_shutdown(WOLFSSL* ssl) { - int ret = SSL_FATAL_ERROR; + int ret = WOLF_SSL_FATAL_ERROR; byte tmp; WOLFSSL_ENTER("SSL_shutdown()"); if (ssl == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; if (ssl->options.quietShutdown) { WOLFSSL_MSG("quiet shutdown, no close notify sent"); - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; } else { /* try to send close notify, not an error if can't */ @@ -2497,13 +2497,13 @@ int wolfSSL_shutdown(WOLFSSL* ssl) ssl->error = SendAlert(ssl, alert_warning, close_notify); if (ssl->error < 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->options.sentNotify = 1; /* don't send close_notify twice */ if (ssl->options.closeNotify) - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; else { - ret = SSL_SHUTDOWN_NOT_DONE; + ret = WOLF_SSL_SHUTDOWN_NOT_DONE; WOLFSSL_LEAVE("SSL_shutdown()", ret); return ret; } @@ -2514,20 +2514,20 @@ int wolfSSL_shutdown(WOLFSSL* ssl) ret = wolfSSL_read(ssl, &tmp, 0); if (ret < 0) { WOLFSSL_ERROR(ssl->error); - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } else if (ssl->options.closeNotify) { - ssl->error = SSL_ERROR_SYSCALL; /* simulate OpenSSL behavior */ - ret = SSL_SUCCESS; + ssl->error = WOLF_SSL_ERROR_SYSCALL; /* simulate OpenSSL behavior */ + ret = WOLF_SSL_SUCCESS; } } } #ifdef OPENSSL_EXTRA /* reset WOLFSSL structure state for possible re-use */ - if (ret == SSL_SUCCESS) { - if (wolfSSL_clear(ssl) != SSL_SUCCESS) { + if (ret == WOLF_SSL_SUCCESS) { + if (wolfSSL_clear(ssl) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("could not clear WOLFSSL"); - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #endif @@ -2554,7 +2554,7 @@ int wolfSSL_get_error(WOLFSSL* ssl, int ret) WOLFSSL_ENTER("SSL_get_error"); if (ret > 0) - return SSL_ERROR_NONE; + return WOLF_SSL_ERROR_NONE; if (ssl == NULL) return BAD_FUNC_ARG; @@ -2562,22 +2562,22 @@ int wolfSSL_get_error(WOLFSSL* ssl, int ret) /* make sure converted types are handled in SetErrorString() too */ if (ssl->error == WANT_READ) - return SSL_ERROR_WANT_READ; /* convert to OpenSSL type */ + return WOLF_SSL_ERROR_WANT_READ; /* convert to OpenSSL type */ else if (ssl->error == WANT_WRITE) - return SSL_ERROR_WANT_WRITE; /* convert to OpenSSL type */ + return WOLF_SSL_ERROR_WANT_WRITE; /* convert to OpenSSL type */ else if (ssl->error == ZERO_RETURN) - return SSL_ERROR_ZERO_RETURN; /* convert to OpenSSL type */ + return WOLF_SSL_ERROR_ZERO_RETURN; /* convert to OpenSSL type */ return ssl->error; } -/* retrive alert history, SSL_SUCCESS on ok */ +/* retrive alert history, WOLF_SSL_SUCCESS on ok */ int wolfSSL_get_alert_history(WOLFSSL* ssl, WOLFSSL_ALERT_HISTORY *h) { if (ssl && h) { *h = ssl->alert_history; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -3053,7 +3053,7 @@ int wolfSSL_CertManagerUnloadCAs(WOLFSSL_CERT_MANAGER* cm) wc_UnLockMutex(&cm->caLock); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -3073,7 +3073,7 @@ int wolfSSL_CertManagerUnload_trust_peers(WOLFSSL_CERT_MANAGER* cm) wc_UnLockMutex(&cm->tpLock); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* WOLFSSL_TRUST_PEER_CERT */ @@ -3175,7 +3175,7 @@ static struct cipher{ {IDEA_CBC_TYPE, "IDEA-CBC"}, #endif { 0, NULL} -} ; +}; const WOLFSSL_EVP_CIPHER *wolfSSL_EVP_get_cipherbyname(const char *name) { @@ -3201,8 +3201,8 @@ const WOLFSSL_EVP_CIPHER *wolfSSL_EVP_get_cipherbyname(const char *name) { NULL, NULL} }; - const struct cipher *ent ; - const struct alias *al ; + const struct cipher *ent; + const struct alias *al; WOLFSSL_ENTER("EVP_get_cipherbyname"); @@ -3311,8 +3311,10 @@ static const int EVP_DES_EDE3_SIZE = 12; #ifdef HAVE_IDEA static char *EVP_IDEA_CBC; +#if defined(OPENSSL_EXTRA) static const int EVP_IDEA_SIZE = 8; #endif +#endif void wolfSSL_EVP_init(void) { @@ -3476,7 +3478,7 @@ int wolfSSL_CTX_set_group_messages(WOLFSSL_CTX* ctx) ctx->groupMessages = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif @@ -3488,7 +3490,7 @@ int wolfSSL_connect_cert(WOLFSSL* ssl) int ret; if (ssl == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; ssl->options.certOnly = 1; ret = wolfSSL_connect(ssl); @@ -3508,7 +3510,7 @@ int wolfSSL_set_group_messages(WOLFSSL* ssl) ssl->options.groupMessages = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -3546,11 +3548,11 @@ static int SetMinVersionHelper(byte* minVersion, int version) return BAD_FUNC_ARG; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } -/* Set minimum downgrade version allowed, SSL_SUCCESS on ok */ +/* Set minimum downgrade version allowed, WOLF_SSL_SUCCESS on ok */ int wolfSSL_CTX_SetMinVersion(WOLFSSL_CTX* ctx, int version) { WOLFSSL_ENTER("wolfSSL_CTX_SetMinVersion"); @@ -3564,7 +3566,7 @@ int wolfSSL_CTX_SetMinVersion(WOLFSSL_CTX* ctx, int version) } -/* Set minimum downgrade version allowed, SSL_SUCCESS on ok */ +/* Set minimum downgrade version allowed, WOLF_SSL_SUCCESS on ok */ int wolfSSL_SetMinVersion(WOLFSSL* ssl, int version) { WOLFSSL_ENTER("wolfSSL_SetMinVersion"); @@ -3633,7 +3635,7 @@ int wolfSSL_SetVersion(WOLFSSL* ssl, int version) ssl->options.haveECDSAsig, ssl->options.haveECC, ssl->options.haveStaticECC, ssl->options.side); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* !leanpsk */ @@ -3791,14 +3793,14 @@ int MatchTrustedPeer(TrustedPeerCert* tp, DecodedCert* cert) /* compare signatures */ if (tp->sigLen == cert->sigLength) { if (XMEMCMP(tp->sig, cert->signature, cert->sigLength)) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } else { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* WOLFSSL_TRUST_PEER_CERT */ @@ -3992,7 +3994,7 @@ int AddTrustedPeer(WOLFSSL_CERT_MANAGER* cm, DerBuffer** pDer, int verify) WOLFSSL_MSG("\t\tOK Freeing der trusted peer cert"); WOLFSSL_LEAVE("AddTrustedPeer", ret); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* WOLFSSL_TRUST_PEER_CERT */ @@ -4155,7 +4157,7 @@ int AddCA(WOLFSSL_CERT_MANAGER* cm, DerBuffer** pDer, int type, int verify) WOLFSSL_LEAVE("AddCA", ret); - return ret == 0 ? SSL_SUCCESS : ret; + return ret == 0 ? WOLF_SSL_SUCCESS : ret; } #endif /* !NO_CERTS */ @@ -4261,17 +4263,17 @@ int wolfSSL_Init(void) initRefCount++; wc_UnLockMutex(&count_mutex); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #if (defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER)) && !defined(NO_CERTS) -/* SSL_SUCCESS if ok, <= 0 else */ +/* WOLF_SSL_SUCCESS if ok, <= 0 else */ static int wolfssl_decrypt_buffer_key(DerBuffer* der, byte* password, int passwordSz, EncryptedInfo* info) { - int ret = SSL_BAD_FILE; + int ret = WOLF_SSL_BAD_FILE; #ifdef WOLFSSL_SMALL_STACK byte* key = NULL; @@ -4286,13 +4288,13 @@ static int wolfssl_decrypt_buffer_key(DerBuffer* der, byte* password, if (der == NULL || password == NULL || info == NULL) { WOLFSSL_MSG("bad arguments"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* use file's salt for key derivation, hex decode first */ if (Base16_Decode(info->iv, info->ivSz, info->iv, &info->ivSz) != 0) { WOLFSSL_MSG("base16 decode failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #ifndef NO_MD5 @@ -4301,7 +4303,7 @@ static int wolfssl_decrypt_buffer_key(DerBuffer* der, byte* password, key = (byte*)XMALLOC(AES_256_KEY_SIZE, NULL, DYNAMIC_TYPE_SYMETRIC_KEY); if (key == NULL) { WOLFSSL_MSG("memory failure"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #endif /* WOLFSSL_SMALL_STACK */ @@ -4311,7 +4313,7 @@ static int wolfssl_decrypt_buffer_key(DerBuffer* der, byte* password, #ifdef WOLFSSL_SMALL_STACK XFREE(key, NULL, DYNAMIC_TYPE_SYMETRIC_KEY); #endif - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #endif /* NO_MD5 */ @@ -4341,11 +4343,11 @@ static int wolfssl_decrypt_buffer_key(DerBuffer* der, byte* password, #endif if (ret == MP_OKAY) - return SSL_SUCCESS; - else if (ret == SSL_BAD_FILE) - return SSL_BAD_FILE; + return WOLF_SSL_SUCCESS; + else if (ret == WOLF_SSL_BAD_FILE) + return WOLF_SSL_BAD_FILE; - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #endif /* defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) */ @@ -4354,7 +4356,7 @@ static int wolfssl_decrypt_buffer_key(DerBuffer* der, byte* password, static int wolfssl_encrypt_buffer_key(byte* der, word32 derSz, byte* password, int passwordSz, EncryptedInfo* info) { - int ret = SSL_BAD_FILE; + int ret = WOLF_SSL_BAD_FILE; #ifdef WOLFSSL_SMALL_STACK byte* key = NULL; @@ -4370,7 +4372,7 @@ static int wolfssl_encrypt_buffer_key(byte* der, word32 derSz, byte* password, if (der == NULL || password == NULL || info == NULL || info->ivSz == 0) { WOLFSSL_MSG("bad arguments"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #ifndef NO_MD5 @@ -4379,7 +4381,7 @@ static int wolfssl_encrypt_buffer_key(byte* der, word32 derSz, byte* password, key = (byte*)XMALLOC(AES_256_KEY_SIZE, NULL, DYNAMIC_TYPE_SYMETRIC_KEY); if (key == NULL) { WOLFSSL_MSG("memory failure"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #endif /* WOLFSSL_SMALL_STACK */ @@ -4389,13 +4391,13 @@ static int wolfssl_encrypt_buffer_key(byte* der, word32 derSz, byte* password, #ifdef WOLFSSL_SMALL_STACK XFREE(key, NULL, DYNAMIC_TYPE_SYMETRIC_KEY); #endif - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #endif /* NO_MD5 */ if (ret > 0) { - ret = SSL_BAD_FILE; /* Reset error return */ + ret = WOLF_SSL_BAD_FILE; /* Reset error return */ #ifndef NO_DES3 if (XSTRNCMP(info->name, EVP_DES_CBC, EVP_DES_SIZE) == 0) ret = wc_Des_CbcEncryptWithKey(der, der, derSz, key, info->iv); @@ -4420,11 +4422,11 @@ static int wolfssl_encrypt_buffer_key(byte* der, word32 derSz, byte* password, #endif if (ret == MP_OKAY) - return SSL_SUCCESS; - else if (ret == SSL_BAD_FILE) - return SSL_BAD_FILE; + return WOLF_SSL_SUCCESS; + else if (ret == WOLF_SSL_BAD_FILE) + return WOLF_SSL_BAD_FILE; - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #endif /* defined(WOLFSSL_KEY_GEN) */ @@ -4505,7 +4507,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type, headerEnd += XSTRLEN(header); if ((headerEnd + 1) >= bufferEnd) - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; /* eat end of line */ if (headerEnd[0] == '\n') @@ -4515,7 +4517,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type, else { if (info) info->consumed = (long)(headerEnd+2 - (char*)buff); - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } if (type == PRIVATEKEY_TYPE) { @@ -4539,7 +4541,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type, char* newline; if (line >= bufferEnd) { - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } lineSz = (word32)(bufferEnd - line); @@ -4549,11 +4551,11 @@ int PemToDer(const unsigned char* buff, long longSz, int type, start = XSTRNSTR(line, "AES", min(lineSz, PEM_LINE_LEN)); } - if (start == NULL) return SSL_BAD_FILE; - if (info == NULL) return SSL_BAD_FILE; + if (start == NULL) return WOLF_SSL_BAD_FILE; + if (info == NULL) return WOLF_SSL_BAD_FILE; if (start >= bufferEnd) { - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } startSz = (word32)(bufferEnd - start); @@ -4561,7 +4563,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type, if ((start != NULL) && (finish != NULL) && (start < finish)) { if (finish >= bufferEnd) { - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } finishSz = (word32)(bufferEnd - finish); @@ -4570,12 +4572,12 @@ int PemToDer(const unsigned char* buff, long longSz, int type, if (NAME_SZ < (finish - start)) /* buffer size of info->name*/ return BUFFER_E; if (XMEMCPY(info->name, start, finish - start) == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; info->name[finish - start] = 0; if (finishSz < sizeof(info->iv) + 1) return BUFFER_E; if (XMEMCPY(info->iv, finish + 1, sizeof(info->iv)) == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; if (newline == NULL) newline = XSTRNSTR(finish, "\n", min(finishSz, @@ -4585,10 +4587,10 @@ int PemToDer(const unsigned char* buff, long longSz, int type, info->set = 1; } else - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } else - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; /* eat blank line */ while (*newline == '\r' || *newline == '\n') @@ -4605,7 +4607,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type, if (!footerEnd) { if (info) info->consumed = longSz; /* No more certs if no footer */ - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } consumedEnd = footerEnd + XSTRLEN(footer); @@ -4619,7 +4621,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type, else { if (info) info->consumed = (long)(consumedEnd+2 - (char*)buff); - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } } @@ -4629,7 +4631,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type, /* set up der buffer */ neededSz = (long)(footerEnd - headerEnd); if (neededSz > sz || neededSz <= 0) - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; ret = AllocDer(pDer, (word32)neededSz, type, heap); if (ret < 0) { @@ -4639,7 +4641,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type, if (Base64_Decode((byte*)headerEnd, (word32)neededSz, der->buffer, &der->length) < 0) - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; if (header == BEGIN_PRIV_KEY && !encrypted_key) { /* pkcs8 key, convert and adjust length */ @@ -4660,7 +4662,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type, #endif if (!info || !info->ctx || !info->ctx->passwd_cb) - return SSL_BAD_FILE; /* no callback error */ + return WOLF_SSL_BAD_FILE; /* no callback error */ #ifdef WOLFSSL_SMALL_STACK password = (char*)XMALLOC(80, heap, DYNAMIC_TYPE_STRING); @@ -4689,7 +4691,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type, #ifdef WOLFSSL_SMALL_STACK XFREE(password, heap, DYNAMIC_TYPE_STRING); #endif - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { return ret; } } @@ -4744,13 +4746,13 @@ static int ProcessUserChain(WOLFSSL_CTX* ctx, const unsigned char* buff, word32 remain = (word32)(sz - consumed); info->consumed = 0; - if (format == SSL_FILETYPE_PEM) { + if (format == WOLF_SSL_FILETYPE_PEM) { ret = PemToDer(buff + consumed, remain, type, &part, heap, info, &eccKey); } else { int length = remain; - if (format == SSL_FILETYPE_ASN1) { + if (format == WOLF_SSL_FILETYPE_ASN1) { /* get length of der (read sequence) */ word32 inOutIdx = 0; if (GetSequence(buff + consumed, &inOutIdx, &length, remain) < 0) { @@ -4862,9 +4864,9 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, *used = sz; /* used bytes default to sz, PEM chain may shorten*/ /* check args */ - if (format != SSL_FILETYPE_ASN1 && format != SSL_FILETYPE_PEM - && format != SSL_FILETYPE_RAW) - return SSL_BAD_FILETYPE; + if (format != WOLF_SSL_FILETYPE_ASN1 && format != WOLF_SSL_FILETYPE_PEM + && format != WOLF_SSL_FILETYPE_RAW) + return WOLF_SSL_BAD_FILETYPE; if (ctx == NULL && ssl == NULL) return BAD_FUNC_ARG; @@ -4881,12 +4883,12 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, info->ctx = ctx; info->consumed = 0; - if (format == SSL_FILETYPE_PEM) { + if (format == WOLF_SSL_FILETYPE_PEM) { ret = PemToDer(buff, sz, type, &der, heap, info, &eccKey); } else { /* ASN1 (DER) or RAW (NTRU) */ int length = (int)sz; - if (format == SSL_FILETYPE_ASN1) { + if (format == WOLF_SSL_FILETYPE_ASN1) { /* get length of der (read sequence) */ word32 inOutIdx = 0; if (GetSequence(buff, &inOutIdx, &length, (word32)sz) < 0) { @@ -4924,8 +4926,8 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, } #if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) - /* for SSL_FILETYPE_PEM, PemToDer manage the decryption if required */ - if (info->set && (format != SSL_FILETYPE_PEM)) { + /* for WOLF_SSL_FILETYPE_PEM, PemToDer manage the decryption if required */ + if (info->set && (format != WOLF_SSL_FILETYPE_PEM)) { /* decrypt */ int passwordSz; #ifdef WOLFSSL_SMALL_STACK @@ -4956,7 +4958,7 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, XFREE(password, heap, DYNAMIC_TYPE_STRING); #endif - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { #ifdef WOLFSSL_SMALL_STACK XFREE(info, heap, DYNAMIC_TYPE_ENCRYPTEDINFO); #endif @@ -5040,10 +5042,10 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, } else { FreeDer(&der); - return SSL_BAD_CERTTYPE; + return WOLF_SSL_BAD_CERTTYPE; } - if (type == PRIVATEKEY_TYPE && format != SSL_FILETYPE_RAW) { + if (type == PRIVATEKEY_TYPE && format != WOLF_SSL_FILETYPE_RAW) { #ifndef NO_RSA if (!eccKey && !ed25519Key) { /* make sure RSA key can be used */ @@ -5069,7 +5071,7 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, eccKey = 1; /* so try it out */ #else WOLFSSL_MSG("RSA decode failed and ECC not enabled to try"); - ret = SSL_BAD_FILE; + ret = WOLF_SSL_BAD_FILE; #endif } else { /* check that the size of the RSA key is enough */ @@ -5176,7 +5178,7 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, if (wc_Ed25519PrivateKeyDecode(der->buffer, &idx, &key, der->length) != 0) { wc_ed25519_free(&key); - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } /* check for minimum key size and then free */ @@ -5207,7 +5209,7 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, #endif if (!rsaKey && !eccKey && !ed25519Key) - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; (void)ed25519Key; } @@ -5234,7 +5236,7 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, #ifdef WOLFSSL_SMALL_STACK XFREE(cert, heap, DYNAMIC_TYPE_DCERT); #endif - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } if (ssl && ssl->options.side == WOLFSSL_SERVER_END) { @@ -5393,7 +5395,7 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, ssl->options.haveStaticECC, ssl->options.side); } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -5423,7 +5425,7 @@ static int ProcessChainBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, NULL) == 0) { WOLFSSL_MSG(" Proccessed a CRL"); wolfSSL_CertManagerLoadCRLBuffer(ctx->cm, der->buffer, - der->length, SSL_FILETYPE_ASN1); + der->length, WOLF_SSL_FILETYPE_ASN1); FreeDer(&der); used += info.consumed; continue; @@ -5452,7 +5454,7 @@ static int ProcessChainBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, if(gotOne) { WOLFSSL_MSG("Processed at least one valid CA. Other stuff OK"); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } return ret; } @@ -5482,7 +5484,7 @@ static INLINE WOLFSSL_METHOD* cm_pick_method(void) int wolfSSL_CertManagerLoadCABuffer(WOLFSSL_CERT_MANAGER* cm, const unsigned char* in, long sz, int format) { - int ret = SSL_FATAL_ERROR; + int ret = WOLF_SSL_FATAL_ERROR; WOLFSSL_CTX* tmp; WOLFSSL_ENTER("wolfSSL_CertManagerLoadCABuffer"); @@ -5521,9 +5523,9 @@ int wolfSSL_CertManagerLoadCRLBuffer(WOLFSSL_CERT_MANAGER* cm, return BAD_FUNC_ARG; if (cm->crl == NULL) { - if (wolfSSL_CertManagerEnableCRL(cm, 0) != SSL_SUCCESS) { + if (wolfSSL_CertManagerEnableCRL(cm, 0) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("Enable CRL failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } @@ -5560,7 +5562,7 @@ int wolfSSL_LoadCRLBuffer(WOLFSSL* ssl, const unsigned char* buff, /* turn on CRL if off and compiled in, set options */ int wolfSSL_CertManagerEnableCRL(WOLFSSL_CERT_MANAGER* cm, int options) { - int ret = SSL_SUCCESS; + int ret = WOLF_SSL_SUCCESS; (void)options; @@ -5579,7 +5581,7 @@ int wolfSSL_CertManagerEnableCRL(WOLFSSL_CERT_MANAGER* cm, int options) WOLFSSL_MSG("Init CRL failed"); FreeCRL(cm->crl, 1); cm->crl = NULL; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #ifdef HAVE_CRL_IO @@ -5606,9 +5608,9 @@ int wolfSSL_CertManagerDisableCRL(WOLFSSL_CERT_MANAGER* cm) cm->crlEnabled = 0; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } -/* Verify the certificate, SSL_SUCCESS for ok, < 0 for error */ +/* Verify the certificate, WOLF_SSL_SUCCESS for ok, < 0 for error */ int wolfSSL_CertManagerVerifyBuffer(WOLFSSL_CERT_MANAGER* cm, const byte* buff, long sz, int format) { @@ -5629,7 +5631,7 @@ int wolfSSL_CertManagerVerifyBuffer(WOLFSSL_CERT_MANAGER* cm, const byte* buff, return MEMORY_E; #endif - if (format == SSL_FILETYPE_PEM) { + if (format == WOLF_SSL_FILETYPE_PEM) { int eccKey = 0; /* not used */ #ifdef WOLFSSL_SMALL_STACK EncryptedInfo* info = NULL; @@ -5682,14 +5684,14 @@ int wolfSSL_CertManagerVerifyBuffer(WOLFSSL_CERT_MANAGER* cm, const byte* buff, XFREE(cert, cm->heap, DYNAMIC_TYPE_DCERT); #endif - return ret == 0 ? SSL_SUCCESS : ret; + return ret == 0 ? WOLF_SSL_SUCCESS : ret; } /* turn on OCSP if off and compiled in, set options */ int wolfSSL_CertManagerEnableOCSP(WOLFSSL_CERT_MANAGER* cm, int options) { - int ret = SSL_SUCCESS; + int ret = WOLF_SSL_SUCCESS; (void)options; @@ -5708,7 +5710,7 @@ int wolfSSL_CertManagerEnableOCSP(WOLFSSL_CERT_MANAGER* cm, int options) WOLFSSL_MSG("Init OCSP failed"); FreeOCSP(cm->ocsp, 1); cm->ocsp = NULL; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } cm->ocspEnabled = 1; @@ -5741,13 +5743,13 @@ int wolfSSL_CertManagerDisableOCSP(WOLFSSL_CERT_MANAGER* cm) cm->ocspEnabled = 0; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* turn on OCSP Stapling if off and compiled in, set options */ int wolfSSL_CertManagerEnableOCSPStapling(WOLFSSL_CERT_MANAGER* cm) { - int ret = SSL_SUCCESS; + int ret = WOLF_SSL_SUCCESS; WOLFSSL_ENTER("wolfSSL_CertManagerEnableOCSPStapling"); if (cm == NULL) @@ -5765,7 +5767,7 @@ int wolfSSL_CertManagerEnableOCSPStapling(WOLFSSL_CERT_MANAGER* cm) WOLFSSL_MSG("Init OCSP failed"); FreeOCSP(cm->ocsp_stapling, 1); cm->ocsp_stapling = NULL; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } cm->ocspStaplingEnabled = 1; @@ -5786,7 +5788,7 @@ int wolfSSL_CertManagerEnableOCSPStapling(WOLFSSL_CERT_MANAGER* cm) #ifdef HAVE_OCSP -/* check CRL if enabled, SSL_SUCCESS */ +/* check CRL if enabled, WOLF_SSL_SUCCESS */ int wolfSSL_CertManagerCheckOCSP(WOLFSSL_CERT_MANAGER* cm, byte* der, int sz) { int ret; @@ -5802,7 +5804,7 @@ int wolfSSL_CertManagerCheckOCSP(WOLFSSL_CERT_MANAGER* cm, byte* der, int sz) return BAD_FUNC_ARG; if (cm->ocspEnabled == 0) - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; #ifdef WOLFSSL_SMALL_STACK cert = (DecodedCert*)XMALLOC(sizeof(DecodedCert), NULL, DYNAMIC_TYPE_DCERT); @@ -5824,7 +5826,7 @@ int wolfSSL_CertManagerCheckOCSP(WOLFSSL_CERT_MANAGER* cm, byte* der, int sz) XFREE(cert, NULL, DYNAMIC_TYPE_DCERT); #endif - return ret == 0 ? SSL_SUCCESS : ret; + return ret == 0 ? WOLF_SSL_SUCCESS : ret; } @@ -5848,7 +5850,7 @@ int wolfSSL_CertManagerSetOCSPOverrideURL(WOLFSSL_CERT_MANAGER* cm, else cm->ocspOverrideURL = NULL; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -5863,7 +5865,7 @@ int wolfSSL_CertManagerSetOCSP_Cb(WOLFSSL_CERT_MANAGER* cm, cm->ocspRespFreeCb = respFreeCb; cm->ocspIOCtx = ioCbCtx; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -5987,10 +5989,10 @@ int ProcessFile(WOLFSSL_CTX* ctx, const char* fname, int format, int type, (void)crl; (void)heapHint; - if (fname == NULL) return SSL_BAD_FILE; + if (fname == NULL) return WOLF_SSL_BAD_FILE; file = XFOPEN(fname, "rb"); - if (file == XBADFILE) return SSL_BAD_FILE; + if (file == XBADFILE) return WOLF_SSL_BAD_FILE; XFSEEK(file, 0, XSEEK_END); sz = XFTELL(file); XREWIND(file); @@ -6000,20 +6002,20 @@ int ProcessFile(WOLFSSL_CTX* ctx, const char* fname, int format, int type, myBuffer = (byte*)XMALLOC(sz, heapHint, DYNAMIC_TYPE_FILE); if (myBuffer == NULL) { XFCLOSE(file); - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } dynamic = 1; } else if (sz <= 0) { XFCLOSE(file); - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } if ( (ret = (int)XFREAD(myBuffer, 1, sz, file)) != sz) - ret = SSL_BAD_FILE; + ret = WOLF_SSL_BAD_FILE; else { if ((type == CA_TYPE || type == TRUSTED_PEER_TYPE) - && format == SSL_FILETYPE_PEM) + && format == WOLF_SSL_FILETYPE_PEM) ret = ProcessChainBuffer(ctx, myBuffer, sz, format, type, ssl); #ifdef HAVE_CRL else if (type == CRL_TYPE) @@ -6036,7 +6038,7 @@ int ProcessFile(WOLFSSL_CTX* ctx, const char* fname, int format, int type, int wolfSSL_CTX_load_verify_locations(WOLFSSL_CTX* ctx, const char* file, const char* path) { - int ret = SSL_SUCCESS; + int ret = WOLF_SSL_SUCCESS; #ifndef NO_WOLFSSL_DIR int fileRet; #endif @@ -6044,12 +6046,12 @@ int wolfSSL_CTX_load_verify_locations(WOLFSSL_CTX* ctx, const char* file, WOLFSSL_ENTER("wolfSSL_CTX_load_verify_locations"); if (ctx == NULL || (file == NULL && path == NULL) ) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; if (file) - ret = ProcessFile(ctx, file, SSL_FILETYPE_PEM, CA_TYPE, NULL, 0, NULL); + ret = ProcessFile(ctx, file, WOLF_SSL_FILETYPE_PEM, CA_TYPE, NULL, 0, NULL); - if (ret == SSL_SUCCESS && path) { + if (ret == WOLF_SSL_SUCCESS && path) { #ifndef NO_WOLFSSL_DIR char* name = NULL; #ifdef WOLFSSL_SMALL_STACK @@ -6065,16 +6067,16 @@ int wolfSSL_CTX_load_verify_locations(WOLFSSL_CTX* ctx, const char* file, /* try to load each regular file in path */ fileRet = wc_ReadDirFirst(readCtx, path, &name); while (fileRet == 0 && name) { - ret = ProcessFile(ctx, name, SSL_FILETYPE_PEM, CA_TYPE, + ret = ProcessFile(ctx, name, WOLF_SSL_FILETYPE_PEM, CA_TYPE, NULL, 0, NULL); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) break; fileRet = wc_ReadDirNext(readCtx, path, &name); } wc_ReadDirClose(readCtx); /* pass directory read failure to response code */ - if (ret == SSL_SUCCESS && fileRet != -1) { + if (ret == WOLF_SSL_SUCCESS && fileRet != -1) { ret = fileRet; } @@ -6101,7 +6103,7 @@ int wolfSSL_CTX_trust_peer_cert(WOLFSSL_CTX* ctx, const char* file, int type) WOLFSSL_ENTER("wolfSSL_CTX_trust_peer_cert"); if (ctx == NULL || file == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } return ProcessFile(ctx, file, type, TRUSTED_PEER_TYPE, NULL, 0, NULL); @@ -6109,11 +6111,11 @@ int wolfSSL_CTX_trust_peer_cert(WOLFSSL_CTX* ctx, const char* file, int type) #endif /* WOLFSSL_TRUST_PEER_CERT */ -/* Verify the certificate, SSL_SUCCESS for ok, < 0 for error */ +/* Verify the certificate, WOLF_SSL_SUCCESS for ok, < 0 for error */ int wolfSSL_CertManagerVerify(WOLFSSL_CERT_MANAGER* cm, const char* fname, int format) { - int ret = SSL_FATAL_ERROR; + int ret = WOLF_SSL_FATAL_ERROR; #ifdef WOLFSSL_SMALL_STACK byte staticBuffer[1]; /* force heap usage */ #else @@ -6126,7 +6128,7 @@ int wolfSSL_CertManagerVerify(WOLFSSL_CERT_MANAGER* cm, const char* fname, WOLFSSL_ENTER("wolfSSL_CertManagerVerify"); - if (file == XBADFILE) return SSL_BAD_FILE; + if (file == XBADFILE) return WOLF_SSL_BAD_FILE; XFSEEK(file, 0, XSEEK_END); sz = XFTELL(file); XREWIND(file); @@ -6134,7 +6136,7 @@ int wolfSSL_CertManagerVerify(WOLFSSL_CERT_MANAGER* cm, const char* fname, if (sz > MAX_WOLFSSL_FILE_SIZE || sz <= 0) { WOLFSSL_MSG("CertManagerVerify file bad size"); XFCLOSE(file); - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } if (sz > (long)sizeof(staticBuffer)) { @@ -6142,13 +6144,13 @@ int wolfSSL_CertManagerVerify(WOLFSSL_CERT_MANAGER* cm, const char* fname, myBuffer = (byte*) XMALLOC(sz, cm->heap, DYNAMIC_TYPE_FILE); if (myBuffer == NULL) { XFCLOSE(file); - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } dynamic = 1; } if ( (ret = (int)XFREAD(myBuffer, 1, sz, file)) != sz) - ret = SSL_BAD_FILE; + ret = WOLF_SSL_BAD_FILE; else ret = wolfSSL_CertManagerVerifyBuffer(cm, myBuffer, sz, format); @@ -6164,7 +6166,7 @@ int wolfSSL_CertManagerVerify(WOLFSSL_CERT_MANAGER* cm, const char* fname, int wolfSSL_CertManagerLoadCA(WOLFSSL_CERT_MANAGER* cm, const char* file, const char* path) { - int ret = SSL_FATAL_ERROR; + int ret = WOLF_SSL_FATAL_ERROR; WOLFSSL_CTX* tmp; WOLFSSL_ENTER("wolfSSL_CertManagerLoadCA"); @@ -6201,14 +6203,14 @@ int wolfSSL_CTX_check_private_key(WOLFSSL_CTX* ctx) /* TODO: check private against public for RSA match */ (void)ctx; WOLFSSL_ENTER("SSL_CTX_check_private_key"); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #ifdef HAVE_CRL -/* check CRL if enabled, SSL_SUCCESS */ +/* check CRL if enabled, WOLF_SSL_SUCCESS */ int wolfSSL_CertManagerCheckCRL(WOLFSSL_CERT_MANAGER* cm, byte* der, int sz) { int ret = 0; @@ -6224,7 +6226,7 @@ int wolfSSL_CertManagerCheckCRL(WOLFSSL_CERT_MANAGER* cm, byte* der, int sz) return BAD_FUNC_ARG; if (cm->crlEnabled == 0) - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; #ifdef WOLFSSL_SMALL_STACK cert = (DecodedCert*)XMALLOC(sizeof(DecodedCert), NULL, DYNAMIC_TYPE_DCERT); @@ -6246,7 +6248,7 @@ int wolfSSL_CertManagerCheckCRL(WOLFSSL_CERT_MANAGER* cm, byte* der, int sz) XFREE(cert, NULL, DYNAMIC_TYPE_DCERT); #endif - return ret == 0 ? SSL_SUCCESS : ret; + return ret == 0 ? WOLF_SSL_SUCCESS : ret; } @@ -6258,7 +6260,7 @@ int wolfSSL_CertManagerSetCRL_Cb(WOLFSSL_CERT_MANAGER* cm, CbMissingCRL cb) cm->cbMissingCRL = cb; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #ifdef HAVE_CRL_IO @@ -6269,7 +6271,7 @@ int wolfSSL_CertManagerSetCRL_IOCb(WOLFSSL_CERT_MANAGER* cm, CbCrlIO cb) cm->crl->crlIOCb = cb; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif @@ -6281,9 +6283,9 @@ int wolfSSL_CertManagerLoadCRL(WOLFSSL_CERT_MANAGER* cm, const char* path, return BAD_FUNC_ARG; if (cm->crl == NULL) { - if (wolfSSL_CertManagerEnableCRL(cm, 0) != SSL_SUCCESS) { + if (wolfSSL_CertManagerEnableCRL(cm, 0) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("Enable CRL failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } @@ -6404,12 +6406,12 @@ int wolfSSL_CTX_der_load_verify_locations(WOLFSSL_CTX* ctx, const char* file, { WOLFSSL_ENTER("wolfSSL_CTX_der_load_verify_locations"); if (ctx == NULL || file == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; - if (ProcessFile(ctx, file, format, CA_TYPE, NULL, 0, NULL) == SSL_SUCCESS) - return SSL_SUCCESS; + if (ProcessFile(ctx, file, format, CA_TYPE, NULL, 0, NULL) == WOLF_SSL_SUCCESS) + return WOLF_SSL_SUCCESS; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #endif /* WOLFSSL_DER_LOAD */ @@ -6438,7 +6440,7 @@ int wolfSSL_PemCertToDer(const char* fileName, unsigned char* derBuf, int derSz) WOLFSSL_ENTER("wolfSSL_PemCertToDer"); if (file == XBADFILE) { - ret = SSL_BAD_FILE; + ret = WOLF_SSL_BAD_FILE; } else { XFSEEK(file, 0, XSEEK_END); @@ -6446,7 +6448,7 @@ int wolfSSL_PemCertToDer(const char* fileName, unsigned char* derBuf, int derSz) XREWIND(file); if (sz <= 0) { - ret = SSL_BAD_FILE; + ret = WOLF_SSL_BAD_FILE; } else if (sz > (long)sizeof(staticBuffer)) { #ifdef WOLFSSL_STATIC_MEMORY @@ -6462,7 +6464,7 @@ int wolfSSL_PemCertToDer(const char* fileName, unsigned char* derBuf, int derSz) if (ret == 0) { if ( (ret = (int)XFREAD(fileBuf, 1, sz, file)) != sz) { - ret = SSL_BAD_FILE; + ret = WOLF_SSL_BAD_FILE; } else { #ifdef WOLFSSL_SMALL_STACK @@ -6524,7 +6526,7 @@ int wolfSSL_PemPubKeyToDer(const char* fileName, WOLFSSL_ENTER("wolfSSL_PemPubKeyToDer"); if (file == XBADFILE) { - ret = SSL_BAD_FILE; + ret = WOLF_SSL_BAD_FILE; } else { XFSEEK(file, 0, XSEEK_END); @@ -6532,7 +6534,7 @@ int wolfSSL_PemPubKeyToDer(const char* fileName, XREWIND(file); if (sz <= 0) { - ret = SSL_BAD_FILE; + ret = WOLF_SSL_BAD_FILE; } else if (sz > (long)sizeof(staticBuffer)) { #ifdef WOLFSSL_STATIC_MEMORY @@ -6547,7 +6549,7 @@ int wolfSSL_PemPubKeyToDer(const char* fileName, } if (ret == 0) { if ( (ret = (int)XFREAD(fileBuf, 1, sz, file)) != sz) - ret = SSL_BAD_FILE; + ret = WOLF_SSL_BAD_FILE; else ret = PemToDer(fileBuf, sz, PUBLICKEY_TYPE, &converted, 0, NULL, NULL); @@ -6612,10 +6614,10 @@ int wolfSSL_CTX_use_certificate_file(WOLFSSL_CTX* ctx, const char* file, int format) { WOLFSSL_ENTER("wolfSSL_CTX_use_certificate_file"); - if (ProcessFile(ctx, file, format, CERT_TYPE, NULL, 0, NULL) == SSL_SUCCESS) - return SSL_SUCCESS; + if (ProcessFile(ctx, file, format, CERT_TYPE, NULL, 0, NULL) == WOLF_SSL_SUCCESS) + return WOLF_SSL_SUCCESS; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -6624,10 +6626,10 @@ int wolfSSL_CTX_use_PrivateKey_file(WOLFSSL_CTX* ctx, const char* file, { WOLFSSL_ENTER("wolfSSL_CTX_use_PrivateKey_file"); if (ProcessFile(ctx, file, format, PRIVATEKEY_TYPE, NULL, 0, NULL) - == SSL_SUCCESS) - return SSL_SUCCESS; + == WOLF_SSL_SUCCESS) + return WOLF_SSL_SUCCESS; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -6663,11 +6665,11 @@ int wolfSSL_CTX_use_certificate_chain_file(WOLFSSL_CTX* ctx, const char* file) { /* process up to MAX_CHAIN_DEPTH plus subject cert */ WOLFSSL_ENTER("wolfSSL_CTX_use_certificate_chain_file"); - if (ProcessFile(ctx, file, SSL_FILETYPE_PEM,CERT_TYPE,NULL,1, NULL) - == SSL_SUCCESS) - return SSL_SUCCESS; + if (ProcessFile(ctx, file, WOLF_SSL_FILETYPE_PEM,CERT_TYPE,NULL,1, NULL) + == WOLF_SSL_SUCCESS) + return WOLF_SSL_SUCCESS; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -6692,7 +6694,7 @@ static int wolfSSL_SetTmpDH_file_wrapper(WOLFSSL_CTX* ctx, WOLFSSL* ssl, return BAD_FUNC_ARG; file = XFOPEN(fname, "rb"); - if (file == XBADFILE) return SSL_BAD_FILE; + if (file == XBADFILE) return WOLF_SSL_BAD_FILE; XFSEEK(file, 0, XSEEK_END); sz = XFTELL(file); XREWIND(file); @@ -6702,17 +6704,17 @@ static int wolfSSL_SetTmpDH_file_wrapper(WOLFSSL_CTX* ctx, WOLFSSL* ssl, myBuffer = (byte*) XMALLOC(sz, ctx->heap, DYNAMIC_TYPE_FILE); if (myBuffer == NULL) { XFCLOSE(file); - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } dynamic = 1; } else if (sz <= 0) { XFCLOSE(file); - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } if ( (ret = (int)XFREAD(myBuffer, 1, sz, file)) != sz) - ret = SSL_BAD_FILE; + ret = WOLF_SSL_BAD_FILE; else { if (ssl) ret = wolfSSL_SetTmpDH_buffer(ssl, myBuffer, sz, format); @@ -6792,7 +6794,7 @@ long wolfSSL_ctrl(WOLFSSL* ssl, int cmd, long opt, void* pt) (void)cmd; (void)opt; (void)pt; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -6803,7 +6805,7 @@ long wolfSSL_CTX_ctrl(WOLFSSL_CTX* ctx, int cmd, long opt, void* pt) (void)cmd; (void)opt; (void)pt; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #ifndef NO_CERTS @@ -6815,7 +6817,7 @@ int wolfSSL_check_private_key(const WOLFSSL* ssl) int ret; if (ssl == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } size = ssl->buffers.certificate->length; @@ -6823,7 +6825,7 @@ int wolfSSL_check_private_key(const WOLFSSL* ssl) InitDecodedCert(&der, buff, size, ssl->heap); if (ParseCertRelative(&der, CERT_TYPE, NO_VERIFY, NULL) != 0) { FreeDecodedCert(&der); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } size = ssl->buffers.key->length; @@ -6864,12 +6866,12 @@ void* wolfSSL_X509_get_ext_d2i(const WOLFSSL_X509* x509, *c = -1; /* default to not found */ } - sk = (STACK_OF(WOLFSSL_ASN1_OBJECT)*)XMALLOC( - sizeof(STACK_OF(WOLFSSL_ASN1_OBJECT)), NULL, DYNAMIC_TYPE_ASN1); + sk = (WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)*)XMALLOC( + sizeof(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)), NULL, DYNAMIC_TYPE_ASN1); if (sk == NULL) { return NULL; } - XMEMSET(sk, 0, sizeof(STACK_OF(WOLFSSL_ASN1_OBJECT))); + XMEMSET(sk, 0, sizeof(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT))); switch (nid) { case BASIC_CA_OID: @@ -6909,7 +6911,7 @@ void* wolfSSL_X509_get_ext_d2i(const WOLFSSL_X509* x509, /* last dns in list add at end of function */ if (dns != NULL) { if (wolfSSL_sk_ASN1_OBJECT_push(sk, obj) != - SSL_SUCCESS) { + WOLF_SSL_SUCCESS) { WOLFSSL_MSG("Error pushing ASN1 object onto stack"); wolfSSL_ASN1_OBJECT_free(obj); wolfSSL_sk_ASN1_OBJECT_free(sk); @@ -7005,7 +7007,7 @@ void* wolfSSL_X509_get_ext_d2i(const WOLFSSL_X509* x509, obj->obj = (byte*)(x509->certPolicies[i]); obj->objSz = MAX_CERTPOL_SZ; if (wolfSSL_sk_ASN1_OBJECT_push(sk, obj) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("Error pushing ASN1 object onto stack"); wolfSSL_ASN1_OBJECT_free(obj); wolfSSL_sk_ASN1_OBJECT_free(sk); @@ -7111,7 +7113,7 @@ void* wolfSSL_X509_get_ext_d2i(const WOLFSSL_X509* x509, } if (obj != NULL) { - if (wolfSSL_sk_ASN1_OBJECT_push(sk, obj) != SSL_SUCCESS) { + if (wolfSSL_sk_ASN1_OBJECT_push(sk, obj) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("Error pushing ASN1 object onto stack"); wolfSSL_ASN1_OBJECT_free(obj); wolfSSL_sk_ASN1_OBJECT_free(sk); @@ -7139,7 +7141,7 @@ static int wolfSSL_EVP_Digest(unsigned char* in, int inSz, unsigned char* out, if (XSTRLEN(evp) < 3) { /* do not try comparing strings if size is too small */ - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (XSTRNCMP("SHA", evp, 3) == 0) { @@ -7174,16 +7176,16 @@ static int wolfSSL_EVP_Digest(unsigned char* in, int inSz, unsigned char* out, hashSz = wc_HashGetDigestSize(hash); if (hashSz < 0) { WOLFSSL_LEAVE("wolfSSL_EVP_Digest", hashSz); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } *outSz = hashSz; (void)eng; if (wc_Hash(hash, in, inSz, out, *outSz) == 0) { - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } else { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } @@ -7194,7 +7196,7 @@ int wolfSSL_X509_digest(const WOLFSSL_X509* x509, const WOLFSSL_EVP_MD* digest, WOLFSSL_ENTER("wolfSSL_X509_digest"); if (x509 == NULL || digest == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } return wolfSSL_EVP_Digest(x509->derCert->buffer, x509->derCert->length, buf, @@ -7206,11 +7208,11 @@ int wolfSSL_use_PrivateKey(WOLFSSL* ssl, WOLFSSL_EVP_PKEY* pkey) { WOLFSSL_ENTER("wolfSSL_use_PrivateKey"); if (ssl == NULL || pkey == NULL ) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } return wolfSSL_use_PrivateKey_buffer(ssl, (unsigned char*)pkey->pkey.ptr, - pkey->pkey_sz, SSL_FILETYPE_ASN1); + pkey->pkey_sz, WOLF_SSL_FILETYPE_ASN1); } @@ -7219,11 +7221,11 @@ int wolfSSL_use_PrivateKey_ASN1(int pri, WOLFSSL* ssl, unsigned char* der, { WOLFSSL_ENTER("wolfSSL_use_PrivateKey_ASN1"); if (ssl == NULL || der == NULL ) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } (void)pri; /* type of private key */ - return wolfSSL_use_PrivateKey_buffer(ssl, der, derSz, SSL_FILETYPE_ASN1); + return wolfSSL_use_PrivateKey_buffer(ssl, der, derSz, WOLF_SSL_FILETYPE_ASN1); } @@ -7232,10 +7234,10 @@ int wolfSSL_use_RSAPrivateKey_ASN1(WOLFSSL* ssl, unsigned char* der, long derSz) { WOLFSSL_ENTER("wolfSSL_use_RSAPrivateKey_ASN1"); if (ssl == NULL || der == NULL ) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return wolfSSL_use_PrivateKey_buffer(ssl, der, derSz, SSL_FILETYPE_ASN1); + return wolfSSL_use_PrivateKey_buffer(ssl, der, derSz, WOLF_SSL_FILETYPE_ASN1); } #endif @@ -7245,13 +7247,13 @@ int wolfSSL_use_certificate_ASN1(WOLFSSL* ssl, unsigned char* der, int derSz) WOLFSSL_ENTER("wolfSSL_use_certificate_ASN1"); if (der != NULL && ssl != NULL) { - if (ProcessBuffer(NULL, der, derSz, SSL_FILETYPE_ASN1, CERT_TYPE, ssl, - &idx, 0) == SSL_SUCCESS) - return SSL_SUCCESS; + if (ProcessBuffer(NULL, der, derSz, WOLF_SSL_FILETYPE_ASN1, CERT_TYPE, ssl, + &idx, 0) == WOLF_SSL_SUCCESS) + return WOLF_SSL_SUCCESS; } (void)idx; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -7262,12 +7264,12 @@ int wolfSSL_use_certificate(WOLFSSL* ssl, WOLFSSL_X509* x509) WOLFSSL_ENTER("wolfSSL_use_certificate"); if (x509 != NULL && ssl != NULL && x509->derCert != NULL) { if (ProcessBuffer(NULL, x509->derCert->buffer, x509->derCert->length, - SSL_FILETYPE_ASN1, CERT_TYPE, ssl, &idx, 0) == SSL_SUCCESS) - return SSL_SUCCESS; + WOLF_SSL_FILETYPE_ASN1, CERT_TYPE, ssl, &idx, 0) == WOLF_SSL_SUCCESS) + return WOLF_SSL_SUCCESS; } (void)idx; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #endif /* NO_CERTS */ @@ -7276,10 +7278,10 @@ int wolfSSL_use_certificate_file(WOLFSSL* ssl, const char* file, int format) { WOLFSSL_ENTER("wolfSSL_use_certificate_file"); if (ProcessFile(ssl->ctx, file, format, CERT_TYPE, - ssl, 0, NULL) == SSL_SUCCESS) - return SSL_SUCCESS; + ssl, 0, NULL) == WOLF_SSL_SUCCESS) + return WOLF_SSL_SUCCESS; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -7287,10 +7289,10 @@ int wolfSSL_use_PrivateKey_file(WOLFSSL* ssl, const char* file, int format) { WOLFSSL_ENTER("wolfSSL_use_PrivateKey_file"); if (ProcessFile(ssl->ctx, file, format, PRIVATEKEY_TYPE, - ssl, 0, NULL) == SSL_SUCCESS) - return SSL_SUCCESS; + ssl, 0, NULL) == WOLF_SSL_SUCCESS) + return WOLF_SSL_SUCCESS; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -7298,11 +7300,11 @@ int wolfSSL_use_certificate_chain_file(WOLFSSL* ssl, const char* file) { /* process up to MAX_CHAIN_DEPTH plus subject cert */ WOLFSSL_ENTER("wolfSSL_use_certificate_chain_file"); - if (ProcessFile(ssl->ctx, file, SSL_FILETYPE_PEM, CERT_TYPE, - ssl, 1, NULL) == SSL_SUCCESS) - return SSL_SUCCESS; + if (ProcessFile(ssl->ctx, file, WOLF_SSL_FILETYPE_PEM, CERT_TYPE, + ssl, 1, NULL) == WOLF_SSL_SUCCESS) + return WOLF_SSL_SUCCESS; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -7316,7 +7318,7 @@ int wolfSSL_CTX_SetTmpEC_DHE_Sz(WOLFSSL_CTX* ctx, word16 sz) ctx->eccTempKeySz = sz; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -7328,7 +7330,7 @@ int wolfSSL_SetTmpEC_DHE_Sz(WOLFSSL* ssl, word16 sz) ssl->eccTempKeySz = sz; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* HAVE_ECC */ @@ -7401,15 +7403,15 @@ int wolfSSL_CTX_use_NTRUPrivateKey_file(WOLFSSL_CTX* ctx, const char* file) { WOLFSSL_ENTER("wolfSSL_CTX_use_NTRUPrivateKey_file"); if (ctx == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; - if (ProcessFile(ctx, file, SSL_FILETYPE_RAW, PRIVATEKEY_TYPE, NULL, 0, NULL) - == SSL_SUCCESS) { + if (ProcessFile(ctx, file, WOLF_SSL_FILETYPE_RAW, PRIVATEKEY_TYPE, NULL, 0, NULL) + == WOLF_SSL_SUCCESS) { ctx->haveNTRU = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #endif /* HAVE_NTRU */ @@ -7421,20 +7423,20 @@ int wolfSSL_CTX_use_NTRUPrivateKey_file(WOLFSSL_CTX* ctx, const char* file) void wolfSSL_CTX_set_verify(WOLFSSL_CTX* ctx, int mode, VerifyCallback vc) { WOLFSSL_ENTER("wolfSSL_CTX_set_verify"); - if (mode & SSL_VERIFY_PEER) { + if (mode & WOLF_SSL_VERIFY_PEER) { ctx->verifyPeer = 1; ctx->verifyNone = 0; /* in case previously set */ } - if (mode == SSL_VERIFY_NONE) { + if (mode == WOLF_SSL_VERIFY_NONE) { ctx->verifyNone = 1; ctx->verifyPeer = 0; /* in case previously set */ } - if (mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT) + if (mode & WOLF_SSL_VERIFY_FAIL_IF_NO_PEER_CERT) ctx->failNoCert = 1; - if (mode & SSL_VERIFY_FAIL_EXCEPT_PSK) { + if (mode & WOLF_SSL_VERIFY_FAIL_EXCEPT_PSK) { ctx->failNoCert = 0; /* fail on all is set to fail on PSK */ ctx->failNoCertxPSK = 1; } @@ -7446,20 +7448,20 @@ void wolfSSL_CTX_set_verify(WOLFSSL_CTX* ctx, int mode, VerifyCallback vc) void wolfSSL_set_verify(WOLFSSL* ssl, int mode, VerifyCallback vc) { WOLFSSL_ENTER("wolfSSL_set_verify"); - if (mode & SSL_VERIFY_PEER) { + if (mode & WOLF_SSL_VERIFY_PEER) { ssl->options.verifyPeer = 1; ssl->options.verifyNone = 0; /* in case previously set */ } - if (mode == SSL_VERIFY_NONE) { + if (mode == WOLF_SSL_VERIFY_NONE) { ssl->options.verifyNone = 1; ssl->options.verifyPeer = 0; /* in case previously set */ } - if (mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT) + if (mode & WOLF_SSL_VERIFY_FAIL_IF_NO_PEER_CERT) ssl->options.failNoCert = 1; - if (mode & SSL_VERIFY_FAIL_EXCEPT_PSK) { + if (mode & WOLF_SSL_VERIFY_FAIL_EXCEPT_PSK) { ssl->options.failNoCert = 0; /* fail on all is set to fail on PSK */ ssl->options.failNoCertxPSK = 1; } @@ -7572,7 +7574,7 @@ int wolfSSL_set_session(WOLFSSL* ssl, WOLFSSL_SESSION* session) if (session) return SetSession(ssl, session); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -7580,7 +7582,7 @@ int wolfSSL_set_session(WOLFSSL* ssl, WOLFSSL_SESSION* session) /* Associate client session with serverID, find existing or store for saving if newSession flag on, don't reuse existing session - SSL_SUCCESS on ok */ + WOLF_SSL_SUCCESS on ok */ int wolfSSL_SetServerID(WOLFSSL* ssl, const byte* id, int len, int newSession) { WOLFSSL_SESSION* session = NULL; @@ -7593,7 +7595,7 @@ int wolfSSL_SetServerID(WOLFSSL* ssl, const byte* id, int len, int newSession) if (newSession == 0) { session = GetSessionClient(ssl, id, len); if (session) { - if (SetSession(ssl, session) != SSL_SUCCESS) { + if (SetSession(ssl, session) != WOLF_SSL_SUCCESS) { #ifdef HAVE_EXT_CACHE wolfSSL_SESSION_free(session); #endif @@ -7614,7 +7616,7 @@ int wolfSSL_SetServerID(WOLFSSL* ssl, const byte* id, int len, int newSession) wolfSSL_SESSION_free(session); #endif - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* NO_CLIENT_CACHE */ @@ -7696,9 +7698,9 @@ int wolfSSL_memsave_session_cache(void* mem, int sz) wc_UnLockMutex(&session_mutex); - WOLFSSL_LEAVE("wolfSSL_memsave_session_cache", SSL_SUCCESS); + WOLFSSL_LEAVE("wolfSSL_memsave_session_cache", WOLF_SSL_SUCCESS); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -7745,9 +7747,9 @@ int wolfSSL_memrestore_session_cache(const void* mem, int sz) wc_UnLockMutex(&session_mutex); - WOLFSSL_LEAVE("wolfSSL_memrestore_session_cache", SSL_SUCCESS); + WOLFSSL_LEAVE("wolfSSL_memrestore_session_cache", WOLF_SSL_SUCCESS); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #if !defined(NO_FILESYSTEM) @@ -7758,7 +7760,7 @@ int wolfSSL_save_session_cache(const char *fname) { XFILE file; int ret; - int rc = SSL_SUCCESS; + int rc = WOLF_SSL_SUCCESS; int i; cache_header_t cache_header; @@ -7767,7 +7769,7 @@ int wolfSSL_save_session_cache(const char *fname) file = XFOPEN(fname, "w+b"); if (file == XBADFILE) { WOLFSSL_MSG("Couldn't open session cache save file"); - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } cache_header.version = WOLFSSL_CACHE_VERSION; cache_header.rows = SESSION_ROWS; @@ -7824,7 +7826,7 @@ int wolfSSL_save_session_cache(const char *fname) int wolfSSL_restore_session_cache(const char *fname) { XFILE file; - int rc = SSL_SUCCESS; + int rc = WOLF_SSL_SUCCESS; int ret; int i; cache_header_t cache_header; @@ -7834,7 +7836,7 @@ int wolfSSL_restore_session_cache(const char *fname) file = XFOPEN(fname, "rb"); if (file == XBADFILE) { WOLFSSL_MSG("Couldn't open session cache save file"); - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } /* cache header */ ret = (int)XFREAD(&cache_header, sizeof cache_header, 1, file); @@ -7904,10 +7906,10 @@ void wolfSSL_load_error_strings(void) /* compatibility only */ int wolfSSL_library_init(void) { WOLFSSL_ENTER("SSL_library_init"); - if (wolfSSL_Init() == SSL_SUCCESS) - return SSL_SUCCESS; + if (wolfSSL_Init() == WOLF_SSL_SUCCESS) + return WOLF_SSL_SUCCESS; else - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } @@ -7917,7 +7919,7 @@ int wolfSSL_set_session_secret_cb(WOLFSSL* ssl, SessionSecretCb cb, void* ctx) { WOLFSSL_ENTER("wolfSSL_set_session_secret_cb"); if (ssl == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; ssl->sessionSecretCb = cb; ssl->sessionSecretCtx = ctx; @@ -7925,7 +7927,7 @@ int wolfSSL_set_session_secret_cb(WOLFSSL* ssl, SessionSecretCb cb, void* ctx) ssl->session.sessionIDSz = 0; ssl->options.resuming = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif @@ -7937,18 +7939,18 @@ int wolfSSL_set_session_secret_cb(WOLFSSL* ssl, SessionSecretCb cb, void* ctx) long wolfSSL_CTX_set_session_cache_mode(WOLFSSL_CTX* ctx, long mode) { WOLFSSL_ENTER("SSL_CTX_set_session_cache_mode"); - if (mode == SSL_SESS_CACHE_OFF) + if (mode == WOLF_SSL_SESS_CACHE_OFF) ctx->sessionCacheOff = 1; - if ((mode & SSL_SESS_CACHE_NO_AUTO_CLEAR) != 0) + if ((mode & WOLF_SSL_SESS_CACHE_NO_AUTO_CLEAR) != 0) ctx->sessionCacheFlushOff = 1; #ifdef HAVE_EXT_CACHE - if ((mode & SSL_SESS_CACHE_NO_INTERNAL_STORE) != 0) + if ((mode & WOLF_SSL_SESS_CACHE_NO_INTERNAL_STORE) != 0) ctx->internalCacheOff = 1; #endif - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* NO_SESSION_CACHE */ @@ -8178,7 +8180,7 @@ static INLINE int DoMemSaveCertCache(WOLFSSL_CERT_MANAGER* cm, void* mem, int sz) { int realSz; - int ret = SSL_SUCCESS; + int ret = WOLF_SSL_SUCCESS; int i; WOLFSSL_ENTER("DoMemSaveCertCache"); @@ -8214,7 +8216,7 @@ static INLINE int DoMemSaveCertCache(WOLFSSL_CERT_MANAGER* cm, int CM_SaveCertCache(WOLFSSL_CERT_MANAGER* cm, const char* fname) { XFILE file; - int rc = SSL_SUCCESS; + int rc = WOLF_SSL_SUCCESS; int memSz; byte* mem; @@ -8223,7 +8225,7 @@ int CM_SaveCertCache(WOLFSSL_CERT_MANAGER* cm, const char* fname) file = XFOPEN(fname, "w+b"); if (file == XBADFILE) { WOLFSSL_MSG("Couldn't open cert cache save file"); - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } if (wc_LockMutex(&cm->caLock) != 0) { @@ -8239,7 +8241,7 @@ int CM_SaveCertCache(WOLFSSL_CERT_MANAGER* cm, const char* fname) rc = MEMORY_E; } else { rc = DoMemSaveCertCache(cm, mem, memSz); - if (rc == SSL_SUCCESS) { + if (rc == WOLF_SSL_SUCCESS) { int ret = (int)XFWRITE(mem, memSz, 1, file); if (ret != 1) { WOLFSSL_MSG("Cert cache file write failed"); @@ -8260,7 +8262,7 @@ int CM_SaveCertCache(WOLFSSL_CERT_MANAGER* cm, const char* fname) int CM_RestoreCertCache(WOLFSSL_CERT_MANAGER* cm, const char* fname) { XFILE file; - int rc = SSL_SUCCESS; + int rc = WOLF_SSL_SUCCESS; int ret; int memSz; byte* mem; @@ -8270,7 +8272,7 @@ int CM_RestoreCertCache(WOLFSSL_CERT_MANAGER* cm, const char* fname) file = XFOPEN(fname, "rb"); if (file == XBADFILE) { WOLFSSL_MSG("Couldn't open cert cache save file"); - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } XFSEEK(file, 0, XSEEK_END); @@ -8280,7 +8282,7 @@ int CM_RestoreCertCache(WOLFSSL_CERT_MANAGER* cm, const char* fname) if (memSz <= 0) { WOLFSSL_MSG("Bad file size"); XFCLOSE(file); - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } mem = (byte*)XMALLOC(memSz, cm->heap, DYNAMIC_TYPE_TMP_BUFFER); @@ -8296,7 +8298,7 @@ int CM_RestoreCertCache(WOLFSSL_CERT_MANAGER* cm, const char* fname) rc = FREAD_ERROR; } else { rc = CM_MemRestoreCertCache(cm, mem, memSz); - if (rc != SSL_SUCCESS) { + if (rc != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("Mem restore cert cache failed"); } } @@ -8313,7 +8315,7 @@ int CM_RestoreCertCache(WOLFSSL_CERT_MANAGER* cm, const char* fname) /* Persist cert cache to memory */ int CM_MemSaveCertCache(WOLFSSL_CERT_MANAGER* cm, void* mem, int sz, int* used) { - int ret = SSL_SUCCESS; + int ret = WOLF_SSL_SUCCESS; WOLFSSL_ENTER("CM_MemSaveCertCache"); @@ -8323,7 +8325,7 @@ int CM_MemSaveCertCache(WOLFSSL_CERT_MANAGER* cm, void* mem, int sz, int* used) } ret = DoMemSaveCertCache(cm, mem, sz); - if (ret == SSL_SUCCESS) + if (ret == WOLF_SSL_SUCCESS) *used = GetCertCacheMemSize(cm); wc_UnLockMutex(&cm->caLock); @@ -8335,7 +8337,7 @@ int CM_MemSaveCertCache(WOLFSSL_CERT_MANAGER* cm, void* mem, int sz, int* used) /* Restore cert cache from memory */ int CM_MemRestoreCertCache(WOLFSSL_CERT_MANAGER* cm, const void* mem, int sz) { - int ret = SSL_SUCCESS; + int ret = WOLF_SSL_SUCCESS; int i; CertCacheHeader* hdr = (CertCacheHeader*)mem; byte* current = (byte*)mem + sizeof(CertCacheHeader); @@ -8412,19 +8414,19 @@ int wolfSSL_CTX_set_cipher_list(WOLFSSL_CTX* ctx, const char* list) DYNAMIC_TYPE_SUITES); if (ctx->suites == NULL) { WOLFSSL_MSG("Memory alloc for Suites failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XMEMSET(ctx->suites, 0, sizeof(Suites)); } - return (SetCipherList(ctx, ctx->suites, list)) ? SSL_SUCCESS : SSL_FAILURE; + return (SetCipherList(ctx, ctx->suites, list)) ? WOLF_SSL_SUCCESS : WOLF_SSL_FAILURE; } int wolfSSL_set_cipher_list(WOLFSSL* ssl, const char* list) { WOLFSSL_ENTER("wolfSSL_set_cipher_list"); - return (SetCipherList(ssl->ctx, ssl->suites, list)) ? SSL_SUCCESS : SSL_FAILURE; + return (SetCipherList(ssl->ctx, ssl->suites, list)) ? WOLF_SSL_SUCCESS : WOLF_SSL_FAILURE; } @@ -8439,7 +8441,7 @@ int wolfSSL_dtls_get_current_timeout(WOLFSSL* ssl) } -/* user may need to alter init dtls recv timeout, SSL_SUCCESS on ok */ +/* user may need to alter init dtls recv timeout, WOLF_SSL_SUCCESS on ok */ int wolfSSL_dtls_set_timeout_init(WOLFSSL* ssl, int timeout) { if (ssl == NULL || timeout < 0) @@ -8453,11 +8455,11 @@ int wolfSSL_dtls_set_timeout_init(WOLFSSL* ssl, int timeout) ssl->dtls_timeout_init = timeout; ssl->dtls_timeout = timeout; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } -/* user may need to alter max dtls recv timeout, SSL_SUCCESS on ok */ +/* user may need to alter max dtls recv timeout, WOLF_SSL_SUCCESS on ok */ int wolfSSL_dtls_set_timeout_max(WOLFSSL* ssl, int timeout) { if (ssl == NULL || timeout < 0) @@ -8470,18 +8472,18 @@ int wolfSSL_dtls_set_timeout_max(WOLFSSL* ssl, int timeout) ssl->dtls_timeout_max = timeout; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } int wolfSSL_dtls_got_timeout(WOLFSSL* ssl) { - int result = SSL_SUCCESS; + int result = WOLF_SSL_SUCCESS; if (!ssl->options.handShakeDone && (DtlsMsgPoolTimeout(ssl) < 0 || DtlsMsgPoolSend(ssl, 0) < 0)) { - result = SSL_FATAL_ERROR; + result = WOLF_SSL_FATAL_ERROR; } return result; } @@ -8668,7 +8670,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (ssl->options.side != WOLFSSL_CLIENT_END) { WOLFSSL_ERROR(ssl->error = SIDE_ERROR); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #ifdef WOLFSSL_TLS13 @@ -8701,7 +8703,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, } else { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } @@ -8716,7 +8718,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, /* always send client hello first */ if ( (ssl->error = SendClientHello(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->options.connectState = CLIENT_HELLO_SENT; WOLFSSL_MSG("connect state: CLIENT_HELLO_SENT"); @@ -8736,7 +8738,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, while (ssl->options.serverState < neededState) { if ( (ssl->error = ProcessReply(ssl)) < 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* if resumption failed, reset needed state */ else if (neededState == SERVER_FINISHED_COMPLETE) @@ -8754,7 +8756,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, case HELLO_AGAIN : if (ssl->options.certOnly) - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; #ifdef WOLFSSL_TLS13 if (ssl->options.tls1_3) @@ -8766,11 +8768,11 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, /* re-init hashes, exclude first hello and verify request */ if ((ssl->error = InitHandshakeHashes(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if ( (ssl->error = SendClientHello(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } #endif @@ -8789,7 +8791,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, while (ssl->options.serverState < neededState) { if ( (ssl->error = ProcessReply(ssl)) < 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* if resumption failed, reset needed state */ else if (neededState == SERVER_FINISHED_COMPLETE) @@ -8812,7 +8814,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (ssl->options.sendVerify) { if ( (ssl->error = SendCertificate(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } WOLFSSL_MSG("sent: certificate"); } @@ -8830,7 +8832,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (!ssl->options.resuming) { if ( (ssl->error = SendClientKeyExchange(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } WOLFSSL_MSG("sent: client key exchange"); } @@ -8844,7 +8846,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (ssl->options.sendVerify) { if ( (ssl->error = SendCertificateVerify(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } WOLFSSL_MSG("sent: certificate verify"); } @@ -8856,7 +8858,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, case FIRST_REPLY_THIRD : if ( (ssl->error = SendChangeCipher(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } WOLFSSL_MSG("sent: change cipher spec"); ssl->options.connectState = FIRST_REPLY_FOURTH; @@ -8866,7 +8868,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, case FIRST_REPLY_FOURTH : if ( (ssl->error = SendFinished(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } WOLFSSL_MSG("sent: finished"); ssl->options.connectState = FINISHED_DONE; @@ -8878,7 +8880,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, while (ssl->options.serverState < SERVER_FINISHED_COMPLETE) if ( (ssl->error = ProcessReply(ssl)) < 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->options.connectState = SECOND_REPLY_DONE; @@ -8892,7 +8894,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (cbret < 0) { ssl->error = cbret; WOLFSSL_MSG("HandShake Done Cb don't continue error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } #endif /* NO_HANDSHAKE_DONE_CB */ @@ -8908,12 +8910,12 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, } #endif /* WOLFSSL_DTLS */ - WOLFSSL_LEAVE("SSL_connect()", SSL_SUCCESS); - return SSL_SUCCESS; + WOLFSSL_LEAVE("SSL_connect()", WOLF_SSL_SUCCESS); + return WOLF_SSL_SUCCESS; default: WOLFSSL_MSG("Unknown connect state ERROR"); - return SSL_FATAL_ERROR; /* unknown connect state */ + return WOLF_SSL_FATAL_ERROR; /* unknown connect state */ } } @@ -9031,7 +9033,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (ssl->options.side != WOLFSSL_SERVER_END) { WOLFSSL_ERROR(ssl->error = SIDE_ERROR); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #ifndef NO_CERTS @@ -9044,7 +9046,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, WOLFSSL_MSG("accept error: don't have server cert and key"); ssl->error = NO_PRIVATE_KEY; WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #endif @@ -9073,7 +9075,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, } else { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } @@ -9084,7 +9086,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, while (ssl->options.clientState < CLIENT_HELLO_COMPLETE) if ( (ssl->error = ProcessReply(ssl)) < 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #ifdef WOLFSSL_TLS13 ssl->options.acceptState = ACCEPT_CLIENT_HELLO_DONE; @@ -9095,7 +9097,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (ssl->options.serverState == SERVER_HELLO_RETRY_REQUEST) { if ((ssl->error = SendTls13HelloRetryRequest(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } ssl->options.acceptState = ACCEPT_HELLO_RETRY_REQUEST_DONE; @@ -9106,7 +9108,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (ssl->options.serverState == SERVER_HELLO_RETRY_REQUEST) { if ( (ssl->error = ProcessReply(ssl)) < 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } #endif @@ -9122,7 +9124,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, #endif if ( (ssl->error = SendServerHello(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->options.acceptState = SERVER_HELLO_SENT; WOLFSSL_MSG("accept state SERVER_HELLO_SENT"); @@ -9138,7 +9140,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (!ssl->options.resuming) if ( (ssl->error = SendCertificate(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #endif ssl->options.acceptState = CERT_SENT; @@ -9150,7 +9152,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (!ssl->options.resuming) if ( (ssl->error = SendCertificateStatus(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #endif ssl->options.acceptState = CERT_STATUS_SENT; @@ -9166,7 +9168,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (!ssl->options.resuming) if ( (ssl->error = SendServerKeyExchange(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->options.acceptState = KEY_EXCHANGE_SENT; WOLFSSL_MSG("accept state KEY_EXCHANGE_SENT"); @@ -9178,7 +9180,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (ssl->options.verifyPeer) { if ( (ssl->error = SendCertificateRequest(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } } @@ -9191,7 +9193,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (!ssl->options.resuming) if ( (ssl->error = SendServerHelloDone(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->options.acceptState = SERVER_HELLO_DONE; WOLFSSL_MSG("accept state SERVER_HELLO_DONE"); @@ -9202,7 +9204,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, while (ssl->options.clientState < CLIENT_FINISHED_COMPLETE) if ( (ssl->error = ProcessReply(ssl)) < 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } ssl->options.acceptState = ACCEPT_SECOND_REPLY_DONE; @@ -9214,7 +9216,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (ssl->options.createTicket) { if ( (ssl->error = SendTicket(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } #endif /* HAVE_SESSION_TICKET */ @@ -9225,7 +9227,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, case TICKET_SENT: if ( (ssl->error = SendChangeCipher(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->options.acceptState = CHANGE_CIPHER_SENT; WOLFSSL_MSG("accept state CHANGE_CIPHER_SENT"); @@ -9234,7 +9236,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, case CHANGE_CIPHER_SENT : if ( (ssl->error = SendFinished(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->options.acceptState = ACCEPT_FINISHED_DONE; @@ -9246,7 +9248,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, while (ssl->options.clientState < CLIENT_FINISHED_COMPLETE) if ( (ssl->error = ProcessReply(ssl)) < 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->options.acceptState = ACCEPT_THIRD_REPLY_DONE; @@ -9260,7 +9262,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (cbret < 0) { ssl->error = cbret; WOLFSSL_MSG("HandShake Done Cb don't continue error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } #endif /* NO_HANDSHAKE_DONE_CB */ @@ -9281,17 +9283,17 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if ((ssl->error = wolfSSL_send_session(ssl)) != 0) { WOLFSSL_MSG("Export DTLS session error"); WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } #endif - WOLFSSL_LEAVE("SSL_accept()", SSL_SUCCESS); - return SSL_SUCCESS; + WOLFSSL_LEAVE("SSL_accept()", WOLF_SSL_SUCCESS); + return WOLF_SSL_SUCCESS; default : WOLFSSL_MSG("Unknown accept state ERROR"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } @@ -9311,14 +9313,14 @@ int wolfSSL_SetHsDoneCb(WOLFSSL* ssl, HandShakeDoneCb cb, void* user_ctx) ssl->hsDoneCtx = user_ctx; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* NO_HANDSHAKE_DONE_CB */ int wolfSSL_Cleanup(void) { - int ret = SSL_SUCCESS; + int ret = WOLF_SSL_SUCCESS; int release = 0; WOLFSSL_ENTER("wolfSSL_Cleanup"); @@ -9396,7 +9398,7 @@ int wolfSSL_set_timeout(WOLFSSL* ssl, unsigned int to) to = WOLFSSL_SESSION_TIMEOUT; ssl->timeout = to; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -9410,7 +9412,7 @@ int wolfSSL_CTX_set_timeout(WOLFSSL_CTX* ctx, unsigned int to) to = WOLFSSL_SESSION_TIMEOUT; ctx->timeout = to; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -9618,7 +9620,7 @@ static int GetDeepCopySession(WOLFSSL* ssl, WOLFSSL_SESSION* copyFrom) void* tmpBuff = NULL; int ticketLen = 0; int doDynamicCopy = 0; - int ret = SSL_SUCCESS; + int ret = WOLF_SSL_SUCCESS; (void)ticketLen; (void)doDynamicCopy; @@ -9675,7 +9677,7 @@ static int GetDeepCopySession(WOLFSSL* ssl, WOLFSSL_SESSION* copyFrom) XMEMCPY(copyInto->masterSecret, copyFrom->masterSecret, SECRET_LEN); if (wc_UnLockMutex(&session_mutex) != 0) { - if (ret == SSL_SUCCESS) + if (ret == WOLF_SSL_SUCCESS) ret = BAD_MUTEX_E; } #endif @@ -9698,7 +9700,7 @@ static int GetDeepCopySession(WOLFSSL* ssl, WOLFSSL_SESSION* copyFrom) ret = VAR_STATE_CHANGE_E; } - if (ret == SSL_SUCCESS) { + if (ret == WOLF_SSL_SUCCESS) { copyInto->ticket = (byte*)tmpBuff; copyInto->isDynamic = 1; XMEMCPY(copyInto->ticket, copyFrom->ticket, ticketLen); @@ -9711,12 +9713,12 @@ static int GetDeepCopySession(WOLFSSL* ssl, WOLFSSL_SESSION* copyFrom) if (doDynamicCopy) { if (wc_UnLockMutex(&session_mutex) != 0) { - if (ret == SSL_SUCCESS) + if (ret == WOLF_SSL_SUCCESS) ret = BAD_MUTEX_E; } } - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { /* cleanup */ if (tmpBuff) XFREE(tmpBuff, ssl->heap, DYNAMIC_TYPE_SESSION_TICK); @@ -9731,11 +9733,11 @@ static int GetDeepCopySession(WOLFSSL* ssl, WOLFSSL_SESSION* copyFrom) int SetSession(WOLFSSL* ssl, WOLFSSL_SESSION* session) { if (ssl->options.sessionCacheOff) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; if (LowResTimer() < (session->bornOn + session->timeout)) { int ret = GetDeepCopySession(ssl, session); - if (ret == SSL_SUCCESS) { + if (ret == WOLF_SSL_SUCCESS) { ssl->options.resuming = 1; #if defined(SESSION_CERTS) || (defined(WOLFSSL_TLS13) && \ @@ -9748,7 +9750,7 @@ int SetSession(WOLFSSL* ssl, WOLFSSL_SESSION* session) return ret; } - return SSL_FAILURE; /* session timed out */ + return WOLF_SSL_FAILURE; /* session timed out */ } @@ -9963,7 +9965,7 @@ int AddSession(WOLFSSL* ssl) word32 active = 0; error = get_locked_session_stats(&active, NULL, NULL); - if (error == SSL_SUCCESS) { + if (error == WOLF_SSL_SUCCESS) { error = 0; /* back to this function ok */ if (active > PeakSessions) @@ -10004,7 +10006,7 @@ int wolfSSL_GetSessionIndex(WOLFSSL* ssl) int wolfSSL_GetSessionAtIndex(int idx, WOLFSSL_SESSION* session) { - int row, col, result = SSL_FAILURE; + int row, col, result = WOLF_SSL_FAILURE; WOLFSSL_ENTER("wolfSSL_GetSessionAtIndex"); @@ -10019,7 +10021,7 @@ int wolfSSL_GetSessionAtIndex(int idx, WOLFSSL_SESSION* session) col < (int)min(SessionCache[row].totalCount, SESSIONS_PER_ROW)) { XMEMCPY(session, &SessionCache[row].Sessions[col], sizeof(WOLFSSL_SESSION)); - result = SSL_SUCCESS; + result = WOLF_SSL_SUCCESS; } if (wc_UnLockMutex(&session_mutex) != 0) @@ -10050,10 +10052,10 @@ WOLFSSL_X509_CHAIN* wolfSSL_SESSION_get_peer_chain(WOLFSSL_SESSION* session) #ifdef WOLFSSL_SESSION_STATS -/* requires session_mutex lock held, SSL_SUCCESS on ok */ +/* requires session_mutex lock held, WOLF_SSL_SUCCESS on ok */ static int get_locked_session_stats(word32* active, word32* total, word32* peak) { - int result = SSL_SUCCESS; + int result = WOLF_SSL_SUCCESS; int i; int count; int idx; @@ -10107,11 +10109,11 @@ static int get_locked_session_stats(word32* active, word32* total, word32* peak) } -/* return SSL_SUCCESS on ok */ +/* return WOLF_SSL_SUCCESS on ok */ int wolfSSL_get_session_stats(word32* active, word32* total, word32* peak, word32* maxSessions) { - int result = SSL_SUCCESS; + int result = WOLF_SSL_SUCCESS; WOLFSSL_ENTER("wolfSSL_get_session_stats"); @@ -10145,7 +10147,7 @@ int wolfSSL_get_session_stats(word32* active, word32* total, word32* peak, #ifdef PRINT_SESSION_STATS - /* SSL_SUCCESS on ok */ + /* WOLF_SSL_SUCCESS on ok */ int wolfSSL_PrintSessionStats(void) { word32 totalSessionsSeen = 0; @@ -10159,7 +10161,7 @@ int wolfSSL_get_session_stats(word32* active, word32* total, word32* peak, ret = wolfSSL_get_session_stats(&totalSessionsNow, &totalSessionsSeen, &peak, &maxSessions); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) return ret; printf("Total Sessions Seen = %d\n", totalSessionsSeen); printf("Total Sessions Now = %d\n", totalSessionsNow); @@ -10221,7 +10223,7 @@ int wolfSSL_check_domain_name(WOLFSSL* ssl, const char* dn) if (ssl == NULL || dn == NULL) { WOLFSSL_MSG("Bad function argument: NULL"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (ssl->buffers.domainName.buffer) @@ -10234,17 +10236,17 @@ int wolfSSL_check_domain_name(WOLFSSL* ssl, const char* dn) if (ssl->buffers.domainName.buffer) { XSTRNCPY((char*)ssl->buffers.domainName.buffer, dn, ssl->buffers.domainName.length); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } else { ssl->error = MEMORY_ERROR; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } /* turn on wolfSSL zlib compression - returns SSL_SUCCESS for success, else error (not built in) + returns WOLF_SSL_SUCCESS for success, else error (not built in) */ int wolfSSL_set_compression(WOLFSSL* ssl) { @@ -10252,7 +10254,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) (void)ssl; #ifdef HAVE_LIBZ ssl->options.usingCompression = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; #else return NOT_COMPILED_IN; #endif @@ -10353,7 +10355,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) static int wolfSSL_ex_wrapper(WOLFSSL* ssl, HandShakeCallBack hsCb, TimeoutCallBack toCb, Timeval timeout) { - int ret = SSL_FATAL_ERROR; + int ret = WOLF_SSL_FATAL_ERROR; int oldTimerOn = 0; /* was timer already on */ Timeval startTime; Timeval endTime; @@ -10583,7 +10585,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) XSTRNCPY(ctx->server_hint, hint, sizeof(ctx->server_hint)); ctx->server_hint[MAX_PSK_ID_LEN] = '\0'; /* null term */ } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -10592,7 +10594,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) WOLFSSL_ENTER("SSL_use_psk_identity_hint"); if (ssl == NULL || ssl->arrays == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; if (hint == 0) ssl->arrays->server_hint[0] = 0; @@ -10601,7 +10603,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) sizeof(ssl->arrays->server_hint)); ssl->arrays->server_hint[MAX_PSK_ID_LEN] = '\0'; /* null term */ } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* NO_PSK */ @@ -10614,11 +10616,11 @@ int wolfSSL_set_compression(WOLFSSL* ssl) WOLFSSL_ENTER("wolfSSL_CTX_allow_anon_cipher"); if (ctx == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; ctx->haveAnon = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* HAVE_ANON */ @@ -10633,7 +10635,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) long sz, int format) { WOLFSSL_ENTER("wolfSSL_CTX_load_verify_buffer"); - if (format == SSL_FILETYPE_PEM) + if (format == WOLF_SSL_FILETYPE_PEM) return ProcessChainBuffer(ctx, in, sz, format, CA_TYPE, NULL); else return ProcessBuffer(ctx, in, sz, format, CA_TYPE, NULL,NULL,0); @@ -10652,7 +10654,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) return BAD_FUNC_ARG; } - if (format == SSL_FILETYPE_PEM) + if (format == WOLF_SSL_FILETYPE_PEM) return ProcessChainBuffer(ctx, in, sz, format, TRUSTED_PEER_TYPE, NULL); else @@ -10689,7 +10691,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) const unsigned char* in, long sz) { return wolfSSL_CTX_use_certificate_chain_buffer_format(ctx, in, sz, - SSL_FILETYPE_PEM); + WOLF_SSL_FILETYPE_PEM); } @@ -10733,10 +10735,10 @@ int wolfSSL_set_compression(WOLFSSL* ssl) } #endif - if (format != SSL_FILETYPE_ASN1 && format != SSL_FILETYPE_PEM) - ret = SSL_BAD_FILETYPE; + if (format != WOLF_SSL_FILETYPE_ASN1 && format != WOLF_SSL_FILETYPE_PEM) + ret = WOLF_SSL_BAD_FILETYPE; else { - if (format == SSL_FILETYPE_PEM) { + if (format == WOLF_SSL_FILETYPE_PEM) { FreeDer(&der); ret = PemToDer(buf, sz, DH_PARAM_TYPE, &der, ctx->heap, NULL, NULL); @@ -10752,7 +10754,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) if (ret == 0) { if (wc_DhParamsLoad(der->buffer, der->length, p, &pSz, g, &gSz) < 0) - ret = SSL_BAD_FILETYPE; + ret = WOLF_SSL_BAD_FILETYPE; else if (ssl) ret = wolfSSL_SetTmpDH(ssl, p, pSz, g, gSz); else @@ -10771,7 +10773,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) } - /* server Diffie-Hellman parameters, SSL_SUCCESS on ok */ + /* server Diffie-Hellman parameters, WOLF_SSL_SUCCESS on ok */ int wolfSSL_SetTmpDH_buffer(WOLFSSL* ssl, const unsigned char* buf, long sz, int format) { @@ -10782,7 +10784,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) } - /* server ctx Diffie-Hellman parameters, SSL_SUCCESS on ok */ + /* server ctx Diffie-Hellman parameters, WOLF_SSL_SUCCESS on ok */ int wolfSSL_CTX_SetTmpDH_buffer(WOLFSSL_CTX* ctx, const unsigned char* buf, long sz, int format) { @@ -10820,12 +10822,12 @@ int wolfSSL_set_compression(WOLFSSL* ssl) const unsigned char* in, long sz) { return wolfSSL_use_certificate_chain_buffer_format(ssl, in, sz, - SSL_FILETYPE_PEM); + WOLF_SSL_FILETYPE_PEM); } /* unload any certs or keys that SSL owns, leave CTX as is - SSL_SUCCESS on ok */ + WOLF_SSL_SUCCESS on ok */ int wolfSSL_UnloadCertsKeys(WOLFSSL* ssl) { if (ssl == NULL) { @@ -10858,7 +10860,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) ssl->buffers.weOwnKey = 0; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -10894,10 +10896,10 @@ int wolfSSL_set_compression(WOLFSSL* ssl) int wolfSSL_add_all_algorithms(void) { WOLFSSL_ENTER("wolfSSL_add_all_algorithms"); - if (wolfSSL_Init() == SSL_SUCCESS) - return SSL_SUCCESS; + if (wolfSSL_Init() == WOLF_SSL_SUCCESS) + return WOLF_SSL_SUCCESS; else - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } @@ -10944,7 +10946,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) void wolfSSL_CTX_set_client_CA_list(WOLFSSL_CTX* ctx, - STACK_OF(WOLFSSL_X509_NAME)* names) + WOLF_STACK_OF(WOLFSSL_X509_NAME)* names) { WOLFSSL_ENTER("wolfSSL_SSL_CTX_set_client_CA_list"); @@ -10952,7 +10954,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) ctx->ca_names = names; } - STACK_OF(WOLFSSL_X509_NAME)* wolfSSL_SSL_CTX_get_client_CA_list( + WOLF_STACK_OF(WOLFSSL_X509_NAME)* wolfSSL_SSL_CTX_get_client_CA_list( const WOLFSSL_CTX *s) { WOLFSSL_ENTER("wolfSSL_SSL_CTX_get_client_CA_list"); @@ -10963,7 +10965,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) return s->ca_names; } - STACK_OF(WOLFSSL_X509_NAME)* wolfSSL_load_client_CA_file(const char* fname) + WOLF_STACK_OF(WOLFSSL_X509_NAME)* wolfSSL_load_client_CA_file(const char* fname) { WOLFSSL_STACK *list = NULL; WOLFSSL_STACK *node; @@ -11018,7 +11020,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) { /* TODO:, not needed in goahead */ (void)ctx; - return SSL_NOT_IMPLEMENTED; + return WOLF_SSL_NOT_IMPLEMENTED; } @@ -11026,20 +11028,20 @@ int wolfSSL_set_compression(WOLFSSL* ssl) int wolfSSL_get_keyblock_size(WOLFSSL* ssl) { if (ssl == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; return 2 * (ssl->specs.key_size + ssl->specs.iv_size + ssl->specs.hash_size); } - /* store keys returns SSL_SUCCESS or -1 on error */ + /* store keys returns WOLF_SSL_SUCCESS or -1 on error */ int wolfSSL_get_keys(WOLFSSL* ssl, unsigned char** ms, unsigned int* msLen, unsigned char** sr, unsigned int* srLen, unsigned char** cr, unsigned int* crLen) { if (ssl == NULL || ssl->arrays == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; *ms = ssl->arrays->masterSecret; *sr = ssl->arrays->serverRandom; @@ -11049,7 +11051,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) *srLen = RAN_LEN; *crLen = RAN_LEN; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -11130,8 +11132,8 @@ int wolfSSL_set_compression(WOLFSSL* ssl) return; } - ssl->options.sentNotify = (opt&SSL_SENT_SHUTDOWN) > 0; - ssl->options.closeNotify = (opt&SSL_RECEIVED_SHUTDOWN) > 0; + ssl->options.sentNotify = (opt&WOLF_SSL_SENT_SHUTDOWN) > 0; + ssl->options.closeNotify = (opt&WOLF_SSL_RECEIVED_SHUTDOWN) > 0; } @@ -11160,7 +11162,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) ssl->IOCB_ReadCtx = &ssl->rfd; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -11171,7 +11173,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) ssl->IOCB_WriteCtx = &ssl->wfd; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -11238,7 +11240,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) WOLFSSL_ENTER("wolfSSL_X509_STORE_CTX_get_error_depth"); if(ctx) return ctx->error_depth; - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #endif @@ -11359,7 +11361,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) b->close = (byte)closeF; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -11385,7 +11387,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) WOLFSSL_ENTER("wolfSSL_BIO_get_mem_data"); if (bio == NULL || p == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; *(byte **)p = bio->mem; @@ -11420,7 +11422,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) #define CloseSocket(s) closesocket(s) #elif defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET) #define CloseSocket(s) closesocket(s) - extern int closesocket(int) ; + extern int closesocket(int); #else #define CloseSocket(s) close(s) #endif @@ -11562,7 +11564,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) /* already got eof, again is error */ if (bio && front->eof) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; while(bio && ((ssl = bio->ssl) == 0) ) bio = bio->next; @@ -11574,7 +11576,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) front->eof = 1; else if (ret < 0) { int err = wolfSSL_get_error(ssl, 0); - if ( !(err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) ) + if ( !(err == WOLF_SSL_ERROR_WANT_READ || err == WOLF_SSL_ERROR_WANT_WRITE) ) front->eof = 1; } return ret; @@ -11649,7 +11651,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) /* already got eof, again is error */ if (bio && front->eof) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; while(bio && ((ssl = bio->ssl) == 0) ) bio = bio->next; @@ -11661,7 +11663,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) front->eof = 1; else if (ret < 0) { int err = wolfSSL_get_error(ssl, 0); - if ( !(err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) ) + if ( !(err == WOLF_SSL_ERROR_WANT_READ || err == WOLF_SSL_ERROR_WANT_WRITE) ) front->eof = 1; } @@ -11752,15 +11754,15 @@ int wolfSSL_set_compression(WOLFSSL* ssl) int keyLeft; int ivLeft; int keyOutput = 0; - byte digest[MD5_DIGEST_SIZE]; + byte digest[WC_MD5_DIGEST_SIZE]; #ifdef WOLFSSL_SMALL_STACK - Md5* md5 = NULL; + wc_Md5* md5 = NULL; #else - Md5 md5[1]; + wc_Md5 md5[1]; #endif #ifdef WOLFSSL_SMALL_STACK - md5 = (Md5*)XMALLOC(sizeof(Md5), NULL, DYNAMIC_TYPE_HASHCTX); + md5 = (wc_Md5*)XMALLOC(sizeof(wc_Md5), NULL, DYNAMIC_TYPE_HASHCTX); if (md5 == NULL) return 0; #endif @@ -11822,10 +11824,10 @@ int wolfSSL_set_compression(WOLFSSL* ssl) ivLeft = ivLen; while (keyOutput < (keyLen + ivLen)) { - int digestLeft = MD5_DIGEST_SIZE; + int digestLeft = WC_MD5_DIGEST_SIZE; /* D_(i - 1) */ if (keyOutput) /* first time D_0 is empty */ - wc_Md5Update(md5, digest, MD5_DIGEST_SIZE); + wc_Md5Update(md5, digest, WC_MD5_DIGEST_SIZE); /* data */ wc_Md5Update(md5, data, sz); /* salt */ @@ -11834,12 +11836,12 @@ int wolfSSL_set_compression(WOLFSSL* ssl) wc_Md5Final(md5, digest); /* count */ for (j = 1; j < count; j++) { - wc_Md5Update(md5, digest, MD5_DIGEST_SIZE); + wc_Md5Update(md5, digest, WC_MD5_DIGEST_SIZE); wc_Md5Final(md5, digest); } if (keyLeft) { - int store = min(keyLeft, MD5_DIGEST_SIZE); + int store = min(keyLeft, WC_MD5_DIGEST_SIZE); XMEMCPY(&key[keyLen - keyLeft], digest, store); keyOutput += store; @@ -11851,7 +11853,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) int store = min(ivLeft, digestLeft); if (iv != NULL) XMEMCPY(&iv[ivLen - ivLeft], - &digest[MD5_DIGEST_SIZE - digestLeft], store); + &digest[WC_MD5_DIGEST_SIZE - digestLeft], store); keyOutput += store; ivLeft -= store; } @@ -11962,11 +11964,11 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, int wolfSSL_MD5_Init(WOLFSSL_MD5_CTX* md5) { int ret; - typedef char md5_test[sizeof(MD5_CTX) >= sizeof(Md5) ? 1 : -1]; + typedef char md5_test[sizeof(MD5_CTX) >= sizeof(wc_Md5) ? 1 : -1]; (void)sizeof(md5_test); WOLFSSL_ENTER("MD5_Init"); - ret = wc_InitMd5((Md5*)md5); + ret = wc_InitMd5((wc_Md5*)md5); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -11982,7 +11984,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, int ret; WOLFSSL_ENTER("wolfSSL_MD5_Update"); - ret = wc_Md5Update((Md5*)md5, (const byte*)input, (word32)sz); + ret = wc_Md5Update((wc_Md5*)md5, (const byte*)input, (word32)sz); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -11997,7 +11999,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, int ret; WOLFSSL_ENTER("MD5_Final"); - ret = wc_Md5Final((Md5*)md5, input); + ret = wc_Md5Final((wc_Md5*)md5, input); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12013,11 +12015,11 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, { int ret; - typedef char sha_test[sizeof(SHA_CTX) >= sizeof(Sha) ? 1 : -1]; + typedef char sha_test[sizeof(SHA_CTX) >= sizeof(wc_Sha) ? 1 : -1]; (void)sizeof(sha_test); WOLFSSL_ENTER("SHA_Init"); - ret = wc_InitSha((Sha*)sha); + ret = wc_InitSha((wc_Sha*)sha); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12033,7 +12035,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, int ret; WOLFSSL_ENTER("SHA_Update"); - ret = wc_ShaUpdate((Sha*)sha, (const byte*)input, (word32)sz); + ret = wc_ShaUpdate((wc_Sha*)sha, (const byte*)input, (word32)sz); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12048,7 +12050,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, int ret; WOLFSSL_ENTER("SHA_Final"); - ret = wc_ShaFinal((Sha*)sha, input); + ret = wc_ShaFinal((wc_Sha*)sha, input); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12086,11 +12088,11 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, { int ret; - typedef char sha_test[sizeof(SHA224_CTX) >= sizeof(Sha224) ? 1 : -1]; + typedef char sha_test[sizeof(SHA224_CTX) >= sizeof(wc_Sha224) ? 1 : -1]; (void)sizeof(sha_test); WOLFSSL_ENTER("SHA224_Init"); - ret = wc_InitSha224((Sha224*)sha); + ret = wc_InitSha224((wc_Sha224*)sha); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12106,7 +12108,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, int ret; WOLFSSL_ENTER("SHA224_Update"); - ret = wc_Sha224Update((Sha224*)sha, (const byte*)input, (word32)sz); + ret = wc_Sha224Update((wc_Sha224*)sha, (const byte*)input, (word32)sz); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12121,7 +12123,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, int ret; WOLFSSL_ENTER("SHA224_Final"); - ret = wc_Sha224Final((Sha224*)sha, input); + ret = wc_Sha224Final((wc_Sha224*)sha, input); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12137,11 +12139,11 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, { int ret; - typedef char sha_test[sizeof(SHA256_CTX) >= sizeof(Sha256) ? 1 : -1]; + typedef char sha_test[sizeof(SHA256_CTX) >= sizeof(wc_Sha256) ? 1 : -1]; (void)sizeof(sha_test); WOLFSSL_ENTER("SHA256_Init"); - ret = wc_InitSha256((Sha256*)sha256); + ret = wc_InitSha256((wc_Sha256*)sha256); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12157,7 +12159,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, int ret; WOLFSSL_ENTER("SHA256_Update"); - ret = wc_Sha256Update((Sha256*)sha, (const byte*)input, (word32)sz); + ret = wc_Sha256Update((wc_Sha256*)sha, (const byte*)input, (word32)sz); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12172,7 +12174,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, int ret; WOLFSSL_ENTER("SHA256_Final"); - ret = wc_Sha256Final((Sha256*)sha, input); + ret = wc_Sha256Final((wc_Sha256*)sha, input); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12188,11 +12190,11 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, { int ret; - typedef char sha_test[sizeof(SHA384_CTX) >= sizeof(Sha384) ? 1 : -1]; + typedef char sha_test[sizeof(SHA384_CTX) >= sizeof(wc_Sha384) ? 1 : -1]; (void)sizeof(sha_test); WOLFSSL_ENTER("SHA384_Init"); - ret = wc_InitSha384((Sha384*)sha); + ret = wc_InitSha384((wc_Sha384*)sha); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12208,7 +12210,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, int ret; WOLFSSL_ENTER("SHA384_Update"); - ret = wc_Sha384Update((Sha384*)sha, (const byte*)input, (word32)sz); + ret = wc_Sha384Update((wc_Sha384*)sha, (const byte*)input, (word32)sz); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12223,7 +12225,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, int ret; WOLFSSL_ENTER("SHA384_Final"); - ret = wc_Sha384Final((Sha384*)sha, input); + ret = wc_Sha384Final((wc_Sha384*)sha, input); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12241,11 +12243,11 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, { int ret; - typedef char sha_test[sizeof(SHA512_CTX) >= sizeof(Sha512) ? 1 : -1]; + typedef char sha_test[sizeof(SHA512_CTX) >= sizeof(wc_Sha512) ? 1 : -1]; (void)sizeof(sha_test); WOLFSSL_ENTER("SHA512_Init"); - ret = wc_InitSha512((Sha512*)sha); + ret = wc_InitSha512((wc_Sha512*)sha); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12261,7 +12263,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, int ret; WOLFSSL_ENTER("SHA512_Update"); - ret = wc_Sha512Update((Sha512*)sha, (const byte*)input, (word32)sz); + ret = wc_Sha512Update((wc_Sha512*)sha, (const byte*)input, (word32)sz); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12276,7 +12278,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, int ret; WOLFSSL_ENTER("SHA512_Final"); - ret = wc_Sha512Final((Sha512*)sha, input); + ret = wc_Sha512Final((wc_Sha512*)sha, input); /* return 1 on success, 0 otherwise */ if (ret == 0) @@ -12287,58 +12289,56 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out, #endif /* WOLFSSL_SHA512 */ - static struct s_ent{ + static const struct s_ent { const unsigned char macType; const char *name; } md_tbl[] = { #ifndef NO_MD5 - {MD5, "MD5"}, + {WC_MD5, "MD5"}, #endif /* NO_MD5 */ #ifndef NO_SHA - {SHA, "SHA"}, + {WC_SHA, "SHA"}, #endif /* NO_SHA */ #ifdef WOLFSSL_SHA224 - {SHA224, "SHA224"}, + {WC_SHA224, "SHA224"}, #endif /* WOLFSSL_SHA224 */ - - {SHA256, "SHA256"}, + #ifndef NO_SHA256 + {WC_SHA256, "SHA256"}, + #endif #ifdef WOLFSSL_SHA384 - {SHA384, "SHA384"}, + {WC_SHA384, "SHA384"}, #endif /* WOLFSSL_SHA384 */ - #ifdef WOLFSSL_SHA512 - {SHA512, "SHA512"}, + {WC_SHA512, "SHA512"}, #endif /* WOLFSSL_SHA512 */ - {0, NULL} - } ; + }; const WOLFSSL_EVP_MD *wolfSSL_EVP_get_digestbyname(const char *name) { static const struct alias { const char *name; const char *alias; - } alias_tbl[] = - { + } alias_tbl[] = { {"MD5", "ssl3-md5"}, {"SHA", "ssl3-sha1"}, {"SHA", "SHA1"}, { NULL, NULL} }; - const struct alias *al ; - const struct s_ent *ent ; + const struct alias *al; + const struct s_ent *ent; - for( al = alias_tbl; al->name != NULL; al++) + for (al = alias_tbl; al->name != NULL; al++) if(XSTRNCMP(name, al->alias, XSTRLEN(al->alias)+1) == 0) { name = al->name; break; } - for( ent = md_tbl; ent->name != NULL; ent++) + for (ent = md_tbl; ent->name != NULL; ent++) if(XSTRNCMP(name, ent->name, XSTRLEN(ent->name)+1) == 0) { return (EVP_MD *)ent->name; } @@ -12347,7 +12347,7 @@ const WOLFSSL_EVP_MD *wolfSSL_EVP_get_digestbyname(const char *name) static WOLFSSL_EVP_MD *wolfSSL_EVP_get_md(const unsigned char type) { - const struct s_ent *ent ; + const struct s_ent *ent; for( ent = md_tbl; ent->macType != 0; ent++) if(type == ent->macType) { return (WOLFSSL_EVP_MD *)ent->name; @@ -12357,7 +12357,7 @@ static WOLFSSL_EVP_MD *wolfSSL_EVP_get_md(const unsigned char type) int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) { - const struct s_ent *ent ; + const struct s_ent *ent; for( ent = md_tbl; ent->name != NULL; ent++) if(XSTRNCMP((const char *)md, ent->name, XSTRLEN(ent->name)+1) == 0) { return ent->macType; @@ -12596,7 +12596,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) } - /* SSL_SUCCESS on ok */ + /* WOLF_SSL_SUCCESS on ok */ int wolfSSL_EVP_CIPHER_CTX_cleanup(WOLFSSL_EVP_CIPHER_CTX* ctx) { WOLFSSL_ENTER("EVP_CIPHER_CTX_cleanup"); @@ -12605,11 +12605,11 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) ctx->keyLen = 0; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } - /* return SSL_SUCCESS on ok, 0 on failure to match API compatibility */ + /* return WOLF_SSL_SUCCESS on ok, 0 on failure to match API compatibility */ int wolfSSL_EVP_CipherInit(WOLFSSL_EVP_CIPHER_CTX* ctx, const WOLFSSL_EVP_CIPHER* type, byte* key, byte* iv, int enc) @@ -12937,13 +12937,13 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) } if (ret == 0) - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; else return 0; /* overall failure */ } - /* SSL_SUCCESS on ok */ + /* WOLF_SSL_SUCCESS on ok */ int wolfSSL_EVP_CIPHER_CTX_key_length(WOLFSSL_EVP_CIPHER_CTX* ctx) { WOLFSSL_ENTER("wolfSSL_EVP_CIPHER_CTX_key_length"); @@ -12954,7 +12954,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) } - /* SSL_SUCCESS on ok */ + /* WOLF_SSL_SUCCESS on ok */ int wolfSSL_EVP_CIPHER_CTX_set_key_length(WOLFSSL_EVP_CIPHER_CTX* ctx, int keylen) { @@ -12964,11 +12964,11 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) else return 0; /* failure */ - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } - /* SSL_SUCCESS on ok */ + /* WOLF_SSL_SUCCESS on ok */ int wolfSSL_EVP_Cipher(WOLFSSL_EVP_CIPHER_CTX* ctx, byte* dst, byte* src, word32 len) { @@ -13073,21 +13073,21 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) } WOLFSSL_MSG("wolfSSL_EVP_Cipher success"); - return SSL_SUCCESS; /* success */ + return WOLF_SSL_SUCCESS; /* success */ } #define WOLFSSL_EVP_INCLUDED #include "wolfcrypt/src/evp.c" - /* store for external read of iv, SSL_SUCCESS on success */ + /* store for external read of iv, WOLF_SSL_SUCCESS on success */ int wolfSSL_StoreExternalIV(WOLFSSL_EVP_CIPHER_CTX* ctx) { WOLFSSL_ENTER("wolfSSL_StoreExternalIV"); if (ctx == NULL) { WOLFSSL_MSG("Bad function argument"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } switch (ctx->cipherType) { @@ -13139,14 +13139,14 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) default: { WOLFSSL_MSG("bad type"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } - /* set internal IV from external, SSL_SUCCESS on success */ + /* set internal IV from external, WOLF_SSL_SUCCESS on success */ int wolfSSL_SetInternalIV(WOLFSSL_EVP_CIPHER_CTX* ctx) { @@ -13154,7 +13154,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) if (ctx == NULL) { WOLFSSL_MSG("Bad function argument"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } switch (ctx->cipherType) { @@ -13206,14 +13206,14 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) default: { WOLFSSL_MSG("bad type"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } - /* SSL_SUCCESS on ok */ + /* WOLF_SSL_SUCCESS on ok */ int wolfSSL_EVP_DigestInit(WOLFSSL_EVP_MD_CTX* ctx, const WOLFSSL_EVP_MD* type) { @@ -13234,37 +13234,37 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) #endif if (XSTRNCMP(type, "SHA256", 6) == 0) { - ctx->macType = SHA256; + ctx->macType = WC_SHA256; ret = wolfSSL_SHA256_Init(&(ctx->hash.digest.sha256)); } #ifdef WOLFSSL_SHA224 else if (XSTRNCMP(type, "SHA224", 6) == 0) { - ctx->macType = SHA224; + ctx->macType = WC_SHA224; ret = wolfSSL_SHA224_Init(&(ctx->hash.digest.sha224)); } #endif #ifdef WOLFSSL_SHA384 else if (XSTRNCMP(type, "SHA384", 6) == 0) { - ctx->macType = SHA384; + ctx->macType = WC_SHA384; ret = wolfSSL_SHA384_Init(&(ctx->hash.digest.sha384)); } #endif #ifdef WOLFSSL_SHA512 else if (XSTRNCMP(type, "SHA512", 6) == 0) { - ctx->macType = SHA512; + ctx->macType = WC_SHA512; ret = wolfSSL_SHA512_Init(&(ctx->hash.digest.sha512)); } #endif #ifndef NO_MD5 else if (XSTRNCMP(type, "MD5", 3) == 0) { - ctx->macType = MD5; + ctx->macType = WC_MD5; ret = wolfSSL_MD5_Init(&(ctx->hash.digest.md5)); } #endif #ifndef NO_SHA /* has to be last since would pick or 224, 256, 384, or 512 too */ else if (XSTRNCMP(type, "SHA", 3) == 0) { - ctx->macType = SHA; + ctx->macType = WC_SHA; ret = wolfSSL_SHA_Init(&(ctx->hash.digest.sha)); } #endif /* NO_SHA */ @@ -13275,7 +13275,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) } - /* SSL_SUCCESS on ok */ + /* WOLF_SSL_SUCCESS on ok */ int wolfSSL_EVP_DigestUpdate(WOLFSSL_EVP_MD_CTX* ctx, const void* data, unsigned long sz) { @@ -13283,100 +13283,100 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) switch (ctx->macType) { #ifndef NO_MD5 - case MD5: + case WC_MD5: wolfSSL_MD5_Update((MD5_CTX*)&ctx->hash, data, (unsigned long)sz); break; #endif #ifndef NO_SHA - case SHA: + case WC_SHA: wolfSSL_SHA_Update((SHA_CTX*)&ctx->hash, data, (unsigned long)sz); break; #endif #ifdef WOLFSSL_SHA224 - case SHA224: + case WC_SHA224: wolfSSL_SHA224_Update((SHA224_CTX*)&ctx->hash, data, (unsigned long)sz); break; #endif #ifndef NO_SHA256 - case SHA256: + case WC_SHA256: wolfSSL_SHA256_Update((SHA256_CTX*)&ctx->hash, data, (unsigned long)sz); break; -#endif +#endif /* !NO_SHA256 */ #ifdef WOLFSSL_SHA384 - case SHA384: + case WC_SHA384: wolfSSL_SHA384_Update((SHA384_CTX*)&ctx->hash, data, (unsigned long)sz); break; #endif #ifdef WOLFSSL_SHA512 - case SHA512: + case WC_SHA512: wolfSSL_SHA512_Update((SHA512_CTX*)&ctx->hash, data, (unsigned long)sz); break; -#endif +#endif /* WOLFSSL_SHA512 */ default: return BAD_FUNC_ARG; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } - /* SSL_SUCCESS on ok */ + /* WOLF_SSL_SUCCESS on ok */ int wolfSSL_EVP_DigestFinal(WOLFSSL_EVP_MD_CTX* ctx, unsigned char* md, unsigned int* s) { WOLFSSL_ENTER("EVP_DigestFinal"); switch (ctx->macType) { #ifndef NO_MD5 - case MD5: + case WC_MD5: wolfSSL_MD5_Final(md, (MD5_CTX*)&ctx->hash); - if (s) *s = MD5_DIGEST_SIZE; + if (s) *s = WC_MD5_DIGEST_SIZE; break; #endif #ifndef NO_SHA - case SHA: + case WC_SHA: wolfSSL_SHA_Final(md, (SHA_CTX*)&ctx->hash); - if (s) *s = SHA_DIGEST_SIZE; + if (s) *s = WC_SHA_DIGEST_SIZE; break; #endif #ifdef WOLFSSL_SHA224 - case SHA224: + case WC_SHA224: wolfSSL_SHA224_Final(md, (SHA224_CTX*)&ctx->hash); - if (s) *s = SHA224_DIGEST_SIZE; + if (s) *s = WC_SHA224_DIGEST_SIZE; break; #endif #ifndef NO_SHA256 - case SHA256: + case WC_SHA256: wolfSSL_SHA256_Final(md, (SHA256_CTX*)&ctx->hash); - if (s) *s = SHA256_DIGEST_SIZE; + if (s) *s = WC_SHA256_DIGEST_SIZE; break; -#endif +#endif /* !NO_SHA256 */ #ifdef WOLFSSL_SHA384 - case SHA384: + case WC_SHA384: wolfSSL_SHA384_Final(md, (SHA384_CTX*)&ctx->hash); - if (s) *s = SHA384_DIGEST_SIZE; + if (s) *s = WC_SHA384_DIGEST_SIZE; break; #endif #ifdef WOLFSSL_SHA512 - case SHA512: + case WC_SHA512: wolfSSL_SHA512_Final(md, (SHA512_CTX*)&ctx->hash); - if (s) *s = SHA512_DIGEST_SIZE; + if (s) *s = WC_SHA512_DIGEST_SIZE; break; -#endif +#endif /* WOLFSSL_SHA512 */ default: return BAD_FUNC_ARG; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } - /* SSL_SUCCESS on ok */ + /* WOLF_SSL_SUCCESS on ok */ int wolfSSL_EVP_DigestFinal_ex(WOLFSSL_EVP_MD_CTX* ctx, unsigned char* md, unsigned int* s) { @@ -13403,9 +13403,9 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) return NULL; /* no static buffer support */ if (XSTRNCMP(evp_md, "MD5", 3) == 0) - type = MD5; + type = WC_MD5; else if (XSTRNCMP(evp_md, "SHA", 3) == 0) - type = SHA; + type = WC_SHA; else return NULL; @@ -13420,8 +13420,8 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) if (wc_HmacUpdate(hmac, d, n) == 0) { if (wc_HmacFinal(hmac, md) == 0) { if (md_len) - *md_len = (type == MD5) ? (int)MD5_DIGEST_SIZE - : (int)SHA_DIGEST_SIZE; + *md_len = (type == WC_MD5) ? (int)WC_MD5_DIGEST_SIZE + : (int)WC_SHA_DIGEST_SIZE; ret = md; } } @@ -13448,7 +13448,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) int wolfSSL_RAND_status(void) { - return SSL_SUCCESS; /* wolfCrypt provides enough seed internally */ + return WOLF_SSL_SUCCESS; /* wolfCrypt provides enough seed internally */ } @@ -13465,13 +13465,13 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) #ifndef NO_DES3 - /* SSL_SUCCESS on ok */ + /* WOLF_SSL_SUCCESS on ok */ int wolfSSL_DES_key_sched(WOLFSSL_const_DES_cblock* key, WOLFSSL_DES_key_schedule* schedule) { WOLFSSL_ENTER("DES_key_sched"); XMEMCPY(schedule, key, sizeof(const_DES_cblock)); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -13575,7 +13575,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) int wolfSSL_clear(WOLFSSL* ssl) { if (ssl == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } ssl->options.isClosed = 0; @@ -13600,20 +13600,20 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) #endif #ifndef NO_SHA if (wc_InitSha(&ssl->hsHashes->hashSha) != 0) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; #endif #endif #ifndef NO_SHA256 if (wc_InitSha256(&ssl->hsHashes->hashSha256) != 0) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; #endif #ifdef WOLFSSL_SHA384 if (wc_InitSha384(&ssl->hsHashes->hashSha384) != 0) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; #endif #ifdef WOLFSSL_SHA512 if (wc_InitSha512(&ssl->hsHashes->hashSha512) != 0) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; #endif } @@ -13622,7 +13622,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) InitX509(&ssl->peerCert, 0, ssl->heap); #endif - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -13636,13 +13636,13 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) ses->timeout = tmptime; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } long wolfSSL_CTX_set_mode(WOLFSSL_CTX* ctx, long mode) { - /* SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER is wolfSSL default mode */ + /* WOLF_SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER is wolfSSL default mode */ WOLFSSL_ENTER("SSL_CTX_set_mode"); if (mode == SSL_MODE_ENABLE_PARTIAL_WRITE) @@ -13684,7 +13684,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) (void)ctx; (void)sid_ctx; (void)sid_ctx_len; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -14243,19 +14243,19 @@ static void ExternalFreeX509(WOLFSSL_X509* x509) { WOLFSSL_ENTER("wolfSSL_X509_get_signature"); if (x509 == NULL || bufSz == NULL || *bufSz < (int)x509->sig.length) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; if (buf != NULL) XMEMCPY(buf, x509->sig.buffer, x509->sig.length); *bufSz = x509->sig.length; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* write X509 serial number in unsigned binary to buffer buffer needs to be at least EXTERNAL_SERIAL_SIZE (32) for all cases - return SSL_SUCCESS on success */ + return WOLF_SSL_SUCCESS on success */ int wolfSSL_X509_get_serial_number(WOLFSSL_X509* x509, byte* in, int* inOutSz) { @@ -14267,7 +14267,7 @@ static void ExternalFreeX509(WOLFSSL_X509* x509) XMEMCPY(in, x509->serial, x509->serialSz); *inOutSz = x509->serialSz; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -14410,19 +14410,19 @@ byte* wolfSSL_X509_get_hw_serial_number(WOLFSSL_X509* x509,byte* in, /* require OPENSSL_EXTRA since wolfSSL_X509_free is wrapped by OPENSSL_EXTRA */ #if !defined(NO_CERTS) && defined(OPENSSL_EXTRA) /* return 1 on success 0 on fail */ -int wolfSSL_sk_X509_push(STACK_OF(WOLFSSL_X509_NAME)* sk, WOLFSSL_X509* x509) +int wolfSSL_sk_X509_push(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk, WOLFSSL_X509* x509) { WOLFSSL_STACK* node; if (sk == NULL || x509 == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* no previous values in stack */ if (sk->data.x509 == NULL) { sk->data.x509 = x509; sk->num += 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* stack already has value(s) create a new node and add more */ @@ -14430,7 +14430,7 @@ int wolfSSL_sk_X509_push(STACK_OF(WOLFSSL_X509_NAME)* sk, WOLFSSL_X509* x509) DYNAMIC_TYPE_X509); if (node == NULL) { WOLFSSL_MSG("Memory error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XMEMSET(node, 0, sizeof(WOLFSSL_STACK)); @@ -14441,11 +14441,11 @@ int wolfSSL_sk_X509_push(STACK_OF(WOLFSSL_X509_NAME)* sk, WOLFSSL_X509* x509) sk->data.x509 = x509; sk->num += 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } -WOLFSSL_X509* wolfSSL_sk_X509_pop(STACK_OF(WOLFSSL_X509_NAME)* sk) { +WOLFSSL_X509* wolfSSL_sk_X509_pop(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk) { WOLFSSL_STACK* node; WOLFSSL_X509* x509; @@ -14474,7 +14474,7 @@ WOLFSSL_X509* wolfSSL_sk_X509_pop(STACK_OF(WOLFSSL_X509_NAME)* sk) { /* free structure for x509 stack */ -void wolfSSL_sk_X509_free(STACK_OF(WOLFSSL_X509_NAME)* sk) { +void wolfSSL_sk_X509_free(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk) { WOLFSSL_STACK* node; if (sk == NULL) { @@ -14603,7 +14603,7 @@ WOLFSSL_X509* wolfSSL_X509_load_certificate_file(const char* fname, int format) /* Check the inputs */ if ((fname == NULL) || - (format != SSL_FILETYPE_ASN1 && format != SSL_FILETYPE_PEM)) + (format != WOLF_SSL_FILETYPE_ASN1 && format != WOLF_SSL_FILETYPE_PEM)) return NULL; file = XFOPEN(fname, "rb"); @@ -14657,7 +14657,7 @@ WOLFSSL_X509* wolfSSL_X509_load_certificate_buffer( WOLFSSL_ENTER("wolfSSL_X509_load_certificate_ex"); - if (format == SSL_FILETYPE_PEM) { + if (format == WOLF_SSL_FILETYPE_PEM) { int ecc = 0; #ifdef WOLFSSL_SMALL_STACK EncryptedInfo* info = NULL; @@ -14779,20 +14779,20 @@ WOLFSSL_X509* wolfSSL_get_certificate(WOLFSSL* ssl) #ifdef OPENSSL_EXTRA /* return 1 on success 0 on fail */ -int wolfSSL_sk_ASN1_OBJECT_push(STACK_OF(WOLFSSL_ASN1_OBJEXT)* sk, +int wolfSSL_sk_ASN1_OBJECT_push(WOLF_STACK_OF(WOLFSSL_ASN1_OBJEXT)* sk, WOLFSSL_ASN1_OBJECT* obj) { WOLFSSL_STACK* node; if (sk == NULL || obj == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* no previous values in stack */ if (sk->data.obj == NULL) { sk->data.obj = obj; sk->num += 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* stack already has value(s) create a new node and add more */ @@ -14800,7 +14800,7 @@ int wolfSSL_sk_ASN1_OBJECT_push(STACK_OF(WOLFSSL_ASN1_OBJEXT)* sk, DYNAMIC_TYPE_ASN1); if (node == NULL) { WOLFSSL_MSG("Memory error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XMEMSET(node, 0, sizeof(WOLFSSL_STACK)); @@ -14811,12 +14811,12 @@ int wolfSSL_sk_ASN1_OBJECT_push(STACK_OF(WOLFSSL_ASN1_OBJEXT)* sk, sk->data.obj = obj; sk->num += 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } WOLFSSL_ASN1_OBJECT* wolfSSL_sk_ASN1_OBJCET_pop( - STACK_OF(WOLFSSL_ASN1_OBJECT)* sk) + WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)* sk) { WOLFSSL_STACK* node; WOLFSSL_ASN1_OBJECT* obj; @@ -14879,7 +14879,7 @@ void wolfSSL_ASN1_OBJECT_free(WOLFSSL_ASN1_OBJECT* obj) /* free structure for x509 stack */ -void wolfSSL_sk_ASN1_OBJECT_free(STACK_OF(WOLFSSL_ASN1_OBJECT)* sk) +void wolfSSL_sk_ASN1_OBJECT_free(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)* sk) { WOLFSSL_STACK* node; @@ -14956,8 +14956,8 @@ void wolfSSL_set_connect_state(WOLFSSL* ssl) int wolfSSL_get_shutdown(const WOLFSSL* ssl) { WOLFSSL_ENTER("wolfSSL_get_shutdown"); - /* in OpenSSL, SSL_SENT_SHUTDOWN = 1, when closeNotifySent * - * SSL_RECEIVED_SHUTDOWN = 2, from close notify or fatal err */ + /* in OpenSSL, WOLF_SSL_SENT_SHUTDOWN = 1, when closeNotifySent * + * WOLF_SSL_RECEIVED_SHUTDOWN = 2, from close notify or fatal err */ return ((ssl->options.closeNotify||ssl->options.connReset) << 1) | (ssl->options.sentNotify); } @@ -15576,7 +15576,7 @@ int wolfSSL_X509_LOOKUP_load_file(WOLFSSL_X509_LOOKUP* lookup, const char* file, long type) { #ifndef NO_FILESYSTEM - int ret = SSL_FAILURE; + int ret = WOLF_SSL_FAILURE; XFILE fp; long sz; byte* pem = NULL; @@ -15615,26 +15615,26 @@ int wolfSSL_X509_LOOKUP_load_file(WOLFSSL_X509_LOOKUP* lookup, WOLFSSL_CERT_MANAGER* cm = lookup->store->cm; if (cm->crl == NULL) { - if (wolfSSL_CertManagerEnableCRL(cm, 0) != SSL_SUCCESS) { + if (wolfSSL_CertManagerEnableCRL(cm, 0) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("Enable CRL failed"); goto end; } } - ret = BufferLoadCRL(cm->crl, curr, sz, SSL_FILETYPE_PEM, 1); - if (ret != SSL_SUCCESS) + ret = BufferLoadCRL(cm->crl, curr, sz, WOLF_SSL_FILETYPE_PEM, 1); + if (ret != WOLF_SSL_SUCCESS) goto end; #endif curr = (byte*)XSTRNSTR((char*)curr, END_X509_CRL, (unsigned int)sz); } else if (XSTRNSTR((char*)curr, BEGIN_CERT, (unsigned int)sz) != NULL) { x509 = wolfSSL_X509_load_certificate_buffer(curr, (int)sz, - SSL_FILETYPE_PEM); + WOLF_SSL_FILETYPE_PEM); if (x509 == NULL) goto end; ret = wolfSSL_X509_STORE_add_cert(lookup->store, x509); wolfSSL_X509_free(x509); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) goto end; curr = (byte*)XSTRNSTR((char*)curr, END_CERT, (unsigned int)sz); } @@ -15648,7 +15648,7 @@ int wolfSSL_X509_LOOKUP_load_file(WOLFSSL_X509_LOOKUP* lookup, sz -= (long)(curr - prev); prev = curr; } - while (ret == SSL_SUCCESS); + while (ret == WOLF_SSL_SUCCESS); end: if (pem != NULL) @@ -15659,7 +15659,7 @@ end: (void)lookup; (void)file; (void)type; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; #endif } @@ -15777,7 +15777,7 @@ WC_PKCS12* wolfSSL_d2i_PKCS12_bio(WOLFSSL_BIO* bio, WC_PKCS12** pkcs12) /* return 1 on success, 0 on failure */ int wolfSSL_PKCS12_parse(WC_PKCS12* pkcs12, const char* psw, - WOLFSSL_EVP_PKEY** pkey, WOLFSSL_X509** cert, STACK_OF(WOLFSSL_X509)** ca) + WOLFSSL_EVP_PKEY** pkey, WOLFSSL_X509** cert, WOLF_STACK_OF(WOLFSSL_X509)** ca) { DecodedCert DeCert; void* heap = NULL; @@ -15817,7 +15817,7 @@ int wolfSSL_PKCS12_parse(WC_PKCS12* pkcs12, const char* psw, if (certList != NULL) { WC_DerCertList* current = certList; - *ca = (STACK_OF(WOLFSSL_X509)*)XMALLOC(sizeof(STACK_OF(WOLFSSL_X509)), + *ca = (WOLF_STACK_OF(WOLFSSL_X509)*)XMALLOC(sizeof(WOLF_STACK_OF(WOLFSSL_X509)), heap, DYNAMIC_TYPE_X509); if (*ca == NULL) { if (pk != NULL) { @@ -15836,7 +15836,7 @@ int wolfSSL_PKCS12_parse(WC_PKCS12* pkcs12, const char* psw, } return 0; } - XMEMSET(*ca, 0, sizeof(STACK_OF(WOLFSSL_X509))); + XMEMSET(*ca, 0, sizeof(WOLF_STACK_OF(WOLFSSL_X509))); /* add list of DER certs as X509's to stack */ while (current != NULL) { @@ -16054,7 +16054,7 @@ WOLFSSL_STACK* wolfSSL_X509_STORE_CTX_get_chain(WOLFSSL_X509_STORE_CTX* ctx) int wolfSSL_X509_STORE_add_cert(WOLFSSL_X509_STORE* store, WOLFSSL_X509* x509) { - int result = SSL_FATAL_ERROR; + int result = WOLF_SSL_FATAL_ERROR; WOLFSSL_ENTER("wolfSSL_X509_STORE_add_cert"); if (store != NULL && store->cm != NULL && x509 != NULL @@ -16073,8 +16073,8 @@ int wolfSSL_X509_STORE_add_cert(WOLFSSL_X509_STORE* store, WOLFSSL_X509* x509) WOLFSSL_LEAVE("wolfSSL_X509_STORE_add_cert", result); - if (result != SSL_SUCCESS) { - result = SSL_FATAL_ERROR; + if (result != WOLF_SSL_SUCCESS) { + result = WOLF_SSL_FATAL_ERROR; } return result; @@ -16113,7 +16113,7 @@ void wolfSSL_X509_STORE_free(WOLFSSL_X509_STORE* store) int wolfSSL_X509_STORE_set_flags(WOLFSSL_X509_STORE* store, unsigned long flag) { - int ret = SSL_SUCCESS; + int ret = WOLF_SSL_SUCCESS; WOLFSSL_ENTER("wolfSSL_X509_STORE_set_flags"); @@ -16131,7 +16131,7 @@ int wolfSSL_X509_STORE_set_flags(WOLFSSL_X509_STORE* store, unsigned long flag) int wolfSSL_X509_STORE_set_default_paths(WOLFSSL_X509_STORE* store) { (void)store; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -16159,7 +16159,7 @@ WOLFSSL_X509_STORE_CTX* wolfSSL_X509_STORE_CTX_new(void) int wolfSSL_X509_STORE_CTX_init(WOLFSSL_X509_STORE_CTX* ctx, - WOLFSSL_X509_STORE* store, WOLFSSL_X509* x509, STACK_OF(WOLFSSL_X509)* sk) + WOLFSSL_X509_STORE* store, WOLFSSL_X509* x509, WOLF_STACK_OF(WOLFSSL_X509)* sk) { (void)sk; WOLFSSL_ENTER("wolfSSL_X509_STORE_CTX_init"); @@ -16175,9 +16175,9 @@ int wolfSSL_X509_STORE_CTX_init(WOLFSSL_X509_STORE_CTX* ctx, ctx->error = 0; ctx->error_depth = 0; ctx->discardSessionCerts = 0; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } @@ -16208,9 +16208,9 @@ int wolfSSL_X509_verify_cert(WOLFSSL_X509_STORE_CTX* ctx) return wolfSSL_CertManagerVerifyBuffer(ctx->store->cm, ctx->current_cert->derCert->buffer, ctx->current_cert->derCert->length, - SSL_FILETYPE_ASN1); + WOLF_SSL_FILETYPE_ASN1); } - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #endif /* NO_CERTS */ @@ -16557,8 +16557,8 @@ unsigned long wolfSSL_set_options(WOLFSSL* ssl, unsigned long op) WOLFSSL_MSG("\tSSL_OP_COOKIE_EXCHANGE : on by default"); } - if ((ssl->options.mask & SSL_OP_NO_SSLv2) == SSL_OP_NO_SSLv2) { - WOLFSSL_MSG("\tSSL_OP_NO_SSLv2 : wolfSSL does not support SSLv2"); + if ((ssl->options.mask & WOLF_SSL_OP_NO_SSLv2) == WOLF_SSL_OP_NO_SSLv2) { + WOLFSSL_MSG("\tWOLF_SSL_OP_NO_SSLv2 : wolfSSL does not support SSLv2"); } if ((ssl->options.mask & SSL_OP_NO_TLSv1_3) == SSL_OP_NO_TLSv1_3) { @@ -16656,7 +16656,7 @@ long wolfSSL_set_tmp_dh(WOLFSSL *ssl, WOLFSSL_DH *dh) gSz = wolfSSL_BN_bn2bin(dh->g, NULL); if (pSz <= 0 || gSz <= 0) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; p = (byte*)XMALLOC(pSz, ssl->heap, DYNAMIC_TYPE_PUBLIC_KEY); if (!p) @@ -16677,7 +16677,7 @@ long wolfSSL_set_tmp_dh(WOLFSSL *ssl, WOLFSSL_DH *dh) XFREE(p, ssl->heap, DYNAMIC_TYPE_PUBLIC_KEY); XFREE(g, ssl->heap, DYNAMIC_TYPE_PUBLIC_KEY); - return pSz > 0 && gSz > 0 ? ret : SSL_FATAL_ERROR; + return pSz > 0 && gSz > 0 ? ret : WOLF_SSL_FATAL_ERROR; } #endif /* !NO_DH */ @@ -16686,11 +16686,11 @@ long wolfSSL_set_tmp_dh(WOLFSSL *ssl, WOLFSSL_DH *dh) long wolfSSL_set_tlsext_debug_arg(WOLFSSL* ssl, void *arg) { if (ssl == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } ssl->loggingCtx = arg; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* HAVE_PK_CALLBACKS */ @@ -16708,7 +16708,7 @@ WOLFSSL_API int wolfSSL_sk_SSL_COMP_zero(WOLFSSL_STACK* st) (void)st; WOLFSSL_STUB("wolfSSL_sk_SSL_COMP_zero"); //wolfSSL_set_options(ssl, SSL_OP_NO_COMPRESSION); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -16718,7 +16718,7 @@ WOLFSSL_API long wolfSSL_set_tlsext_status_type(WOLFSSL *s, int type) (void)s; (void)type; WOLFSSL_STUB("wolfSSL_set_tlsext_status_type"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /*** TBD ***/ @@ -16727,7 +16727,7 @@ WOLFSSL_API long wolfSSL_get_tlsext_status_exts(WOLFSSL *s, void *arg) (void)s; (void)arg; WOLFSSL_STUB("wolfSSL_get_tlsext_status_exts"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /*** TBD ***/ @@ -16736,7 +16736,7 @@ WOLFSSL_API long wolfSSL_set_tlsext_status_exts(WOLFSSL *s, void *arg) (void)s; (void)arg; WOLFSSL_STUB("wolfSSL_set_tlsext_status_exts"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /*** TBD ***/ @@ -16745,7 +16745,7 @@ WOLFSSL_API long wolfSSL_get_tlsext_status_ids(WOLFSSL *s, void *arg) (void)s; (void)arg; WOLFSSL_STUB("wolfSSL_get_tlsext_status_ids"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /*** TBD ***/ @@ -16754,7 +16754,7 @@ WOLFSSL_API long wolfSSL_set_tlsext_status_ids(WOLFSSL *s, void *arg) (void)s; (void)arg; WOLFSSL_STUB("wolfSSL_set_tlsext_status_ids"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /*** TBD ***/ @@ -16764,7 +16764,7 @@ WOLFSSL_API int SSL_SESSION_set1_id(WOLFSSL_SESSION *s, const unsigned char *sid (void)sid; (void)sid_len; WOLFSSL_STUB("SSL_SESSION_set1_id"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /*** TBD ***/ @@ -16774,7 +16774,7 @@ WOLFSSL_API int SSL_SESSION_set1_id_context(WOLFSSL_SESSION *s, const unsigned c (void)sid_ctx; (void)sid_ctx_len; WOLFSSL_STUB("SSL_SESSION_set1_id_context"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /*** TBD ***/ @@ -16812,7 +16812,7 @@ WOLFSSL_API int X509_PUBKEY_get0_param(WOLFSSL_ASN1_OBJECT **ppkalg, const unsig (void)pa; (void)pub; WOLFSSL_STUB("X509_PUBKEY_get0_param"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /*** TBD ***/ @@ -16828,7 +16828,7 @@ WOLFSSL_API int EVP_PKEY_bits(WOLFSSL_EVP_PKEY *pkey) { (void)pkey; WOLFSSL_STUB("EVP_PKEY_bits"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /*** TBD ***/ @@ -16858,7 +16858,7 @@ WOLFSSL_API size_t SSL_get_finished(const WOLFSSL *s, void *buf, size_t count) (void)buf; (void)count; WOLFSSL_STUB("SSL_get_finished"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /*** TBD ***/ @@ -16868,7 +16868,7 @@ WOLFSSL_API size_t SSL_get_peer_finished(const WOLFSSL *s, void *buf, size_t cou (void)buf; (void)count; WOLFSSL_STUB("SSL_get_peer_finished"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #endif /* WOLFSSL_HAPROXY */ @@ -16881,7 +16881,7 @@ WOLFSSL_API void SSL_CTX_set_tmp_dh_callback(WOLFSSL_CTX *ctx, WOLFSSL_DH *(*dh) } /*** TBD ***/ -WOLFSSL_API STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void) +WOLFSSL_API WOLF_STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void) { WOLFSSL_STUB("SSL_COMP_get_compression_methods"); return NULL; @@ -16926,7 +16926,7 @@ WOLFSSL_API int X509_STORE_load_locations(WOLFSSL_X509_STORE *ctx, const char *f (void)file; (void)dir; WOLFSSL_STUB("X509_STORE_load_locations"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /*** TBD ***/ @@ -16956,19 +16956,19 @@ WOLFSSL_API long wolfSSL_set_tlsext_status_ocsp_resp(WOLFSSL *s, unsigned char *resp, int len) { if (s == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; s->ocspResp = resp; s->ocspRespSz = len; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } long wolfSSL_get_verify_result(const WOLFSSL *ssl) { if (ssl == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } return ssl->peerVerifyRet; @@ -17073,22 +17073,22 @@ long wolfSSL_CTX_add_extra_chain_cert(WOLFSSL_CTX* ctx, WOLFSSL_X509* x509) if (ctx == NULL || x509 == NULL) { WOLFSSL_MSG("Bad Argument"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } der = wolfSSL_X509_get_der(x509, &derSz); if (der == NULL || derSz <= 0) { WOLFSSL_MSG("Error getting X509 DER"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (ctx->certificate == NULL) { /* Process buffer makes first certificate the leaf. */ - ret = ProcessBuffer(ctx, der, derSz, SSL_FILETYPE_ASN1, CERT_TYPE, + ret = ProcessBuffer(ctx, der, derSz, WOLF_SSL_FILETYPE_ASN1, CERT_TYPE, NULL, NULL, 1); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { WOLFSSL_LEAVE("wolfSSL_CTX_add_extra_chain_cert", ret); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } else { @@ -17096,13 +17096,13 @@ long wolfSSL_CTX_add_extra_chain_cert(WOLFSSL_CTX* ctx, WOLFSSL_X509* x509) ret = AllocDer(&derBuffer, derSz, CERT_TYPE, ctx->heap); if (ret != 0) { WOLFSSL_MSG("Memory Error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XMEMCPY(derBuffer->buffer, der, derSz); ret = AddCA(ctx->cm, &derBuffer, WOLFSSL_USER_CA, !ctx->verifyNone); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { WOLFSSL_LEAVE("wolfSSL_CTX_add_extra_chain_cert", ret); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* adding cert to existing chain */ @@ -17114,7 +17114,7 @@ long wolfSSL_CTX_add_extra_chain_cert(WOLFSSL_CTX* ctx, WOLFSSL_X509* x509) chain = (byte*)XMALLOC(chainSz, ctx->heap, DYNAMIC_TYPE_DER); if (chain == NULL) { WOLFSSL_MSG("Memory Error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (ctx->certChain != NULL && ctx->certChain->length > 0) { @@ -17141,18 +17141,18 @@ long wolfSSL_CTX_add_extra_chain_cert(WOLFSSL_CTX* ctx, WOLFSSL_X509* x509) if (chain != NULL) XFREE(chain, ctx->heap, DYNAMIC_TYPE_DER); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } long wolfSSL_CTX_set_tlsext_status_arg(WOLFSSL_CTX* ctx, void* arg) { if (ctx == NULL || ctx->cm == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } ctx->cm->ocspIOCtx = arg; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* NO_CERTS */ @@ -17169,7 +17169,7 @@ WOLFSSL_API long wolfSSL_CTX_get_session_cache_mode(WOLFSSL_CTX* ctx) int wolfSSL_CTX_get_read_ahead(WOLFSSL_CTX* ctx) { if (ctx == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } return ctx->readAhead; @@ -17179,12 +17179,12 @@ int wolfSSL_CTX_get_read_ahead(WOLFSSL_CTX* ctx) int wolfSSL_CTX_set_read_ahead(WOLFSSL_CTX* ctx, int v) { if (ctx == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } ctx->readAhead = (byte)v; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -17192,11 +17192,11 @@ long wolfSSL_CTX_set_tlsext_opaque_prf_input_callback_arg(WOLFSSL_CTX* ctx, void* arg) { if (ctx == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } ctx->userPRFArg = arg; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -17781,7 +17781,7 @@ char* wolfSSL_X509_get_subjectCN(WOLFSSL_X509* x509) #ifdef FORTRESS int wolfSSL_cmp_peer_cert_to_file(WOLFSSL* ssl, const char *fname) { - int ret = SSL_FATAL_ERROR; + int ret = WOLF_SSL_FATAL_ERROR; WOLFSSL_ENTER("wolfSSL_cmp_peer_cert_to_file"); if (ssl != NULL && fname != NULL) @@ -17804,7 +17804,7 @@ int wolfSSL_cmp_peer_cert_to_file(WOLFSSL* ssl, const char *fname) file = XFOPEN(fname, "rb"); if (file == XBADFILE) - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; XFSEEK(file, 0, XSEEK_END); sz = XFTELL(file); @@ -17862,7 +17862,7 @@ int wolfSSL_cmp_peer_cert_to_file(WOLFSSL* ssl, const char *fname) static WC_RNG globalRNG; static int initGlobalRNG = 0; -/* SSL_SUCCESS on ok */ +/* WOLF_SSL_SUCCESS on ok */ int wolfSSL_RAND_seed(const void* seed, int len) { @@ -17879,11 +17879,11 @@ int wolfSSL_RAND_seed(const void* seed, int len) initGlobalRNG = 1; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } -/* SSL_SUCCESS on ok */ +/* WOLF_SSL_SUCCESS on ok */ int wolfSSL_RAND_bytes(unsigned char* buf, int num) { int ret = 0; @@ -17914,7 +17914,7 @@ int wolfSSL_RAND_bytes(unsigned char* buf, int num) if (wc_RNG_GenerateBlock(rng, buf, num) != 0) WOLFSSL_MSG("Bad wc_RNG_GenerateBlock"); else - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; } if (initTmpRng) @@ -18017,7 +18017,7 @@ void wolfSSL_BN_clear_free(WOLFSSL_BIGNUM* bn) } -/* SSL_SUCCESS on ok */ +/* WOLF_SSL_SUCCESS on ok */ int wolfSSL_BN_sub(WOLFSSL_BIGNUM* r, const WOLFSSL_BIGNUM* a, const WOLFSSL_BIGNUM* b) { @@ -18028,7 +18028,7 @@ int wolfSSL_BN_sub(WOLFSSL_BIGNUM* r, const WOLFSSL_BIGNUM* a, if (mp_sub((mp_int*)a->internal,(mp_int*)b->internal, (mp_int*)r->internal) == MP_OKAY) - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; WOLFSSL_MSG("wolfSSL_BN_sub mp_sub failed"); return 0; @@ -18046,7 +18046,7 @@ int wolfSSL_BN_mod(WOLFSSL_BIGNUM* r, const WOLFSSL_BIGNUM* a, if (mp_mod((mp_int*)a->internal,(mp_int*)b->internal, (mp_int*)r->internal) == MP_OKAY) - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; WOLFSSL_MSG("wolfSSL_BN_mod mp_mod failed"); return 0; @@ -18064,18 +18064,18 @@ int wolfSSL_BN_mod_exp(WOLFSSL_BIGNUM *r, const WOLFSSL_BIGNUM *a, (void) ctx; if (r == NULL || a == NULL || p == NULL || m == NULL) { WOLFSSL_MSG("Bad Argument"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if ((ret = mp_exptmod((mp_int*)a->internal,(mp_int*)p->internal, (mp_int*)m->internal, (mp_int*)r->internal)) == MP_OKAY) { - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } WOLFSSL_LEAVE("wolfSSL_BN_mod_exp", ret); (void)ret; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } const WOLFSSL_BIGNUM* wolfSSL_BN_value_one(void) @@ -18105,7 +18105,7 @@ int wolfSSL_BN_num_bytes(const WOLFSSL_BIGNUM* bn) WOLFSSL_MSG("wolfSSL_BN_num_bytes"); if (bn == NULL || bn->internal == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; return mp_unsigned_bin_size((mp_int*)bn->internal); } @@ -18117,7 +18117,7 @@ int wolfSSL_BN_num_bits(const WOLFSSL_BIGNUM* bn) WOLFSSL_MSG("wolfSSL_BN_num_bits"); if (bn == NULL || bn->internal == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; return mp_count_bits((mp_int*)bn->internal); } @@ -18129,12 +18129,12 @@ int wolfSSL_BN_is_zero(const WOLFSSL_BIGNUM* bn) WOLFSSL_MSG("wolfSSL_BN_is_zero"); if (bn == NULL || bn->internal == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; if (mp_iszero((mp_int*)bn->internal) == MP_YES) - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* return compliant with OpenSSL @@ -18144,12 +18144,12 @@ int wolfSSL_BN_is_one(const WOLFSSL_BIGNUM* bn) WOLFSSL_MSG("wolfSSL_BN_is_one"); if (bn == NULL || bn->internal == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; if (mp_cmp_d((mp_int*)bn->internal, 1) == MP_EQ) - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* return compliant with OpenSSL @@ -18159,12 +18159,12 @@ int wolfSSL_BN_is_odd(const WOLFSSL_BIGNUM* bn) WOLFSSL_MSG("wolfSSL_BN_is_odd"); if (bn == NULL || bn->internal == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; if (mp_isodd((mp_int*)bn->internal) == MP_YES) - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* return compliant with OpenSSL @@ -18177,7 +18177,7 @@ int wolfSSL_BN_cmp(const WOLFSSL_BIGNUM* a, const WOLFSSL_BIGNUM* b) WOLFSSL_MSG("wolfSSL_BN_cmp"); if (a == NULL || a->internal == NULL || b == NULL || b->internal == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; ret = mp_cmp((mp_int*)a->internal, (mp_int*)b->internal); @@ -18192,7 +18192,7 @@ int wolfSSL_BN_bn2bin(const WOLFSSL_BIGNUM* bn, unsigned char* r) if (bn == NULL || bn->internal == NULL) { WOLFSSL_MSG("NULL bn error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (r == NULL) @@ -18200,7 +18200,7 @@ int wolfSSL_BN_bn2bin(const WOLFSSL_BIGNUM* bn, unsigned char* r) if (mp_to_unsigned_bin((mp_int*)bn->internal, r) != MP_OKAY) { WOLFSSL_MSG("mp_to_unsigned_bin error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } return mp_unsigned_bin_size((mp_int*)bn->internal); @@ -18243,11 +18243,11 @@ int wolfSSL_mask_bits(WOLFSSL_BIGNUM* bn, int n) (void)n; WOLFSSL_MSG("wolfSSL_BN_mask_bits"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } -/* SSL_SUCCESS on ok */ +/* WOLF_SSL_SUCCESS on ok */ int wolfSSL_BN_rand(WOLFSSL_BIGNUM* bn, int bits, int top, int bottom) { int ret = 0; @@ -18298,7 +18298,7 @@ int wolfSSL_BN_rand(WOLFSSL_BIGNUM* bn, int bits, int top, int bottom) if (mp_read_unsigned_bin((mp_int*)bn->internal,buff,len) != MP_OKAY) WOLFSSL_MSG("mp read bin failed"); else - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; } } @@ -18320,12 +18320,12 @@ int wolfSSL_BN_is_bit_set(const WOLFSSL_BIGNUM* bn, int n) { if (bn == NULL || bn->internal == NULL) { WOLFSSL_MSG("bn NULL error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (n > DIGIT_BIT) { WOLFSSL_MSG("input bit count too large"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } return mp_is_bit_set((mp_int*)bn->internal, (mp_digit)n); @@ -18338,15 +18338,15 @@ int wolfSSL_BN_set_bit(WOLFSSL_BIGNUM* bn, int n) { if (bn == NULL || bn->internal == NULL) { WOLFSSL_MSG("bn NULL error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (mp_set_bit((mp_int*)bn->internal, n) != MP_OKAY) { WOLFSSL_MSG("mp_set_int error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -18390,7 +18390,7 @@ int wolfSSL_BN_hex2bn(WOLFSSL_BIGNUM** bn, const char* str) else if (wolfSSL_BN_bin2bn(decoded, decSz, *bn) == NULL) WOLFSSL_MSG("Bad bin2bn error"); else - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; } #ifdef WOLFSSL_SMALL_STACK @@ -18453,10 +18453,10 @@ int wolfSSL_BN_set_word(WOLFSSL_BIGNUM* bn, WOLFSSL_BN_ULONG w) if (mp_set_int((mp_int*)bn->internal, w) != MP_OKAY) { WOLFSSL_MSG("mp_init_set_int error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* return code compliant with OpenSSL : @@ -18469,7 +18469,7 @@ int wolfSSL_BN_dec2bn(WOLFSSL_BIGNUM** bn, const char* str) WOLFSSL_MSG("wolfSSL_BN_dec2bn"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -18524,15 +18524,15 @@ int wolfSSL_BN_lshift(WOLFSSL_BIGNUM *r, const WOLFSSL_BIGNUM *bn, int n) if (r == NULL || r->internal == NULL || bn == NULL || bn->internal == NULL){ WOLFSSL_MSG("bn NULL error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (mp_mul_2d((mp_int*)bn->internal, n, (mp_int*)r->internal) != MP_OKAY) { WOLFSSL_MSG("mp_mul_2d error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* return code compliant with OpenSSL : @@ -18544,16 +18544,16 @@ int wolfSSL_BN_rshift(WOLFSSL_BIGNUM *r, const WOLFSSL_BIGNUM *bn, int n) if (r == NULL || r->internal == NULL || bn == NULL || bn->internal == NULL){ WOLFSSL_MSG("bn NULL error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (mp_div_2d((mp_int*)bn->internal, n, (mp_int*)r->internal, NULL) != MP_OKAY) { WOLFSSL_MSG("mp_mul_2d error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* return code compliant with OpenSSL : @@ -18565,15 +18565,15 @@ int wolfSSL_BN_add_word(WOLFSSL_BIGNUM *bn, WOLFSSL_BN_ULONG w) if (bn == NULL || bn->internal == NULL) { WOLFSSL_MSG("bn NULL error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (mp_add_d((mp_int*)bn->internal, w, (mp_int*)bn->internal) != MP_OKAY) { WOLFSSL_MSG("mp_add_d error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* return code compliant with OpenSSL : @@ -18586,16 +18586,16 @@ int wolfSSL_BN_add(WOLFSSL_BIGNUM *r, WOLFSSL_BIGNUM *a, WOLFSSL_BIGNUM *b) if (r == NULL || r->internal == NULL || a == NULL || a->internal == NULL || b == NULL || b->internal == NULL) { WOLFSSL_MSG("bn NULL error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (mp_add((mp_int*)a->internal, (mp_int*)b->internal, (mp_int*)r->internal) != MP_OKAY) { WOLFSSL_MSG("mp_add_d error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #ifdef WOLFSSL_KEY_GEN @@ -18615,20 +18615,20 @@ int wolfSSL_BN_is_prime_ex(const WOLFSSL_BIGNUM *bn, int nbchecks, if (bn == NULL || bn->internal == NULL) { WOLFSSL_MSG("bn NULL error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (mp_prime_is_prime((mp_int*)bn->internal, nbchecks, &res) != MP_OKAY) { WOLFSSL_MSG("mp_prime_is_prime error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (res != MP_YES) { WOLFSSL_MSG("mp_prime_is_prime not prime"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* return code compliant with OpenSSL : @@ -18643,12 +18643,12 @@ WOLFSSL_BN_ULONG wolfSSL_BN_mod_word(const WOLFSSL_BIGNUM *bn, if (bn == NULL || bn->internal == NULL) { WOLFSSL_MSG("bn NULL error"); - return (WOLFSSL_BN_ULONG)SSL_FATAL_ERROR; + return (WOLFSSL_BN_ULONG)WOLF_SSL_FATAL_ERROR; } if (mp_mod_d((mp_int*)bn->internal, w, &ret) != MP_OKAY) { WOLFSSL_MSG("mp_add_d error"); - return (WOLFSSL_BN_ULONG)SSL_FATAL_ERROR; + return (WOLFSSL_BN_ULONG)WOLF_SSL_FATAL_ERROR; } return ret; @@ -18699,19 +18699,19 @@ int wolfSSL_BN_print_fp(FILE *fp, const WOLFSSL_BIGNUM *bn) if (fp == NULL || bn == NULL || bn->internal == NULL) { WOLFSSL_MSG("bn NULL error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } buf = wolfSSL_BN_bn2hex(bn); if (buf == NULL) { WOLFSSL_MSG("wolfSSL_BN_bn2hex failure"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } fprintf(fp, "%s", buf); XFREE(buf, NULL, DYNAMIC_TYPE_ECC); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* !defined(NO_FILESYSTEM) */ @@ -18737,7 +18737,7 @@ int wolfSSL_BN_print_fp(FILE *fp, const WOLFSSL_BIGNUM *bn) WOLFSSL_MSG("wolfSSL_BN_print_fp not implemented"); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* !defined(NO_FILESYSTEM) */ @@ -18836,7 +18836,7 @@ void wolfSSL_DH_free(WOLFSSL_DH* dh) static int SetDhInternal(WOLFSSL_DH* dh) { - int ret = SSL_FATAL_ERROR; + int ret = WOLF_SSL_FATAL_ERROR; int pSz = 1024; int gSz = 1024; #ifdef WOLFSSL_SMALL_STACK @@ -18876,7 +18876,7 @@ static int SetDhInternal(WOLFSSL_DH* dh) WOLFSSL_MSG("Bad DH SetKey"); else { dh->inSet = 1; - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; } #ifdef WOLFSSL_SMALL_STACK @@ -18897,7 +18897,7 @@ int wolfSSL_DH_size(WOLFSSL_DH* dh) WOLFSSL_MSG("wolfSSL_DH_size"); if (dh == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; return wolfSSL_BN_num_bytes(dh->p); } @@ -18908,7 +18908,7 @@ int wolfSSL_DH_size(WOLFSSL_DH* dh) */ int wolfSSL_DH_generate_key(WOLFSSL_DH* dh) { - int ret = SSL_FAILURE; + int ret = WOLF_SSL_FAILURE; word32 pubSz = 768; word32 privSz = 768; int initTmpRng = 0; @@ -18940,7 +18940,7 @@ int wolfSSL_DH_generate_key(WOLFSSL_DH* dh) if (dh == NULL || dh->p == NULL || dh->g == NULL) WOLFSSL_MSG("Bad function arguments"); - else if (dh->inSet == 0 && SetDhInternal(dh) != SSL_SUCCESS) + else if (dh->inSet == 0 && SetDhInternal(dh) != WOLF_SSL_SUCCESS) WOLFSSL_MSG("Bad DH set internal"); else if (wc_InitRng(tmpRNG) == 0) { rng = tmpRNG; @@ -18981,7 +18981,7 @@ int wolfSSL_DH_generate_key(WOLFSSL_DH* dh) else if (wolfSSL_BN_bin2bn(priv, privSz, dh->priv_key) == NULL) WOLFSSL_MSG("Bad DH bn2bin error priv"); else - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; } } } @@ -19005,7 +19005,7 @@ int wolfSSL_DH_generate_key(WOLFSSL_DH* dh) int wolfSSL_DH_compute_key(unsigned char* key, WOLFSSL_BIGNUM* otherPub, WOLFSSL_DH* dh) { - int ret = SSL_FATAL_ERROR; + int ret = WOLF_SSL_FATAL_ERROR; word32 keySz = 0; word32 pubSz = 1024; word32 privSz = 1024; @@ -19267,14 +19267,14 @@ static int SetIndividualExternal(WOLFSSL_BIGNUM** bn, mp_int* mpi) if (mpi == NULL || bn == NULL) { WOLFSSL_MSG("mpi NULL error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (*bn == NULL) { *bn = wolfSSL_BN_new(); if (*bn == NULL) { WOLFSSL_MSG("SetIndividualExternal alloc failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } dynamic = 1; } @@ -19284,10 +19284,10 @@ static int SetIndividualExternal(WOLFSSL_BIGNUM** bn, mp_int* mpi) if (dynamic == 1) { wolfSSL_BN_free(*bn); } - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } static int SetIndividualInternal(WOLFSSL_BIGNUM* bn, mp_int* mpi) @@ -19296,20 +19296,20 @@ static int SetIndividualInternal(WOLFSSL_BIGNUM* bn, mp_int* mpi) if (bn == NULL || bn->internal == NULL) { WOLFSSL_MSG("bn NULL error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (mpi == NULL || (mp_init(mpi) != MP_OKAY)) { WOLFSSL_MSG("mpi NULL error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (mp_copy((mp_int*)bn->internal, mpi) != MP_OKAY) { WOLFSSL_MSG("mp_copy error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -19338,7 +19338,7 @@ WOLFSSL_BIGNUM *wolfSSL_ASN1_INTEGER_to_BN(const WOLFSSL_ASN1_INTEGER *ai, ret = SetIndividualExternal(&bn, &mpi); mp_clear(&mpi); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { return NULL; } return bn; @@ -19364,24 +19364,24 @@ WOLFSSL_DH *wolfSSL_DSA_dup_DH(const WOLFSSL_DSA *dsa) key = (DhKey*)dh->internal; if (dsa->p != NULL && - SetIndividualInternal(((WOLFSSL_DSA*)dsa)->p, &key->p) != SSL_SUCCESS) { + SetIndividualInternal(((WOLFSSL_DSA*)dsa)->p, &key->p) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa p key error"); wolfSSL_DH_free(dh); return NULL; } if (dsa->g != NULL && - SetIndividualInternal(((WOLFSSL_DSA*)dsa)->g, &key->g) != SSL_SUCCESS) { + SetIndividualInternal(((WOLFSSL_DSA*)dsa)->g, &key->g) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa g key error"); wolfSSL_DH_free(dh); return NULL; } - if (SetIndividualExternal(&dh->p, &key->p) != SSL_SUCCESS) { + if (SetIndividualExternal(&dh->p, &key->p) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("dsa p key error"); wolfSSL_DH_free(dh); return NULL; } - if (SetIndividualExternal(&dh->g, &key->g) != SSL_SUCCESS) { + if (SetIndividualExternal(&dh->g, &key->g) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("dsa g key error"); wolfSSL_DH_free(dh); return NULL; @@ -19403,39 +19403,39 @@ static int SetDsaExternal(WOLFSSL_DSA* dsa) if (dsa == NULL || dsa->internal == NULL) { WOLFSSL_MSG("dsa key NULL error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } key = (DsaKey*)dsa->internal; - if (SetIndividualExternal(&dsa->p, &key->p) != SSL_SUCCESS) { + if (SetIndividualExternal(&dsa->p, &key->p) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("dsa p key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetIndividualExternal(&dsa->q, &key->q) != SSL_SUCCESS) { + if (SetIndividualExternal(&dsa->q, &key->q) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("dsa q key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetIndividualExternal(&dsa->g, &key->g) != SSL_SUCCESS) { + if (SetIndividualExternal(&dsa->g, &key->g) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("dsa g key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetIndividualExternal(&dsa->pub_key, &key->y) != SSL_SUCCESS) { + if (SetIndividualExternal(&dsa->pub_key, &key->y) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("dsa y key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetIndividualExternal(&dsa->priv_key, &key->x) != SSL_SUCCESS) { + if (SetIndividualExternal(&dsa->priv_key, &key->x) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("dsa x key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } dsa->exSet = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* Openssl -> WolfSSL */ @@ -19446,33 +19446,33 @@ static int SetDsaInternal(WOLFSSL_DSA* dsa) if (dsa == NULL || dsa->internal == NULL) { WOLFSSL_MSG("dsa key NULL error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } key = (DsaKey*)dsa->internal; if (dsa->p != NULL && - SetIndividualInternal(dsa->p, &key->p) != SSL_SUCCESS) { + SetIndividualInternal(dsa->p, &key->p) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa p key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (dsa->q != NULL && - SetIndividualInternal(dsa->q, &key->q) != SSL_SUCCESS) { + SetIndividualInternal(dsa->q, &key->q) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa q key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (dsa->g != NULL && - SetIndividualInternal(dsa->g, &key->g) != SSL_SUCCESS) { + SetIndividualInternal(dsa->g, &key->g) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa g key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (dsa->pub_key != NULL) { - if (SetIndividualInternal(dsa->pub_key, &key->y) != SSL_SUCCESS) { + if (SetIndividualInternal(dsa->pub_key, &key->y) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa pub_key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* public key */ @@ -19480,9 +19480,9 @@ static int SetDsaInternal(WOLFSSL_DSA* dsa) } if (dsa->priv_key != NULL) { - if (SetIndividualInternal(dsa->priv_key, &key->x) != SSL_SUCCESS) { + if (SetIndividualInternal(dsa->priv_key, &key->x) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa priv_key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* private key */ @@ -19491,7 +19491,7 @@ static int SetDsaInternal(WOLFSSL_DSA* dsa) dsa->inSet = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* NO_DSA */ @@ -19506,54 +19506,54 @@ static int SetRsaExternal(WOLFSSL_RSA* rsa) if (rsa == NULL || rsa->internal == NULL) { WOLFSSL_MSG("rsa key NULL error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } key = (RsaKey*)rsa->internal; - if (SetIndividualExternal(&rsa->n, &key->n) != SSL_SUCCESS) { + if (SetIndividualExternal(&rsa->n, &key->n) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa n key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetIndividualExternal(&rsa->e, &key->e) != SSL_SUCCESS) { + if (SetIndividualExternal(&rsa->e, &key->e) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa e key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetIndividualExternal(&rsa->d, &key->d) != SSL_SUCCESS) { + if (SetIndividualExternal(&rsa->d, &key->d) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa d key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetIndividualExternal(&rsa->p, &key->p) != SSL_SUCCESS) { + if (SetIndividualExternal(&rsa->p, &key->p) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa p key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetIndividualExternal(&rsa->q, &key->q) != SSL_SUCCESS) { + if (SetIndividualExternal(&rsa->q, &key->q) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa q key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetIndividualExternal(&rsa->dmp1, &key->dP) != SSL_SUCCESS) { + if (SetIndividualExternal(&rsa->dmp1, &key->dP) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa dP key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetIndividualExternal(&rsa->dmq1, &key->dQ) != SSL_SUCCESS) { + if (SetIndividualExternal(&rsa->dmq1, &key->dQ) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa dQ key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetIndividualExternal(&rsa->iqmp, &key->u) != SSL_SUCCESS) { + if (SetIndividualExternal(&rsa->iqmp, &key->u) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa u key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } rsa->exSet = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* Openssl -> WolfSSL */ @@ -19564,28 +19564,28 @@ static int SetRsaInternal(WOLFSSL_RSA* rsa) if (rsa == NULL || rsa->internal == NULL) { WOLFSSL_MSG("rsa key NULL error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } key = (RsaKey*)rsa->internal; - if (SetIndividualInternal(rsa->n, &key->n) != SSL_SUCCESS) { + if (SetIndividualInternal(rsa->n, &key->n) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa n key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetIndividualInternal(rsa->e, &key->e) != SSL_SUCCESS) { + if (SetIndividualInternal(rsa->e, &key->e) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa e key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* public key */ key->type = RSA_PUBLIC; if (rsa->d != NULL) { - if (SetIndividualInternal(rsa->d, &key->d) != SSL_SUCCESS) { + if (SetIndividualInternal(rsa->d, &key->d) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa d key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* private key */ @@ -19593,38 +19593,38 @@ static int SetRsaInternal(WOLFSSL_RSA* rsa) } if (rsa->p != NULL && - SetIndividualInternal(rsa->p, &key->p) != SSL_SUCCESS) { + SetIndividualInternal(rsa->p, &key->p) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa p key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (rsa->q != NULL && - SetIndividualInternal(rsa->q, &key->q) != SSL_SUCCESS) { + SetIndividualInternal(rsa->q, &key->q) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa q key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (rsa->dmp1 != NULL && - SetIndividualInternal(rsa->dmp1, &key->dP) != SSL_SUCCESS) { + SetIndividualInternal(rsa->dmp1, &key->dP) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa dP key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (rsa->dmq1 != NULL && - SetIndividualInternal(rsa->dmq1, &key->dQ) != SSL_SUCCESS) { + SetIndividualInternal(rsa->dmq1, &key->dQ) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa dQ key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (rsa->iqmp != NULL && - SetIndividualInternal(rsa->iqmp, &key->u) != SSL_SUCCESS) { + SetIndividualInternal(rsa->iqmp, &key->u) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("rsa u key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } rsa->inSet = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* HAVE_USER_RSA */ @@ -19634,7 +19634,7 @@ static int SetRsaInternal(WOLFSSL_RSA* rsa) int wolfSSL_RSA_generate_key_ex(WOLFSSL_RSA* rsa, int bits, WOLFSSL_BIGNUM* bn, void* cb) { - int ret = SSL_FAILURE; + int ret = WOLF_SSL_FAILURE; (void)cb; (void)bn; @@ -19645,7 +19645,7 @@ int wolfSSL_RSA_generate_key_ex(WOLFSSL_RSA* rsa, int bits, WOLFSSL_BIGNUM* bn, if (rsa == NULL || rsa->internal == NULL) { /* bit size checked during make key call */ WOLFSSL_MSG("bad arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #ifdef WOLFSSL_KEY_GEN @@ -19659,7 +19659,7 @@ int wolfSSL_RSA_generate_key_ex(WOLFSSL_RSA* rsa, int bits, WOLFSSL_BIGNUM* bn, #ifdef WOLFSSL_SMALL_STACK rng = (WC_RNG*)XMALLOC(sizeof(WC_RNG), NULL, DYNAMIC_TYPE_RNG); if (rng == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; #endif if (wc_InitRng(rng) < 0) @@ -19667,11 +19667,11 @@ int wolfSSL_RSA_generate_key_ex(WOLFSSL_RSA* rsa, int bits, WOLFSSL_BIGNUM* bn, else if (wc_MakeRsaKey((RsaKey*)rsa->internal, bits, 65537, rng) != MP_OKAY) WOLFSSL_MSG("wc_MakeRsaKey failed"); - else if (SetRsaExternal(rsa) != SSL_SUCCESS) + else if (SetRsaExternal(rsa) != WOLF_SSL_SUCCESS) WOLFSSL_MSG("SetRsaExternal failed"); else { rsa->inSet = 1; - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; } wc_FreeRng(rng); @@ -19686,7 +19686,7 @@ int wolfSSL_RSA_generate_key_ex(WOLFSSL_RSA* rsa, int bits, WOLFSSL_BIGNUM* bn, } -/* SSL_SUCCESS on ok */ +/* WOLF_SSL_SUCCESS on ok */ int wolfSSL_RSA_blinding_on(WOLFSSL_RSA* rsa, WOLFSSL_BN_CTX* bn) { (void)rsa; @@ -19694,7 +19694,7 @@ int wolfSSL_RSA_blinding_on(WOLFSSL_RSA* rsa, WOLFSSL_BN_CTX* bn) WOLFSSL_MSG("wolfSSL_RSA_blinding_on"); - return SSL_SUCCESS; /* on by default */ + return WOLF_SSL_SUCCESS; /* on by default */ } /* return compliant with OpenSSL @@ -19734,7 +19734,7 @@ int wolfSSL_RSA_public_encrypt(int len, const unsigned char* fr, } #else if (padding == RSA_PKCS1_PADDING) - ; + ; #endif else { WOLFSSL_MSG("wolfSSL_RSA_public_encrypt unsupported padding"); @@ -19759,7 +19759,7 @@ int wolfSSL_RSA_public_encrypt(int len, const unsigned char* fr, #ifdef WOLFSSL_SMALL_STACK tmpRNG = (WC_RNG*)XMALLOC(sizeof(WC_RNG), NULL, DYNAMIC_TYPE_RNG); if (tmpRNG == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; #endif if (wc_InitRng(tmpRNG) == 0) { @@ -19874,7 +19874,7 @@ int wolfSSL_RSA_size(const WOLFSSL_RSA* rsa) WOLFSSL_MSG("wolfSSL_RSA_size"); if (rsa == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; return wolfSSL_BN_num_bytes(rsa->n); } @@ -19886,19 +19886,19 @@ int wolfSSL_RSA_size(const WOLFSSL_RSA* rsa) */ int wolfSSL_DSA_generate_key(WOLFSSL_DSA* dsa) { - int ret = SSL_FAILURE; + int ret = WOLF_SSL_FAILURE; WOLFSSL_ENTER("wolfSSL_DSA_generate_key"); if (dsa == NULL || dsa->internal == NULL) { WOLFSSL_MSG("Bad arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (dsa->inSet == 0) { WOLFSSL_MSG("No DSA internal set, do it"); - if (SetDsaInternal(dsa) != SSL_SUCCESS) { + if (SetDsaInternal(dsa) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetDsaInternal failed"); return ret; } @@ -19917,7 +19917,7 @@ int wolfSSL_DSA_generate_key(WOLFSSL_DSA* dsa) #ifdef WOLFSSL_SMALL_STACK tmpRNG = (WC_RNG*)XMALLOC(sizeof(WC_RNG), NULL, DYNAMIC_TYPE_RNG); if (tmpRNG == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; #endif if (wc_InitRng(tmpRNG) == 0) { rng = tmpRNG; @@ -19934,10 +19934,10 @@ int wolfSSL_DSA_generate_key(WOLFSSL_DSA* dsa) if (rng) { if (wc_MakeDsaKey(rng, (DsaKey*)dsa->internal) != MP_OKAY) WOLFSSL_MSG("wc_MakeDsaKey failed"); - else if (SetDsaExternal(dsa) != SSL_SUCCESS) + else if (SetDsaExternal(dsa) != WOLF_SSL_SUCCESS) WOLFSSL_MSG("SetDsaExternal failed"); else - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; } if (initTmpRng) @@ -19961,7 +19961,7 @@ int wolfSSL_DSA_generate_parameters_ex(WOLFSSL_DSA* dsa, int bits, int* counterRet, unsigned long* hRet, void* cb) { - int ret = SSL_FAILURE; + int ret = WOLF_SSL_FAILURE; (void)bits; (void)seed; @@ -19974,7 +19974,7 @@ int wolfSSL_DSA_generate_parameters_ex(WOLFSSL_DSA* dsa, int bits, if (dsa == NULL || dsa->internal == NULL) { WOLFSSL_MSG("Bad arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #ifdef WOLFSSL_KEY_GEN @@ -19990,7 +19990,7 @@ int wolfSSL_DSA_generate_parameters_ex(WOLFSSL_DSA* dsa, int bits, #ifdef WOLFSSL_SMALL_STACK tmpRNG = (WC_RNG*)XMALLOC(sizeof(WC_RNG), NULL, DYNAMIC_TYPE_RNG); if (tmpRNG == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; #endif if (wc_InitRng(tmpRNG) == 0) { rng = tmpRNG; @@ -20008,10 +20008,10 @@ int wolfSSL_DSA_generate_parameters_ex(WOLFSSL_DSA* dsa, int bits, if (wc_MakeDsaParameters(rng, bits, (DsaKey*)dsa->internal) != MP_OKAY) WOLFSSL_MSG("wc_MakeDsaParameters failed"); - else if (SetDsaExternal(dsa) != SSL_SUCCESS) + else if (SetDsaExternal(dsa) != WOLF_SSL_SUCCESS) WOLFSSL_MSG("SetDsaExternal failed"); else - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; } if (initTmpRng) @@ -20028,11 +20028,11 @@ int wolfSSL_DSA_generate_parameters_ex(WOLFSSL_DSA* dsa, int bits, return ret; } -/* return SSL_SUCCESS on success, < 0 otherwise */ +/* return WOLF_SSL_SUCCESS on success, < 0 otherwise */ int wolfSSL_DSA_do_sign(const unsigned char* d, unsigned char* sigRet, WOLFSSL_DSA* dsa) { - int ret = SSL_FATAL_ERROR; + int ret = WOLF_SSL_FATAL_ERROR; int initTmpRng = 0; WC_RNG* rng = NULL; #ifdef WOLFSSL_SMALL_STACK @@ -20052,7 +20052,7 @@ int wolfSSL_DSA_do_sign(const unsigned char* d, unsigned char* sigRet, { WOLFSSL_MSG("No DSA internal set, do it"); - if (SetDsaInternal(dsa) != SSL_SUCCESS) { + if (SetDsaInternal(dsa) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetDsaInternal failed"); return ret; } @@ -20061,7 +20061,7 @@ int wolfSSL_DSA_do_sign(const unsigned char* d, unsigned char* sigRet, #ifdef WOLFSSL_SMALL_STACK tmpRNG = (WC_RNG*)XMALLOC(sizeof(WC_RNG), NULL, DYNAMIC_TYPE_RNG); if (tmpRNG == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; #endif if (wc_InitRng(tmpRNG) == 0) { @@ -20080,7 +20080,7 @@ int wolfSSL_DSA_do_sign(const unsigned char* d, unsigned char* sigRet, if (DsaSign(d, sigRet, (DsaKey*)dsa->internal, rng) < 0) WOLFSSL_MSG("DsaSign failed"); else - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; } if (initTmpRng) @@ -20096,21 +20096,21 @@ int wolfSSL_DSA_do_sign(const unsigned char* d, unsigned char* sigRet, int wolfSSL_DSA_do_verify(const unsigned char* d, unsigned char* sig, WOLFSSL_DSA* dsa, int *dsacheck) { - int ret = SSL_FATAL_ERROR; + int ret = WOLF_SSL_FATAL_ERROR; WOLFSSL_ENTER("wolfSSL_DSA_do_verify"); if (d == NULL || sig == NULL || dsa == NULL) { WOLFSSL_MSG("Bad function arguments"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (dsa->inSet == 0) { WOLFSSL_MSG("No DSA internal set, do it"); - if (SetDsaInternal(dsa) != SSL_SUCCESS) { + if (SetDsaInternal(dsa) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetDsaInternal failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } @@ -20120,7 +20120,7 @@ int wolfSSL_DSA_do_verify(const unsigned char* d, unsigned char* sig, return ret; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* NO_DSA */ @@ -20179,7 +20179,7 @@ int wolfSSL_RSA_sign(int type, const unsigned char* m, { WOLFSSL_MSG("No RSA internal set, do it"); - if (SetRsaInternal(rsa) != SSL_SUCCESS) { + if (SetRsaInternal(rsa) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetRsaInternal failed"); return 0; } @@ -20229,7 +20229,7 @@ int wolfSSL_RSA_sign(int type, const unsigned char* m, ret = 0; } else { - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; *sigLen = ret; } } @@ -20244,7 +20244,7 @@ int wolfSSL_RSA_sign(int type, const unsigned char* m, XFREE(encodedSig, NULL, DYNAMIC_TYPE_SIGNATURE); #endif - if (ret == SSL_SUCCESS) + if (ret == WOLF_SSL_SUCCESS) WOLFSSL_MSG("wolfSSL_RSA_sign success"); else { WOLFSSL_MSG("wolfSSL_RSA_sign failed"); @@ -20274,7 +20274,7 @@ int wolfSSL_RSA_public_decrypt(int flen, const unsigned char* from, { WOLFSSL_MSG("No RSA internal set, do it"); - if (SetRsaInternal(rsa) != SSL_SUCCESS) { + if (SetRsaInternal(rsa) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetRsaInternal failed"); return 0; } @@ -20292,7 +20292,7 @@ int wolfSSL_RSA_public_decrypt(int flen, const unsigned char* from, } -/* generate p-1 and q-1, SSL_SUCCESS on ok */ +/* generate p-1 and q-1, WOLF_SSL_SUCCESS on ok */ int wolfSSL_RSA_GenAdd(WOLFSSL_RSA* rsa) { int err; @@ -20303,12 +20303,12 @@ int wolfSSL_RSA_GenAdd(WOLFSSL_RSA* rsa) if (rsa == NULL || rsa->p == NULL || rsa->q == NULL || rsa->d == NULL || rsa->dmp1 == NULL || rsa->dmq1 == NULL) { WOLFSSL_MSG("rsa no init error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (mp_init(&tmp) != MP_OKAY) { WOLFSSL_MSG("mp_init error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } err = mp_sub_d((mp_int*)rsa->p->internal, 1, &tmp); @@ -20334,9 +20334,9 @@ int wolfSSL_RSA_GenAdd(WOLFSSL_RSA* rsa) mp_clear(&tmp); if (err == MP_OKAY) - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; else - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #endif /* NO_RSA */ @@ -20356,17 +20356,17 @@ void wolfSSL_HMAC_Init(WOLFSSL_HMAC_CTX* ctx, const void* key, int keylen, if (XSTRNCMP(type, "MD5", 3) == 0) { WOLFSSL_MSG("md5 hmac"); - ctx->type = MD5; + ctx->type = WC_MD5; } else if (XSTRNCMP(type, "SHA256", 6) == 0) { WOLFSSL_MSG("sha256 hmac"); - ctx->type = SHA256; + ctx->type = WC_SHA256; } /* has to be last since would pick or 256, 384, or 512 too */ else if (XSTRNCMP(type, "SHA", 3) == 0) { WOLFSSL_MSG("sha hmac"); - ctx->type = SHA; + ctx->type = WC_SHA; } else { WOLFSSL_MSG("bad init type"); @@ -20419,16 +20419,16 @@ void wolfSSL_HMAC_Final(WOLFSSL_HMAC_CTX* ctx, unsigned char* hash, if (len) { WOLFSSL_MSG("setting output len"); switch (ctx->type) { - case MD5: - *len = MD5_DIGEST_SIZE; + case WC_MD5: + *len = WC_MD5_DIGEST_SIZE; break; - case SHA: - *len = SHA_DIGEST_SIZE; + case WC_SHA: + *len = WC_SHA_DIGEST_SIZE; break; - case SHA256: - *len = SHA256_DIGEST_SIZE; + case WC_SHA256: + *len = WC_SHA256_DIGEST_SIZE; break; default: @@ -20600,32 +20600,32 @@ int wolfSSL_EVP_MD_size(const WOLFSSL_EVP_MD* type) } if (XSTRNCMP(type, "SHA256", 6) == 0) { - return SHA256_DIGEST_SIZE; + return WC_SHA256_DIGEST_SIZE; } #ifndef NO_MD5 else if (XSTRNCMP(type, "MD5", 3) == 0) { - return MD5_DIGEST_SIZE; + return WC_MD5_DIGEST_SIZE; } #endif #ifdef WOLFSSL_SHA224 else if (XSTRNCMP(type, "SHA224", 6) == 0) { - return SHA224_DIGEST_SIZE; + return WC_SHA224_DIGEST_SIZE; } #endif #ifdef WOLFSSL_SHA384 else if (XSTRNCMP(type, "SHA384", 6) == 0) { - return SHA384_DIGEST_SIZE; + return WC_SHA384_DIGEST_SIZE; } #endif #ifdef WOLFSSL_SHA512 else if (XSTRNCMP(type, "SHA512", 6) == 0) { - return SHA512_DIGEST_SIZE; + return WC_SHA512_DIGEST_SIZE; } #endif #ifndef NO_SHA /* has to be last since would pick or 256, 384, or 512 too */ else if (XSTRNCMP(type, "SHA", 3) == 0) { - return SHA_DIGEST_SIZE; + return WC_SHA_DIGEST_SIZE; } #endif @@ -20752,7 +20752,7 @@ static int EncryptDerKey(byte *der, int *derSz, const EVP_CIPHER* cipher, DYNAMIC_TYPE_ENCRYPTEDINFO); if (info == NULL) { WOLFSSL_MSG("malloc failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #endif info->set = 0; @@ -20769,7 +20769,7 @@ static int EncryptDerKey(byte *der, int *derSz, const EVP_CIPHER* cipher, #ifdef WOLFSSL_SMALL_STACK XFREE(info, NULL, DYNAMIC_TYPE_ENCRYPTEDINFO); #endif - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* set the cipher name on info */ @@ -20777,12 +20777,12 @@ static int EncryptDerKey(byte *der, int *derSz, const EVP_CIPHER* cipher, info->name[NAME_SZ-1] = '\0'; /* null term */ /* Generate a random salt */ - if (wolfSSL_RAND_bytes(info->iv, info->ivSz) != SSL_SUCCESS) { + if (wolfSSL_RAND_bytes(info->iv, info->ivSz) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("generate iv failed"); #ifdef WOLFSSL_SMALL_STACK XFREE(info, NULL, DYNAMIC_TYPE_ENCRYPTEDINFO); #endif - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* add the padding before encryption */ @@ -20794,12 +20794,12 @@ static int EncryptDerKey(byte *der, int *derSz, const EVP_CIPHER* cipher, /* encrypt buffer */ if (wolfssl_encrypt_buffer_key(der, *derSz, - passwd, passwdSz, info) != SSL_SUCCESS) { + passwd, passwdSz, info) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("encrypt key failed"); #ifdef WOLFSSL_SMALL_STACK XFREE(info, NULL, DYNAMIC_TYPE_ENCRYPTEDINFO); #endif - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* create cipher info : 'cipher_name,Salt(hex)' */ @@ -20811,7 +20811,7 @@ static int EncryptDerKey(byte *der, int *derSz, const EVP_CIPHER* cipher, #ifdef WOLFSSL_SMALL_STACK XFREE(info, NULL, DYNAMIC_TYPE_ENCRYPTEDINFO); #endif - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XSTRNCPY((char*)*cipherInfo, info->name, cipherInfoSz); XSTRNCAT((char*)*cipherInfo, ",", 1); @@ -20826,10 +20826,10 @@ static int EncryptDerKey(byte *der, int *derSz, const EVP_CIPHER* cipher, if (ret != 0) { WOLFSSL_MSG("Base16_Encode failed"); XFREE(*cipherInfo, NULL, DYNAMIC_TYPE_STRING); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* defined(WOLFSSL_KEY_GEN) */ @@ -20854,7 +20854,7 @@ int wolfSSL_PEM_write_bio_PrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key, WOLFSSL_ENTER("wolfSSL_PEM_write_bio_PrivateKey"); if (bio == NULL || key == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } keyDer = (byte*)key->pkey.ptr; @@ -20882,7 +20882,7 @@ int wolfSSL_PEM_write_bio_PrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key, pemSz = wc_DerToPem(keyDer, key->pkey_sz, NULL, 0, type); if (pemSz < 0) { WOLFSSL_LEAVE("wolfSSL_PEM_write_bio_PrivateKey", pemSz); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (bio->mem != NULL) { XFREE(bio->mem, NULL, DYNAMIC_TYPE_OPENSSL); @@ -20894,10 +20894,10 @@ int wolfSSL_PEM_write_bio_PrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key, NULL, type); if (ret < 0) { WOLFSSL_LEAVE("wolfSSL_PEM_write_bio_PrivateKey", ret); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN) */ @@ -20917,15 +20917,15 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher, if (pem == NULL || plen == NULL || rsa == NULL || rsa->internal == NULL) { WOLFSSL_MSG("Bad function arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (rsa->inSet == 0) { WOLFSSL_MSG("No RSA internal set, do it"); - if (SetRsaInternal(rsa) != SSL_SUCCESS) { + if (SetRsaInternal(rsa) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetRsaInternal failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } @@ -20937,7 +20937,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher, derBuf = (byte*)XMALLOC(der_max_len, NULL, DYNAMIC_TYPE_DER); if (derBuf == NULL) { WOLFSSL_MSG("malloc failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* Key to DER */ @@ -20945,7 +20945,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher, if (derSz < 0) { WOLFSSL_MSG("wc_RsaKeyToDer failed"); XFREE(derBuf, NULL, DYNAMIC_TYPE_DER); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* encrypt DER buffer if required */ @@ -20954,7 +20954,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher, ret = EncryptDerKey(derBuf, &derSz, cipher, passwd, passwdSz, &cipherInfo); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("EncryptDerKey failed"); XFREE(derBuf, NULL, DYNAMIC_TYPE_DER); return ret; @@ -20973,7 +20973,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher, XFREE(derBuf, NULL, DYNAMIC_TYPE_DER); if (cipherInfo != NULL) XFREE(cipherInfo, NULL, DYNAMIC_TYPE_STRING); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* DER to PEM */ @@ -20984,7 +20984,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher, XFREE(tmp, NULL, DYNAMIC_TYPE_PEM); if (cipherInfo != NULL) XFREE(cipherInfo, NULL, DYNAMIC_TYPE_STRING); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XFREE(derBuf, NULL, DYNAMIC_TYPE_DER); if (cipherInfo != NULL) @@ -20994,7 +20994,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher, if (*pem == NULL) { WOLFSSL_MSG("malloc failed"); XFREE(tmp, NULL, DYNAMIC_TYPE_PEM); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XMEMSET(*pem, 0, (*plen)+1); @@ -21002,11 +21002,11 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher, WOLFSSL_MSG("XMEMCPY failed"); XFREE(pem, NULL, DYNAMIC_TYPE_KEY); XFREE(tmp, NULL, DYNAMIC_TYPE_PEM); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XFREE(tmp, NULL, DYNAMIC_TYPE_PEM); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -21029,23 +21029,23 @@ int wolfSSL_PEM_write_RSAPrivateKey(FILE *fp, WOLFSSL_RSA *rsa, if (fp == NULL || rsa == NULL || rsa->internal == NULL) { WOLFSSL_MSG("Bad function arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } ret = wolfSSL_PEM_write_mem_RSAPrivateKey(rsa, enc, kstr, klen, &pem, &plen); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("wolfSSL_PEM_write_mem_RSAPrivateKey failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } ret = (int)XFWRITE(pem, plen, 1, fp); if (ret != 1) { WOLFSSL_MSG("RSA private key file write failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XFREE(pem, NULL, DYNAMIC_TYPE_KEY); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* NO_FILESYSTEM */ @@ -21064,7 +21064,7 @@ int wolfSSL_PEM_write_bio_RSAPrivateKey(WOLFSSL_BIO* bio, RSA* rsa, WOLFSSL_MSG("wolfSSL_PEM_write_bio_RSAPrivateKey not implemented"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #endif /* defined(WOLFSSL_KEY_GEN) && !defined(NO_RSA) */ @@ -21078,29 +21078,29 @@ static int SetECPointInternal(WOLFSSL_EC_POINT *p) if (p == NULL || p->internal == NULL) { WOLFSSL_MSG("ECPoint NULL error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } point = (ecc_point*)p->internal; - if (p->X != NULL && SetIndividualInternal(p->X, point->x) != SSL_SUCCESS) { + if (p->X != NULL && SetIndividualInternal(p->X, point->x) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("ecc point X error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (p->Y != NULL && SetIndividualInternal(p->Y, point->y) != SSL_SUCCESS) { + if (p->Y != NULL && SetIndividualInternal(p->Y, point->y) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("ecc point Y error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (p->Z != NULL && SetIndividualInternal(p->Z, point->z) != SSL_SUCCESS) { + if (p->Z != NULL && SetIndividualInternal(p->Z, point->z) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("ecc point Z error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } p->inSet = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* EC_POINT WolfSSL -> OpenSSL */ @@ -21112,29 +21112,29 @@ static int SetECPointExternal(WOLFSSL_EC_POINT *p) if (p == NULL || p->internal == NULL) { WOLFSSL_MSG("ECPoint NULL error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } point = (ecc_point*)p->internal; - if (SetIndividualExternal(&p->X, point->x) != SSL_SUCCESS) { + if (SetIndividualExternal(&p->X, point->x) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("ecc point X error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetIndividualExternal(&p->Y, point->y) != SSL_SUCCESS) { + if (SetIndividualExternal(&p->Y, point->y) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("ecc point Y error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetIndividualExternal(&p->Z, point->z) != SSL_SUCCESS) { + if (SetIndividualExternal(&p->Z, point->z) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("ecc point Z error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } p->exSet = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* EC_KEY wolfSSL -> OpenSSL */ @@ -21146,7 +21146,7 @@ static int SetECKeyExternal(WOLFSSL_EC_KEY* eckey) if (eckey == NULL || eckey->internal == NULL) { WOLFSSL_MSG("ec key NULL error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } key = (ecc_key*)eckey->internal; @@ -21161,27 +21161,27 @@ static int SetECKeyExternal(WOLFSSL_EC_KEY* eckey) if (wc_ecc_copy_point(&key->pubkey, (ecc_point*)eckey->pub_key->internal) != MP_OKAY) { WOLFSSL_MSG("SetECKeyExternal ecc_copy_point failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* set the external pubkey (point) */ - if (SetECPointExternal(eckey->pub_key) != SSL_SUCCESS) { + if (SetECPointExternal(eckey->pub_key) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetECKeyExternal SetECPointExternal failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } /* set the external privkey */ if (key->type == ECC_PRIVATEKEY) { - if (SetIndividualExternal(&eckey->priv_key, &key->k) != SSL_SUCCESS) { + if (SetIndividualExternal(&eckey->priv_key, &key->k) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("ec priv key error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } eckey->exSet = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* EC_KEY Openssl -> WolfSSL */ @@ -21193,7 +21193,7 @@ static int SetECKeyInternal(WOLFSSL_EC_KEY* eckey) if (eckey == NULL || eckey->internal == NULL) { WOLFSSL_MSG("ec key NULL error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } key = (ecc_key*)eckey->internal; @@ -21202,7 +21202,7 @@ static int SetECKeyInternal(WOLFSSL_EC_KEY* eckey) if ((eckey->group->curve_idx < 0) || (wc_ecc_is_valid_idx(eckey->group->curve_idx) == 0)) { WOLFSSL_MSG("invalid curve idx"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* set group (idx of curve and corresponding domain parameters) */ @@ -21211,9 +21211,9 @@ static int SetECKeyInternal(WOLFSSL_EC_KEY* eckey) /* set pubkey (point) */ if (eckey->pub_key != NULL) { - if (SetECPointInternal(eckey->pub_key) != SSL_SUCCESS) { + if (SetECPointInternal(eckey->pub_key) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("ec key pub error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* public key */ @@ -21222,9 +21222,9 @@ static int SetECKeyInternal(WOLFSSL_EC_KEY* eckey) /* set privkey */ if (eckey->priv_key != NULL) { - if (SetIndividualInternal(eckey->priv_key, &key->k) != SSL_SUCCESS) { + if (SetIndividualInternal(eckey->priv_key, &key->k) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("ec key priv error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* private key */ @@ -21233,7 +21233,7 @@ static int SetECKeyInternal(WOLFSSL_EC_KEY* eckey) eckey->inSet = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } WOLFSSL_EC_POINT *wolfSSL_EC_KEY_get0_public_key(const WOLFSSL_EC_KEY *key) @@ -21271,7 +21271,7 @@ int wolfSSL_EC_KEY_set_private_key(WOLFSSL_EC_KEY *key, if (key == NULL || priv_key == NULL) { WOLFSSL_MSG("Bad arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* free key if previously set */ @@ -21281,16 +21281,16 @@ int wolfSSL_EC_KEY_set_private_key(WOLFSSL_EC_KEY *key, key->priv_key = wolfSSL_BN_dup(priv_key); if (key->priv_key == NULL) { WOLFSSL_MSG("key ecc priv key NULL"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - if (SetECKeyInternal(key) != SSL_SUCCESS) { + if (SetECKeyInternal(key) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetECKeyInternal failed"); wolfSSL_BN_free(key->priv_key); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -21496,7 +21496,7 @@ int wolfSSL_EC_KEY_generate_key(WOLFSSL_EC_KEY *key) XFREE(tmpRNG, NULL, DYNAMIC_TYPE_RNG); #endif - if (SetECKeyExternal(key) != SSL_SUCCESS) { + if (SetECKeyExternal(key) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("wolfSSL_EC_KEY_generate_key SetECKeyExternal failed"); return 0; } @@ -21526,20 +21526,20 @@ int wolfSSL_EC_KEY_set_public_key(WOLFSSL_EC_KEY *key, if (key == NULL || key->internal == NULL || pub == NULL || pub->internal == NULL) { WOLFSSL_MSG("wolfSSL_EC_GROUP_get_order Bad arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (key->inSet == 0) { - if (SetECKeyInternal(key) != SSL_SUCCESS) { + if (SetECKeyInternal(key) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetECKeyInternal failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } if (pub->inSet == 0) { - if (SetECPointInternal((WOLFSSL_EC_POINT *)pub) != SSL_SUCCESS) { + if (SetECPointInternal((WOLFSSL_EC_POINT *)pub) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetECPointInternal failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } @@ -21552,24 +21552,24 @@ int wolfSSL_EC_KEY_set_public_key(WOLFSSL_EC_KEY *key, if (key_p == NULL) { WOLFSSL_MSG("key ecc point NULL"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (wc_ecc_copy_point(pub_p, key_p) != MP_OKAY) { WOLFSSL_MSG("ecc_copy_point failure"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - if (SetECKeyExternal(key) != SSL_SUCCESS) { + if (SetECKeyExternal(key) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetECKeyInternal failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #if defined(DEBUG_WOLFSSL) && !defined(NO_FILESYSTEM) wolfssl_EC_POINT_dump("pub", pub); wolfssl_EC_POINT_dump("key->pub_key", key->pub_key); #endif - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* End EC_KEY */ @@ -21582,7 +21582,7 @@ void wolfssl_EC_POINT_dump(const char *msg, const WOLFSSL_EC_POINT *p) if (p == NULL) { fprintf(stderr, "%s = NULL", msg); - return ; + return; } fprintf(stderr, "%s:\n\tinSet=%d, exSet=%d\n", msg, p->inSet, p->exSet); @@ -21609,7 +21609,7 @@ int wolfSSL_EC_GROUP_cmp(const WOLFSSL_EC_GROUP *a, const WOLFSSL_EC_GROUP *b, if (a == NULL || b == NULL) { WOLFSSL_MSG("wolfSSL_EC_GROUP_cmp Bad arguments"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* ok */ @@ -21676,7 +21676,7 @@ int wolfSSL_EC_GROUP_get_curve_name(const WOLFSSL_EC_GROUP *group) if (group == NULL) { WOLFSSL_MSG("wolfSSL_EC_GROUP_get_curve_name Bad arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } return group->curve_nid; @@ -21691,7 +21691,7 @@ int wolfSSL_EC_GROUP_get_degree(const WOLFSSL_EC_GROUP *group) if (group == NULL || group->curve_idx < 0) { WOLFSSL_MSG("wolfSSL_EC_GROUP_get_degree Bad arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } switch(group->curve_nid) { @@ -21727,7 +21727,7 @@ int wolfSSL_EC_GROUP_get_degree(const WOLFSSL_EC_GROUP *group) case NID_brainpoolP512r1: return 521; default: - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } @@ -21741,22 +21741,22 @@ int wolfSSL_EC_GROUP_get_order(const WOLFSSL_EC_GROUP *group, if (group == NULL || order == NULL || order->internal == NULL) { WOLFSSL_MSG("wolfSSL_EC_GROUP_get_order NULL error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (mp_init((mp_int*)order->internal) != MP_OKAY) { WOLFSSL_MSG("wolfSSL_EC_GROUP_get_order mp_init failure"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (mp_read_radix((mp_int*)order->internal, ecc_sets[group->curve_idx].order, 16) != MP_OKAY) { WOLFSSL_MSG("wolfSSL_EC_GROUP_get_order mp_read order failure"); mp_clear((mp_int*)order->internal); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* End EC_GROUP */ @@ -21775,15 +21775,15 @@ int wolfSSL_ECPoint_i2d(const WOLFSSL_EC_GROUP *group, if (group == NULL || p == NULL || len == NULL) { WOLFSSL_MSG("wolfSSL_ECPoint_i2d NULL error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (p->inSet == 0) { WOLFSSL_MSG("No ECPoint internal set, do it"); - if (SetECPointInternal((WOLFSSL_EC_POINT *)p) != SSL_SUCCESS) { + if (SetECPointInternal((WOLFSSL_EC_POINT *)p) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetECPointInternal SetECPointInternal failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } @@ -21796,10 +21796,10 @@ int wolfSSL_ECPoint_i2d(const WOLFSSL_EC_GROUP *group, out, len); if (err != MP_OKAY && !(out == NULL && err == LENGTH_ONLY_E)) { WOLFSSL_MSG("wolfSSL_ECPoint_i2d wc_ecc_export_point_der failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* return code compliant with OpenSSL : @@ -21812,28 +21812,28 @@ int wolfSSL_ECPoint_d2i(unsigned char *in, unsigned int len, if (group == NULL || p == NULL || p->internal == NULL || in == NULL) { WOLFSSL_MSG("wolfSSL_ECPoint_d2i NULL error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (wc_ecc_import_point_der(in, len, group->curve_idx, (ecc_point*)p->internal) != MP_OKAY) { WOLFSSL_MSG("wc_ecc_import_point_der failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (p->exSet == 0) { WOLFSSL_MSG("No ECPoint external set, do it"); - if (SetECPointExternal(p) != SSL_SUCCESS) { + if (SetECPointExternal(p) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetECPointExternal failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } #if defined(DEBUG_WOLFSSL) && !defined(NO_FILESYSTEM) wolfssl_EC_POINT_dump("d2i p", p); #endif - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } WOLFSSL_EC_POINT *wolfSSL_EC_POINT_new(const WOLFSSL_EC_GROUP *group) @@ -21881,22 +21881,22 @@ int wolfSSL_EC_POINT_get_affine_coordinates_GFp(const WOLFSSL_EC_GROUP *group, if (group == NULL || point == NULL || point->internal == NULL || x == NULL || y == NULL) { WOLFSSL_MSG("wolfSSL_EC_POINT_get_affine_coordinates_GFp NULL error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (point->inSet == 0) { WOLFSSL_MSG("No ECPoint internal set, do it"); - if (SetECPointInternal((WOLFSSL_EC_POINT *)point) != SSL_SUCCESS) { + if (SetECPointInternal((WOLFSSL_EC_POINT *)point) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetECPointInternal failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } BN_copy(x, point->X); BN_copy(y, point->Y); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* return code compliant with OpenSSL : @@ -21917,21 +21917,21 @@ int wolfSSL_EC_POINT_mul(const WOLFSSL_EC_GROUP *group, WOLFSSL_EC_POINT *r, if (group == NULL || r == NULL || r->internal == NULL || q == NULL || q->internal == NULL || m == NULL) { WOLFSSL_MSG("wolfSSL_EC_POINT_mul NULL error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (q->inSet == 0) { WOLFSSL_MSG("No ECPoint internal set, do it"); - if (SetECPointInternal((WOLFSSL_EC_POINT *)q) != SSL_SUCCESS) { + if (SetECPointInternal((WOLFSSL_EC_POINT *)q) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetECPointInternal q failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } /* read the curve prime and a */ if (mp_init_multi(&prime, &a, NULL, NULL, NULL, NULL) != MP_OKAY) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } ret = mp_read_radix(&prime, ecc_sets[group->curve_idx].prime, 16); @@ -21949,12 +21949,12 @@ int wolfSSL_EC_POINT_mul(const WOLFSSL_EC_GROUP *group, WOLFSSL_EC_POINT *r, if (ret == MP_OKAY) { /* set the external value for the computed point */ ret = SetECPointInternal(r); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetECPointInternal r failed"); } } else { - ret = SSL_FAILURE; + ret = WOLF_SSL_FAILURE; } return ret; @@ -21983,7 +21983,7 @@ int wolfSSL_EC_POINT_cmp(const WOLFSSL_EC_GROUP *group, if (group == NULL || a == NULL || a->internal == NULL || b == NULL || b->internal == NULL) { WOLFSSL_MSG("wolfSSL_EC_POINT_cmp Bad arguments"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ret = wc_ecc_cmp_point((ecc_point*)a->internal, (ecc_point*)b->internal); @@ -21992,7 +21992,7 @@ int wolfSSL_EC_POINT_cmp(const WOLFSSL_EC_GROUP *group, else if (ret == MP_LT || ret == MP_GT) return 1; - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } void wolfSSL_EC_POINT_free(WOLFSSL_EC_POINT *p) @@ -22031,24 +22031,24 @@ int wolfSSL_EC_POINT_is_at_infinity(const WOLFSSL_EC_GROUP *group, if (group == NULL || point == NULL || point->internal == NULL) { WOLFSSL_MSG("wolfSSL_EC_POINT_is_at_infinity NULL error"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (point->inSet == 0) { WOLFSSL_MSG("No ECPoint internal set, do it"); - if (SetECPointInternal((WOLFSSL_EC_POINT *)point) != SSL_SUCCESS) { + if (SetECPointInternal((WOLFSSL_EC_POINT *)point) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetECPointInternal failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } ret = wc_ecc_point_is_at_infinity((ecc_point*)point->internal); if (ret <= 0) { WOLFSSL_MSG("ecc_point_is_at_infinity failure"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* End EC_POINT */ @@ -22122,7 +22122,7 @@ WOLFSSL_ECDSA_SIG *wolfSSL_ECDSA_do_sign(const unsigned char *d, int dlen, { WOLFSSL_MSG("wolfSSL_ECDSA_do_sign No EC key internal set, do it"); - if (SetECKeyInternal(key) != SSL_SUCCESS) { + if (SetECKeyInternal(key) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("wolfSSL_ECDSA_do_sign SetECKeyInternal failed"); return NULL; } @@ -22159,12 +22159,12 @@ WOLFSSL_ECDSA_SIG *wolfSSL_ECDSA_do_sign(const unsigned char *d, int dlen, sig = wolfSSL_ECDSA_SIG_new(); if (sig == NULL) WOLFSSL_MSG("wolfSSL_ECDSA_SIG_new failed"); - else if (SetIndividualExternal(&(sig->r), &sig_r)!=SSL_SUCCESS){ + else if (SetIndividualExternal(&(sig->r), &sig_r)!=WOLF_SSL_SUCCESS){ WOLFSSL_MSG("ecdsa r key error"); wolfSSL_ECDSA_SIG_free(sig); sig = NULL; } - else if (SetIndividualExternal(&(sig->s), &sig_s)!=SSL_SUCCESS){ + else if (SetIndividualExternal(&(sig->s), &sig_s)!=WOLF_SSL_SUCCESS){ WOLFSSL_MSG("ecdsa s key error"); wolfSSL_ECDSA_SIG_free(sig); sig = NULL; @@ -22197,7 +22197,7 @@ int wolfSSL_ECDSA_do_verify(const unsigned char *d, int dlen, if (d == NULL || sig == NULL || key == NULL || key->internal == NULL) { WOLFSSL_MSG("wolfSSL_ECDSA_do_verify Bad arguments"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* set internal key if not done */ @@ -22205,9 +22205,9 @@ int wolfSSL_ECDSA_do_verify(const unsigned char *d, int dlen, { WOLFSSL_MSG("No EC key internal set, do it"); - if (SetECKeyInternal(key) != SSL_SUCCESS) { + if (SetECKeyInternal(key) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetECKeyInternal failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } @@ -22215,14 +22215,14 @@ int wolfSSL_ECDSA_do_verify(const unsigned char *d, int dlen, (mp_int*)sig->s->internal, d, dlen, &check_sign, (ecc_key *)key->internal) != MP_OKAY) { WOLFSSL_MSG("wc_ecc_verify_hash failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } else if (check_sign == 0) { WOLFSSL_MSG("wc_ecc_verify_hash incorrect signature detected"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* End ECDSA_SIG */ @@ -22246,7 +22246,7 @@ int wolfSSL_ECDH_compute_key(void *out, size_t outlen, if (out == NULL || pub_key == NULL || pub_key->internal == NULL || ecdh == NULL || ecdh->internal == NULL) { WOLFSSL_MSG("Bad function arguments"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* set internal key if not done */ @@ -22254,9 +22254,9 @@ int wolfSSL_ECDH_compute_key(void *out, size_t outlen, { WOLFSSL_MSG("No EC key internal set, do it"); - if (SetECKeyInternal(ecdh) != SSL_SUCCESS) { + if (SetECKeyInternal(ecdh) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetECKeyInternal failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } @@ -22266,7 +22266,7 @@ int wolfSSL_ECDH_compute_key(void *out, size_t outlen, (ecc_point*)pub_key->internal, (byte *)out, &len) != MP_OKAY) { WOLFSSL_MSG("wc_ecc_shared_secret failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } return len; @@ -22284,7 +22284,7 @@ int wolfSSL_PEM_write_EC_PUBKEY(FILE *fp, WOLFSSL_EC_KEY *x) WOLFSSL_MSG("wolfSSL_PEM_write_EC_PUBKEY not implemented"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #endif /* NO_FILESYSTEM */ @@ -22308,7 +22308,7 @@ int wolfSSL_PEM_write_bio_ECPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EC_KEY* ecc, WOLFSSL_MSG("wolfSSL_PEM_write_bio_ECPrivateKey not implemented"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* return code compliant with OpenSSL : @@ -22326,15 +22326,15 @@ int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* ecc, if (pem == NULL || plen == NULL || ecc == NULL || ecc->internal == NULL) { WOLFSSL_MSG("Bad function arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (ecc->inSet == 0) { WOLFSSL_MSG("No ECC internal set, do it"); - if (SetECKeyInternal(ecc) != SSL_SUCCESS) { + if (SetECKeyInternal(ecc) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetDsaInternal failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } @@ -22345,7 +22345,7 @@ int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* ecc, derBuf = (byte*)XMALLOC(der_max_len, NULL, DYNAMIC_TYPE_DER); if (derBuf == NULL) { WOLFSSL_MSG("malloc failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* Key to DER */ @@ -22353,7 +22353,7 @@ int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* ecc, if (derSz < 0) { WOLFSSL_MSG("wc_DsaKeyToDer failed"); XFREE(derBuf, NULL, DYNAMIC_TYPE_DER); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* encrypt DER buffer if required */ @@ -22362,7 +22362,7 @@ int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* ecc, ret = EncryptDerKey(derBuf, &derSz, cipher, passwd, passwdSz, &cipherInfo); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("EncryptDerKey failed"); XFREE(derBuf, NULL, DYNAMIC_TYPE_DER); return ret; @@ -22381,7 +22381,7 @@ int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* ecc, XFREE(derBuf, NULL, DYNAMIC_TYPE_DER); if (cipherInfo != NULL) XFREE(cipherInfo, NULL, DYNAMIC_TYPE_STRING); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* DER to PEM */ @@ -22392,7 +22392,7 @@ int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* ecc, XFREE(tmp, NULL, DYNAMIC_TYPE_PEM); if (cipherInfo != NULL) XFREE(cipherInfo, NULL, DYNAMIC_TYPE_STRING); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XFREE(derBuf, NULL, DYNAMIC_TYPE_DER); if (cipherInfo != NULL) @@ -22402,7 +22402,7 @@ int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* ecc, if (*pem == NULL) { WOLFSSL_MSG("malloc failed"); XFREE(tmp, NULL, DYNAMIC_TYPE_PEM); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XMEMSET(*pem, 0, (*plen)+1); @@ -22410,11 +22410,11 @@ int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* ecc, WOLFSSL_MSG("XMEMCPY failed"); XFREE(pem, NULL, DYNAMIC_TYPE_KEY); XFREE(tmp, NULL, DYNAMIC_TYPE_PEM); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XFREE(tmp, NULL, DYNAMIC_TYPE_PEM); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #ifndef NO_FILESYSTEM @@ -22436,23 +22436,23 @@ int wolfSSL_PEM_write_ECPrivateKey(FILE *fp, WOLFSSL_EC_KEY *ecc, if (fp == NULL || ecc == NULL || ecc->internal == NULL) { WOLFSSL_MSG("Bad function arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } ret = wolfSSL_PEM_write_mem_ECPrivateKey(ecc, enc, kstr, klen, &pem, &plen); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("wolfSSL_PEM_write_mem_ECPrivateKey failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } ret = (int)XFWRITE(pem, plen, 1, fp); if (ret != 1) { WOLFSSL_MSG("ECC private key file write failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XFREE(pem, NULL, DYNAMIC_TYPE_KEY); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* NO_FILESYSTEM */ @@ -22483,7 +22483,7 @@ int wolfSSL_PEM_write_bio_DSAPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_DSA* dsa, WOLFSSL_MSG("wolfSSL_PEM_write_bio_DSAPrivateKey not implemented"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* return code compliant with OpenSSL : @@ -22501,15 +22501,15 @@ int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa, if (pem == NULL || plen == NULL || dsa == NULL || dsa->internal == NULL) { WOLFSSL_MSG("Bad function arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (dsa->inSet == 0) { WOLFSSL_MSG("No DSA internal set, do it"); - if (SetDsaInternal(dsa) != SSL_SUCCESS) { + if (SetDsaInternal(dsa) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetDsaInternal failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } @@ -22520,7 +22520,7 @@ int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa, derBuf = (byte*)XMALLOC(der_max_len, NULL, DYNAMIC_TYPE_DER); if (derBuf == NULL) { WOLFSSL_MSG("malloc failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* Key to DER */ @@ -22528,7 +22528,7 @@ int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa, if (derSz < 0) { WOLFSSL_MSG("wc_DsaKeyToDer failed"); XFREE(derBuf, NULL, DYNAMIC_TYPE_DER); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* encrypt DER buffer if required */ @@ -22537,7 +22537,7 @@ int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa, ret = EncryptDerKey(derBuf, &derSz, cipher, passwd, passwdSz, &cipherInfo); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("EncryptDerKey failed"); XFREE(derBuf, NULL, DYNAMIC_TYPE_DER); return ret; @@ -22556,7 +22556,7 @@ int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa, XFREE(derBuf, NULL, DYNAMIC_TYPE_DER); if (cipherInfo != NULL) XFREE(cipherInfo, NULL, DYNAMIC_TYPE_STRING); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* DER to PEM */ @@ -22567,7 +22567,7 @@ int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa, XFREE(tmp, NULL, DYNAMIC_TYPE_PEM); if (cipherInfo != NULL) XFREE(cipherInfo, NULL, DYNAMIC_TYPE_STRING); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XFREE(derBuf, NULL, DYNAMIC_TYPE_DER); if (cipherInfo != NULL) @@ -22577,7 +22577,7 @@ int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa, if (*pem == NULL) { WOLFSSL_MSG("malloc failed"); XFREE(tmp, NULL, DYNAMIC_TYPE_PEM); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XMEMSET(*pem, 0, (*plen)+1); @@ -22585,11 +22585,11 @@ int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa, WOLFSSL_MSG("XMEMCPY failed"); XFREE(pem, NULL, DYNAMIC_TYPE_KEY); XFREE(tmp, NULL, DYNAMIC_TYPE_PEM); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XFREE(tmp, NULL, DYNAMIC_TYPE_PEM); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #ifndef NO_FILESYSTEM @@ -22611,23 +22611,23 @@ int wolfSSL_PEM_write_DSAPrivateKey(FILE *fp, WOLFSSL_DSA *dsa, if (fp == NULL || dsa == NULL || dsa->internal == NULL) { WOLFSSL_MSG("Bad function arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } ret = wolfSSL_PEM_write_mem_DSAPrivateKey(dsa, enc, kstr, klen, &pem, &plen); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("wolfSSL_PEM_write_mem_DSAPrivateKey failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } ret = (int)XFWRITE(pem, plen, 1, fp); if (ret != 1) { WOLFSSL_MSG("DSA private key file write failed"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } XFREE(pem, NULL, DYNAMIC_TYPE_KEY); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* NO_FILESYSTEM */ @@ -22644,7 +22644,7 @@ int wolfSSL_PEM_write_DSA_PUBKEY(FILE *fp, WOLFSSL_DSA *x) WOLFSSL_MSG("wolfSSL_PEM_write_DSA_PUBKEY not implemented"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #endif /* NO_FILESYSTEM */ @@ -22718,7 +22718,7 @@ int wolfSSL_PEM_write_RSAPublicKey(FILE *fp, WOLFSSL_RSA *x) WOLFSSL_MSG("wolfSSL_PEM_write_RSAPublicKey not implemented"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* return code compliant with OpenSSL : @@ -22731,11 +22731,11 @@ int wolfSSL_PEM_write_RSA_PUBKEY(FILE *fp, WOLFSSL_RSA *x) WOLFSSL_MSG("wolfSSL_PEM_write_RSA_PUBKEY not implemented"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #endif /* NO_FILESYSTEM */ -/* return SSL_SUCCESS if success, SSL_FATAL_ERROR if error */ +/* return WOLF_SSL_SUCCESS if success, WOLF_SSL_FATAL_ERROR if error */ int wolfSSL_RSA_LoadDer(WOLFSSL_RSA* rsa, const unsigned char* derBuf, int derSz) { word32 idx = 0; @@ -22745,29 +22745,29 @@ int wolfSSL_RSA_LoadDer(WOLFSSL_RSA* rsa, const unsigned char* derBuf, int derSz if (rsa == NULL || rsa->internal == NULL || derBuf == NULL || derSz <= 0) { WOLFSSL_MSG("Bad function arguments"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ret = wc_RsaPrivateKeyDecode(derBuf, &idx, (RsaKey*)rsa->internal, derSz); if (ret < 0) { WOLFSSL_MSG("RsaPrivateKeyDecode failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetRsaExternal(rsa) != SSL_SUCCESS) { + if (SetRsaExternal(rsa) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetRsaExternal failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } rsa->inSet = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* NO_RSA */ #ifndef NO_DSA -/* return SSL_SUCCESS if success, SSL_FATAL_ERROR if error */ +/* return WOLF_SSL_SUCCESS if success, WOLF_SSL_FATAL_ERROR if error */ int wolfSSL_DSA_LoadDer(WOLFSSL_DSA* dsa, const unsigned char* derBuf, int derSz) { word32 idx = 0; @@ -22777,28 +22777,28 @@ int wolfSSL_DSA_LoadDer(WOLFSSL_DSA* dsa, const unsigned char* derBuf, int derSz if (dsa == NULL || dsa->internal == NULL || derBuf == NULL || derSz <= 0) { WOLFSSL_MSG("Bad function arguments"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ret = DsaPrivateKeyDecode(derBuf, &idx, (DsaKey*)dsa->internal, derSz); if (ret < 0) { WOLFSSL_MSG("DsaPrivateKeyDecode failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetDsaExternal(dsa) != SSL_SUCCESS) { + if (SetDsaExternal(dsa) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetDsaExternal failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } dsa->inSet = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* NO_DSA */ #ifdef HAVE_ECC -/* return SSL_SUCCESS if success, SSL_FATAL_ERROR if error */ +/* return WOLF_SSL_SUCCESS if success, WOLF_SSL_FATAL_ERROR if error */ int wolfSSL_EC_KEY_LoadDer(WOLFSSL_EC_KEY* key, const unsigned char* derBuf, int derSz) { @@ -22809,23 +22809,23 @@ int wolfSSL_EC_KEY_LoadDer(WOLFSSL_EC_KEY* key, if (key == NULL || key->internal == NULL || derBuf == NULL || derSz <= 0) { WOLFSSL_MSG("Bad function arguments"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ret = wc_EccPrivateKeyDecode(derBuf, &idx, (ecc_key*)key->internal, derSz); if (ret < 0) { WOLFSSL_MSG("wc_EccPrivateKeyDecode failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } - if (SetECKeyExternal(key) != SSL_SUCCESS) { + if (SetECKeyExternal(key) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("SetECKeyExternal failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } key->inSet = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* HAVE_ECC */ @@ -22935,7 +22935,7 @@ WOLFSSL_X509* wolfSSL_get_chain_X509(WOLFSSL_X509_CHAIN* chain, int idx) /* Get peer's PEM certificate at index (idx), output to buffer if inLen big enough else return error (-1). If buffer is NULL only calculate - outLen. Output length is in *outLen SSL_SUCCESS on ok */ + outLen. Output length is in *outLen WOLF_SSL_SUCCESS on ok */ int wolfSSL_get_chain_cert_pem(WOLFSSL_X509_CHAIN* chain, int idx, unsigned char* buf, int inLen, int* outLen) { @@ -22956,7 +22956,7 @@ int wolfSSL_get_chain_cert_pem(WOLFSSL_X509_CHAIN* chain, int idx, if(!buf) { if(Base64_Encode(chain->certs[idx].buffer, chain->certs[idx].length, NULL, &szNeeded) != LENGTH_ONLY_E) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; *outLen = szNeeded + headerLen + footerLen; return LENGTH_ONLY_E; } @@ -22967,7 +22967,7 @@ int wolfSSL_get_chain_cert_pem(WOLFSSL_X509_CHAIN* chain, int idx, /* header */ if (XMEMCPY(buf, header, headerLen) == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; i = headerLen; @@ -22982,10 +22982,10 @@ int wolfSSL_get_chain_cert_pem(WOLFSSL_X509_CHAIN* chain, int idx, if ( (i + footerLen) > inLen) return BAD_FUNC_ARG; if (XMEMCPY(buf + i, footer, footerLen) == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; *outLen += headerLen + footerLen; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -23384,7 +23384,7 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) #endif pemSz = (int)i; x509 = wolfSSL_X509_load_certificate_buffer(pem, pemSz, - SSL_FILETYPE_PEM); + WOLF_SSL_FILETYPE_PEM); if (x != NULL) { *x = x509; @@ -23478,7 +23478,7 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) break; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } int wolfSSL_BIO_read_filename(WOLFSSL_BIO *b, const char *name) { @@ -23487,26 +23487,26 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) WOLFSSL_ENTER("wolfSSL_BIO_new_file"); - if ((wolfSSL_BIO_get_fp(b, &fp) == SSL_SUCCESS) && (fp != NULL)) + if ((wolfSSL_BIO_get_fp(b, &fp) == WOLF_SSL_SUCCESS) && (fp != NULL)) { XFCLOSE(fp); } fp = XFOPEN(name, "r"); if (fp == NULL) - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; - if (wolfSSL_BIO_set_fp(b, fp, BIO_CLOSE) != SSL_SUCCESS) { + if (wolfSSL_BIO_set_fp(b, fp, BIO_CLOSE) != WOLF_SSL_SUCCESS) { XFCLOSE(fp); - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } /* file is closed when bio is free'd */ - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; #else (void)name; (void)b; - return SSL_NOT_IMPLEMENTED; + return WOLF_SSL_NOT_IMPLEMENTED; #endif } @@ -23622,7 +23622,7 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) return NULL; } - void wolfSSL_sk_X509_NAME_pop_free(STACK_OF(WOLFSSL_X509_NAME)* sk, void f (WOLFSSL_X509_NAME*)){ + void wolfSSL_sk_X509_NAME_pop_free(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk, void f (WOLFSSL_X509_NAME*)){ (void) sk; (void) f; WOLFSSL_ENTER("wolfSSL_sk_X509_NAME_pop_free"); @@ -23635,10 +23635,10 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) WOLFSSL_ENTER("wolfSSL_X509_check_private_key"); WOLFSSL_STUB("wolfSSL_X509_check_private_key"); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } - STACK_OF(WOLFSSL_X509_NAME) *wolfSSL_dup_CA_list( STACK_OF(WOLFSSL_X509_NAME) *sk ){ + WOLF_STACK_OF(WOLFSSL_X509_NAME) *wolfSSL_dup_CA_list( WOLF_STACK_OF(WOLFSSL_X509_NAME) *sk ){ (void) sk; WOLFSSL_ENTER("wolfSSL_dup_CA_list"); WOLFSSL_STUB("wolfSSL_dup_CA_list"); @@ -23687,7 +23687,7 @@ int wolfSSL_CTX_use_PrivateKey(WOLFSSL_CTX *ctx, WOLFSSL_EVP_PKEY *pkey) WOLFSSL_ENTER("wolfSSL_CTX_use_PrivateKey"); if (ctx == NULL || pkey == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } return wolfSSL_CTX_use_PrivateKey_buffer(ctx, @@ -23734,14 +23734,14 @@ int wolfSSL_CTX_set_ex_data(WOLFSSL_CTX* ctx, int idx, void* data) if (ctx != NULL && idx < MAX_EX_DATA) { ctx->ex_data[idx] = data; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #else (void)ctx; (void)idx; (void)data; #endif - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -23752,14 +23752,14 @@ int wolfSSL_set_ex_data(WOLFSSL* ssl, int idx, void* data) if (ssl != NULL && idx < MAX_EX_DATA) { ssl->ex_data[idx] = data; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #else (void)ssl; (void)idx; (void)data; #endif - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -23859,21 +23859,21 @@ WOLFSSL_DSA *wolfSSL_PEM_read_bio_DSAparams(WOLFSSL_BIO *bp, WOLFSSL_DSA **x, return NULL; } - if (SetIndividualExternal(&dsa->p, &key->p) != SSL_SUCCESS) { + if (SetIndividualExternal(&dsa->p, &key->p) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("dsa p key error"); FreeDer(&pDer); wolfSSL_DSA_free(dsa); return NULL; } - if (SetIndividualExternal(&dsa->q, &key->q) != SSL_SUCCESS) { + if (SetIndividualExternal(&dsa->q, &key->q) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("dsa q key error"); FreeDer(&pDer); wolfSSL_DSA_free(dsa); return NULL; } - if (SetIndividualExternal(&dsa->g, &key->g) != SSL_SUCCESS) { + if (SetIndividualExternal(&dsa->g, &key->g) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("dsa g key error"); FreeDer(&pDer); wolfSSL_DSA_free(dsa); @@ -23932,7 +23932,7 @@ WOLFSSL_BIO *wolfSSL_BIO_new_file(const char *filename, const char *mode) return bio; } - if (wolfSSL_BIO_set_fp(bio, fp, BIO_CLOSE) != SSL_SUCCESS) { + if (wolfSSL_BIO_set_fp(bio, fp, BIO_CLOSE) != WOLF_SSL_SUCCESS) { XFCLOSE(fp); wolfSSL_BIO_free(bio); bio = NULL; @@ -24081,12 +24081,12 @@ int wolfSSL_PEM_write_bio_X509(WOLFSSL_BIO *bio, WOLFSSL_X509 *cert) WOLFSSL_ENTER("wolfSSL_PEM_write_bio_X509"); if (bio == NULL || cert == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (bio->type != BIO_MEMORY) { WOLFSSL_MSG("BIO type not supported for writing X509 as PEM"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } certDer = cert->derCert->buffer; @@ -24096,29 +24096,29 @@ int wolfSSL_PEM_write_bio_X509(WOLFSSL_BIO *bio, WOLFSSL_X509 *cert) pemSz = wc_DerToPem(certDer, derSz, NULL, 0, CERT_TYPE); if (pemSz < 0) { WOLFSSL_LEAVE("wolfSSL_PEM_write_bio_X509", pemSz); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (bio->mem != NULL) { XFREE(bio->mem, NULL, DYNAMIC_TYPE_OPENSSL); } bio->mem = (byte*)XMALLOC(pemSz, NULL, DYNAMIC_TYPE_OPENSSL); if (bio->mem == NULL) { - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } bio->memLen = pemSz; ret = wc_DerToPemEx(certDer, derSz, bio->mem, bio->memLen, NULL, CERT_TYPE); if (ret < 0) { WOLFSSL_LEAVE("wolfSSL_PEM_write_bio_X509", ret); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #if defined(OPENSSL_EXTRA) && !defined(NO_DH) -/* Intialize ctx->dh with dh's params. Return SSL_SUCCESS on ok */ +/* Intialize ctx->dh with dh's params. Return WOLF_SSL_SUCCESS on ok */ long wolfSSL_CTX_set_tmp_dh(WOLFSSL_CTX* ctx, WOLFSSL_DH* dh) { int pSz, gSz; @@ -24135,7 +24135,7 @@ long wolfSSL_CTX_set_tmp_dh(WOLFSSL_CTX* ctx, WOLFSSL_DH* dh) gSz = wolfSSL_BN_bn2bin(dh->g, NULL); if(pSz <= 0 || gSz <= 0) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; p = (byte*)XMALLOC(pSz, ctx->heap, DYNAMIC_TYPE_PUBLIC_KEY); if(!p) @@ -24156,7 +24156,7 @@ long wolfSSL_CTX_set_tmp_dh(WOLFSSL_CTX* ctx, WOLFSSL_DH* dh) XFREE(p, ctx->heap, DYNAMIC_TYPE_PUBLIC_KEY); XFREE(g, ctx->heap, DYNAMIC_TYPE_PUBLIC_KEY); - return pSz > 0 && gSz > 0 ? ret : SSL_FATAL_ERROR; + return pSz > 0 && gSz > 0 ? ret : WOLF_SSL_FATAL_ERROR; } #endif /* OPENSSL_EXTRA && !NO_DH */ #endif /* HAVE_LIGHTY || HAVE_STUNNEL || WOLFSSL_MYSQL_COMPATIBLE || WOLFSSL_HAPROXY */ @@ -24182,10 +24182,10 @@ int wolfSSL_SESSION_set_ex_data(WOLFSSL_SESSION* session, int idx, void* data) #ifdef HAVE_EX_DATA if(session != NULL && idx < MAX_EX_DATA) { session->ex_data[idx] = data; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -24203,7 +24203,7 @@ int wolfSSL_SESSION_get_ex_new_index(long idx, void* data, void* cb1, else if(XSTRNCMP((const char*)data, "addr index", 10) == 0) { return 1; } - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -24228,7 +24228,7 @@ int wolfSSL_CRYPTO_set_mem_ex_functions(void *(*m) (size_t, const char *, int), WOLFSSL_ENTER("wolfSSL_CRYPTO_set_mem_ex_functions"); WOLFSSL_STUB("wolfSSL_CRYPTO_set_mem_ex_functions"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -24294,7 +24294,7 @@ int wolfSSL_FIPS_mode(void) WOLFSSL_ENTER("wolfSSL_FIPS_mode"); WOLFSSL_STUB("wolfSSL_FIPS_mode"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } int wolfSSL_FIPS_mode_set(int r) @@ -24303,7 +24303,7 @@ int wolfSSL_FIPS_mode_set(int r) WOLFSSL_ENTER("wolfSSL_FIPS_mode_set"); WOLFSSL_STUB("wolfSSL_FIPS_mode_set"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } @@ -24313,13 +24313,13 @@ int wolfSSL_RAND_set_rand_method(const void *meth) WOLFSSL_ENTER("wolfSSL_RAND_set_rand_method"); WOLFSSL_STUB("wolfSSL_RAND_set_rand_method"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } int wolfSSL_CIPHER_get_bits(const WOLFSSL_CIPHER *c, int *alg_bits) { - int ret = SSL_FAILURE; + int ret = WOLF_SSL_FAILURE; WOLFSSL_ENTER("wolfSSL_CIPHER_get_bits"); if(c != NULL && c->ssl != NULL) { ret = 8 * c->ssl->specs.key_size; @@ -24331,7 +24331,7 @@ int wolfSSL_CIPHER_get_bits(const WOLFSSL_CIPHER *c, int *alg_bits) } -int wolfSSL_sk_X509_NAME_num(const STACK_OF(WOLFSSL_X509_NAME) *s) +int wolfSSL_sk_X509_NAME_num(const WOLF_STACK_OF(WOLFSSL_X509_NAME) *s) { WOLFSSL_ENTER("wolfSSL_sk_X509_NAME_num"); @@ -24341,7 +24341,7 @@ int wolfSSL_sk_X509_NAME_num(const STACK_OF(WOLFSSL_X509_NAME) *s) } -int wolfSSL_sk_X509_num(const STACK_OF(WOLFSSL_X509) *s) +int wolfSSL_sk_X509_num(const WOLF_STACK_OF(WOLFSSL_X509) *s) { WOLFSSL_ENTER("wolfSSL_sk_X509_num"); @@ -24360,18 +24360,18 @@ int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name, for (i = 0; i < indent; i++) { if (wolfSSL_BIO_write(bio, " ", 1) != 1) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (flags == XN_FLAG_RFC2253) { if (wolfSSL_BIO_write(bio, name->name + 1, name->sz - 2) != name->sz - 2) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } else if (wolfSSL_BIO_write(bio, name->name, name->sz) != name->sz) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -24392,7 +24392,7 @@ int wolfSSL_CTX_add_session(WOLFSSL_CTX* ctx, WOLFSSL_SESSION* session) WOLFSSL_ENTER("wolfSSL_CTX_add_session"); WOLFSSL_STUB("wolfSSL_CTX_add_session"); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -24402,11 +24402,11 @@ int wolfSSL_get_state(const WOLFSSL* ssl) WOLFSSL_ENTER("wolfSSL_get_state"); WOLFSSL_STUB("wolfSSL_get_state"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } -void* wolfSSL_sk_X509_NAME_value(const STACK_OF(WOLFSSL_X509_NAME)* sk, int i) +void* wolfSSL_sk_X509_NAME_value(const WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk, int i) { WOLFSSL_ENTER("wolfSSL_sk_X509_NAME_value"); @@ -24419,7 +24419,7 @@ void* wolfSSL_sk_X509_NAME_value(const STACK_OF(WOLFSSL_X509_NAME)* sk, int i) } -void* wolfSSL_sk_X509_value(STACK_OF(WOLFSSL_X509)* sk, int i) +void* wolfSSL_sk_X509_value(WOLF_STACK_OF(WOLFSSL_X509)* sk, int i) { WOLFSSL_ENTER("wolfSSL_sk_X509_value"); @@ -24445,7 +24445,7 @@ int wolfSSL_version(WOLFSSL* ssl) case TLSv1_3_MINOR : return TLS1_VERSION; default: - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } else if (ssl->version.major == DTLS_MAJOR) { @@ -24454,14 +24454,14 @@ int wolfSSL_version(WOLFSSL* ssl) case DTLSv1_2_MINOR : return DTLS1_VERSION; default: - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } } - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } -STACK_OF(WOLFSSL_X509)* wolfSSL_get_peer_cert_chain(const WOLFSSL* ssl) +WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_get_peer_cert_chain(const WOLFSSL* ssl) { (void)ssl; WOLFSSL_ENTER("wolfSSL_get_peer_cert_chain"); @@ -24512,7 +24512,7 @@ const char * wolfSSL_get_servername(WOLFSSL* ssl, byte type) WOLFSSL_CTX* wolfSSL_set_SSL_CTX(WOLFSSL* ssl, WOLFSSL_CTX* ctx) { - if (ssl && ctx && SetSSL_CTX(ssl, ctx, 0) == SSL_SUCCESS) + if (ssl && ctx && SetSSL_CTX(ssl, ctx, 0) == WOLF_SSL_SUCCESS) return ssl->ctx; return NULL; } @@ -24580,7 +24580,7 @@ void wolfSSL_THREADID_set_numeric(void* id, unsigned long val) } -STACK_OF(WOLFSSL_X509)* wolfSSL_X509_STORE_get1_certs(WOLFSSL_X509_STORE_CTX* ctx, +WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_X509_STORE_get1_certs(WOLFSSL_X509_STORE_CTX* ctx, WOLFSSL_X509_NAME* name) { WOLFSSL_ENTER("wolfSSL_X509_STORE_get1_certs"); @@ -24590,7 +24590,7 @@ STACK_OF(WOLFSSL_X509)* wolfSSL_X509_STORE_get1_certs(WOLFSSL_X509_STORE_CTX* ct return NULL; } -void wolfSSL_sk_X509_pop_free(STACK_OF(WOLFSSL_X509)* sk, void f (WOLFSSL_X509*)){ +void wolfSSL_sk_X509_pop_free(WOLF_STACK_OF(WOLFSSL_X509)* sk, void f (WOLFSSL_X509*)){ (void) sk; (void) f; WOLFSSL_ENTER("wolfSSL_sk_X509_pop_free"); @@ -24622,18 +24622,18 @@ int wolfSSL_CTX_get_verify_mode(WOLFSSL_CTX* ctx) WOLFSSL_ENTER("wolfSSL_CTX_get_verify_mode"); if(!ctx) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; if (ctx->verifyPeer) - mode |= SSL_VERIFY_PEER; + mode |= WOLF_SSL_VERIFY_PEER; else if (ctx->verifyNone) - mode |= SSL_VERIFY_NONE; + mode |= WOLF_SSL_VERIFY_NONE; if (ctx->failNoCert) - mode |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT; + mode |= WOLF_SSL_VERIFY_FAIL_IF_NO_PEER_CERT; if (ctx->failNoCertxPSK) - mode |= SSL_VERIFY_FAIL_EXCEPT_PSK; + mode |= WOLF_SSL_VERIFY_FAIL_EXCEPT_PSK; WOLFSSL_LEAVE("wolfSSL_CTX_get_verify_mode", mode); return mode; @@ -24653,9 +24653,9 @@ int wolfSSL_EC25519_generate_key(unsigned char *priv, unsigned int *privSz, (void) privSz; (void) pub; (void) pubSz; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; #else /* WOLFSSL_KEY_GEN */ - int ret = SSL_FAILURE; + int ret = WOLF_SSL_FAILURE; int initTmpRng = 0; WC_RNG *rng = NULL; #ifdef WOLFSSL_SMALL_STACK @@ -24669,13 +24669,13 @@ int wolfSSL_EC25519_generate_key(unsigned char *priv, unsigned int *privSz, if (priv == NULL || privSz == NULL || *privSz < CURVE25519_KEYSIZE || pub == NULL || pubSz == NULL || *pubSz < CURVE25519_KEYSIZE) { WOLFSSL_MSG("Bad arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #ifdef WOLFSSL_SMALL_STACK tmpRNG = (WC_RNG*)XMALLOC(sizeof(WC_RNG), NULL, DYNAMIC_TYPE_RNG); if (tmpRNG == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; #endif if (wc_InitRng(tmpRNG) == 0) { rng = tmpRNG; @@ -24702,7 +24702,7 @@ int wolfSSL_EC25519_generate_key(unsigned char *priv, unsigned int *privSz, != MP_OKAY) WOLFSSL_MSG("wc_curve25519_export_key_raw_ex failed"); else - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; wc_curve25519_free(&key); } @@ -24733,9 +24733,9 @@ int wolfSSL_EC25519_shared_key(unsigned char *shared, unsigned int *sharedSz, (void) privSz; (void) pub; (void) pubSz; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; #else /* WOLFSSL_KEY_GEN */ - int ret = SSL_FAILURE; + int ret = WOLF_SSL_FAILURE; curve25519_key privkey, pubkey; WOLFSSL_ENTER("wolfSSL_EC25519_shared_key"); @@ -24744,7 +24744,7 @@ int wolfSSL_EC25519_shared_key(unsigned char *shared, unsigned int *sharedSz, priv == NULL || privSz < CURVE25519_KEYSIZE || pub == NULL || pubSz < CURVE25519_KEYSIZE) { WOLFSSL_MSG("Bad arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* import private key */ @@ -24778,7 +24778,7 @@ int wolfSSL_EC25519_shared_key(unsigned char *shared, unsigned int *sharedSz, EC25519_LITTLE_ENDIAN) != MP_OKAY) WOLFSSL_MSG("wc_curve25519_shared_secret_ex failed"); else - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; wc_curve25519_free(&privkey); wc_curve25519_free(&pubkey); @@ -24801,9 +24801,9 @@ int wolfSSL_ED25519_generate_key(unsigned char *priv, unsigned int *privSz, (void) privSz; (void) pub; (void) pubSz; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; #else /* WOLFSSL_KEY_GEN */ - int ret = SSL_FAILURE; + int ret = WOLF_SSL_FAILURE; int initTmpRng = 0; WC_RNG *rng = NULL; #ifdef WOLFSSL_SMALL_STACK @@ -24817,13 +24817,13 @@ int wolfSSL_ED25519_generate_key(unsigned char *priv, unsigned int *privSz, if (priv == NULL || privSz == NULL || *privSz < ED25519_PRV_KEY_SIZE || pub == NULL || pubSz == NULL || *pubSz < ED25519_PUB_KEY_SIZE) { WOLFSSL_MSG("Bad arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #ifdef WOLFSSL_SMALL_STACK tmpRNG = (WC_RNG*)XMALLOC(sizeof(WC_RNG), NULL, DYNAMIC_TYPE_RNG); if (tmpRNG == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; #endif if (wc_InitRng(tmpRNG) == 0) { rng = tmpRNG; @@ -24848,7 +24848,7 @@ int wolfSSL_ED25519_generate_key(unsigned char *priv, unsigned int *privSz, else if (wc_ed25519_export_key(&key, priv, privSz, pub, pubSz)!=MP_OKAY) WOLFSSL_MSG("wc_ed25519_export_key failed"); else - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; wc_ed25519_free(&key); } @@ -24880,17 +24880,17 @@ int wolfSSL_ED25519_sign(const unsigned char *msg, unsigned int msgSz, (void) privSz; (void) sig; (void) sigSz; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; #else /* WOLFSSL_KEY_GEN */ ed25519_key key; - int ret = SSL_FAILURE; + int ret = WOLF_SSL_FAILURE; WOLFSSL_ENTER("wolfSSL_ED25519_sign"); if (priv == NULL || privSz != ED25519_PRV_KEY_SIZE || msg == NULL || sig == NULL || *sigSz < ED25519_SIG_SIZE) { WOLFSSL_MSG("Bad arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* import key */ @@ -24909,7 +24909,7 @@ int wolfSSL_ED25519_sign(const unsigned char *msg, unsigned int msgSz, if (wc_ed25519_sign_msg(msg, msgSz, sig, sigSz, &key) != MP_OKAY) WOLFSSL_MSG("wc_curve25519_shared_secret_ex failed"); else - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; wc_ed25519_free(&key); @@ -24933,17 +24933,17 @@ int wolfSSL_ED25519_verify(const unsigned char *msg, unsigned int msgSz, (void) pubSz; (void) sig; (void) sigSz; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; #else /* WOLFSSL_KEY_GEN */ ed25519_key key; - int ret = SSL_FAILURE, check = 0; + int ret = WOLF_SSL_FAILURE, check = 0; WOLFSSL_ENTER("wolfSSL_ED25519_verify"); if (pub == NULL || pubSz != ED25519_PUB_KEY_SIZE || msg == NULL || sig == NULL || sigSz != ED25519_SIG_SIZE) { WOLFSSL_MSG("Bad arguments"); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } /* import key */ @@ -24964,7 +24964,7 @@ int wolfSSL_ED25519_verify(const unsigned char *msg, unsigned int msgSz, else if (!check) WOLFSSL_MSG("wc_ed25519_verify_msg failed (signature invalid)"); else - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; wc_ed25519_free(&key); @@ -24982,9 +24982,9 @@ int wolfSSL_set_jobject(WOLFSSL* ssl, void* objPtr) if (ssl != NULL) { ssl->jObjectRef = objPtr; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } void* wolfSSL_get_jobject(WOLFSSL* ssl) @@ -25062,7 +25062,7 @@ unsigned long wolfSSL_ERR_peek_error_line_data(const char **file, int *line, if (ret == SSL_NO_PEM_HEADER) return (ERR_LIB_PEM << 24) | PEM_R_NO_START_LINE; if (ret != WANT_READ && ret != WANT_WRITE && - ret != ZERO_RETURN && ret != SSL_ERROR_ZERO_RETURN && + ret != ZERO_RETURN && ret != WOLF_SSL_ERROR_ZERO_RETURN && ret != SOCKET_PEER_CLOSED_E && ret != SOCKET_ERROR_E) break; @@ -25079,7 +25079,7 @@ unsigned long wolfSSL_ERR_peek_error_line_data(const char **file, int *line, #if defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) -STACK_OF(WOLFSSL_CIPHER) *wolfSSL_get_ciphers_compat(const WOLFSSL *ssl) +WOLF_STACK_OF(WOLFSSL_CIPHER) *wolfSSL_get_ciphers_compat(const WOLFSSL *ssl) { (void)ssl; WOLFSSL_STUB("wolfSSL_get_ciphers_compat"); @@ -25126,14 +25126,14 @@ int wolfSSL_X509_set_ex_data(X509 *x509, int idx, void *data) if (x509 != NULL && idx < MAX_EX_DATA) { x509->ex_data[idx] = data; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #else (void)x509; (void)idx; (void)data; #endif - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } int wolfSSL_X509_NAME_digest(const WOLFSSL_X509_NAME *name, const WOLFSSL_EVP_MD *type, unsigned char *md, unsigned int *len) @@ -25141,7 +25141,7 @@ int wolfSSL_X509_NAME_digest(const WOLFSSL_X509_NAME *name, WOLFSSL_ENTER("wolfSSL_X509_NAME_digest"); if (name == NULL || type == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; return wolfSSL_EVP_Digest((unsigned char*)name->fullName.fullName, name->fullName.fullNameLen, md, len, type, NULL); @@ -25167,7 +25167,7 @@ int wolfSSL_SSL_CTX_set_tmp_ecdh(WOLFSSL_CTX *ctx, WOLFSSL_EC_KEY *ecdh) ctx->ecdhCurveOID = ecdh->group->curve_oid; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif @@ -25219,7 +25219,7 @@ int wolfSSL_SSL_do_handshake(WOLFSSL *s) WOLFSSL_ENTER("wolfSSL_SSL_do_handshake"); if (s == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; if (s->options.side == WOLFSSL_CLIENT_END) return wolfSSL_connect(s); @@ -25231,7 +25231,7 @@ int wolfSSL_SSL_in_init(WOLFSSL *s) WOLFSSL_ENTER("wolfSSL_SSL_in_init"); if (s == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; if (s->options.side == WOLFSSL_CLIENT_END) return s->options.connectState < SECOND_REPLY_DONE; @@ -25276,13 +25276,13 @@ int wolfSSL_X509_check_host(X509 *x, const char *chk, size_t chklen, InitDecodedCert(&dCert, x->derCert->buffer, x->derCert->length, NULL); ret = ParseCertRelative(&dCert, CERT_TYPE, 0, NULL); if (ret != 0) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; ret = CheckHostName(&dCert, (char *)chk, chklen); FreeDecodedCert(&dCert); if (ret != 0) - return SSL_FAILURE; - return SSL_SUCCESS; + return WOLF_SSL_FAILURE; + return WOLF_SSL_SUCCESS; } int wolfSSL_i2a_ASN1_INTEGER(BIO *bp, const WOLFSSL_ASN1_INTEGER *a) @@ -25296,7 +25296,7 @@ int wolfSSL_i2a_ASN1_INTEGER(BIO *bp, const WOLFSSL_ASN1_INTEGER *a) WOLFSSL_ENTER("wolfSSL_i2a_ASN1_INTEGER"); if (bp == NULL || a == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; /* Skip ASN.1 INTEGER (type) byte. */ i = 1; @@ -25444,7 +25444,7 @@ end: * * ctx The SSL/TLS context object. * cb The OpenSSL session ticket callback. - * returns SSL_SUCCESS to indicate success. + * returns WOLF_SSL_SUCCESS to indicate success. */ int wolfSSL_CTX_set_tlsext_ticket_key_cb(WOLFSSL_CTX *ctx, int (*cb)( WOLFSSL *ssl, unsigned char *name, unsigned char *iv, @@ -25457,7 +25457,7 @@ int wolfSSL_CTX_set_tlsext_ticket_key_cb(WOLFSSL_CTX *ctx, int (*cb)( */ ctx->ticketEncCb = wolfSSL_TicketKeyCb; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* HAVE_SESSION_TICKET */ @@ -25479,10 +25479,10 @@ char* wolfSSL_get_ocsp_url(WOLFSSL* ssl) int wolfSSL_set_ocsp_url(WOLFSSL* ssl, char* url) { if (ssl == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; ssl->url = url; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } static INLINE void ato24(const byte* c, word32* u24) @@ -25490,7 +25490,7 @@ static INLINE void ato24(const byte* c, word32* u24) *u24 = (c[0] << 16) | (c[1] << 8) | c[2]; } -int wolfSSL_CTX_get_extra_chain_certs(WOLFSSL_CTX* ctx, STACK_OF(X509)** chain) +int wolfSSL_CTX_get_extra_chain_certs(WOLFSSL_CTX* ctx, WOLF_STACK_OF(X509)** chain) { word32 idx; word32 length; @@ -25499,17 +25499,17 @@ int wolfSSL_CTX_get_extra_chain_certs(WOLFSSL_CTX* ctx, STACK_OF(X509)** chain) if (ctx == NULL || chain == NULL) { chain = NULL; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } if (ctx->x509Chain != NULL) { *chain = ctx->x509Chain; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* If there are no chains then success! */ *chain = NULL; if (ctx->certChain == NULL || ctx->certChain->length == 0) { - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* Create a new stack of WOLFSSL_X509 object from chain buffer. */ @@ -25517,7 +25517,7 @@ int wolfSSL_CTX_get_extra_chain_certs(WOLFSSL_CTX* ctx, STACK_OF(X509)** chain) node = (WOLFSSL_STACK*)XMALLOC(sizeof(WOLFSSL_STACK), NULL, DYNAMIC_TYPE_OPENSSL); if (node == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; node->next = NULL; /* 3 byte length | X509 DER data */ @@ -25531,7 +25531,7 @@ int wolfSSL_CTX_get_extra_chain_certs(WOLFSSL_CTX* ctx, STACK_OF(X509)** chain) XFREE(node, NULL, DYNAMIC_TYPE_OPENSSL); /* Return as much of the chain as we created. */ ctx->x509Chain = *chain; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } idx += length; @@ -25550,23 +25550,23 @@ int wolfSSL_CTX_get_extra_chain_certs(WOLFSSL_CTX* ctx, STACK_OF(X509)** chain) ctx->x509Chain = *chain; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } int wolfSSL_CTX_set_tlsext_status_cb(WOLFSSL_CTX* ctx, int(*cb)(WOLFSSL*, void*)) { if (ctx == NULL || ctx->cm == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; /* Ensure stapling is on for callback to be used. */ wolfSSL_CTX_EnableOCSPStapling(ctx); if (ctx->cm->ocsp_stapling == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; ctx->cm->ocsp_stapling->statusCb = cb; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } int wolfSSL_X509_STORE_CTX_get1_issuer(WOLFSSL_X509 **issuer, @@ -25581,13 +25581,13 @@ int wolfSSL_X509_STORE_CTX_get1_issuer(WOLFSSL_X509 **issuer, #endif if (issuer == NULL || ctx == NULL || x == NULL) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; if (ctx->chain != NULL) { for (node = ctx->chain; node != NULL; node = node->next) { if (wolfSSL_X509_check_issued(node->data.x509, x) == X509_V_OK) { *issuer = x; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } } } @@ -25596,7 +25596,7 @@ int wolfSSL_X509_STORE_CTX_get1_issuer(WOLFSSL_X509 **issuer, #ifdef WOLFSSL_SMALL_STACK cert = (DecodedCert*)XMALLOC(sizeof(DecodedCert), NULL, DYNAMIC_TYPE_DCERT); if (cert == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; #endif /* Use existing CA retrieval APIs that use DecodedCert. */ @@ -25617,12 +25617,12 @@ int wolfSSL_X509_STORE_CTX_get1_issuer(WOLFSSL_X509 **issuer, #endif if (ca == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; *issuer = (WOLFSSL_X509 *)XMALLOC(sizeof(WOLFSSL_X509), 0, DYNAMIC_TYPE_OPENSSL); if (*issuer == NULL) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; /* Create an empty certificate as CA doesn't have a certificate. */ XMEMSET(*issuer, 0, sizeof(WOLFSSL_X509)); @@ -25630,10 +25630,10 @@ int wolfSSL_X509_STORE_CTX_get1_issuer(WOLFSSL_X509 **issuer, /* Result is ignored when passed to wolfSSL_OCSP_cert_to_id(). */ - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } -void wolfSSL_X509_email_free(STACK_OF(WOLFSSL_STRING) *sk) +void wolfSSL_X509_email_free(WOLF_STACK_OF(WOLFSSL_STRING) *sk) { WOLFSSL_STACK *curr; @@ -25645,7 +25645,7 @@ void wolfSSL_X509_email_free(STACK_OF(WOLFSSL_STRING) *sk) } } -STACK_OF(WOLFSSL_STRING) *wolfSSL_X509_get1_ocsp(WOLFSSL_X509 *x) +WOLF_STACK_OF(WOLFSSL_STRING) *wolfSSL_X509_get1_ocsp(WOLFSSL_X509 *x) { WOLFSSL_STACK *list = NULL; @@ -25693,7 +25693,7 @@ WOLFSSL_X509* wolfSSL_X509_dup(WOLFSSL_X509 *x) return wolfSSL_X509_d2i(NULL, x->derCert->buffer, x->derCert->length); } -char* wolfSSL_sk_WOLFSSL_STRING_value(STACK_OF(WOLFSSL_STRING)* strings, +char* wolfSSL_sk_WOLFSSL_STRING_value(WOLF_STACK_OF(WOLFSSL_STRING)* strings, int idx) { for (; idx > 0 && strings != NULL; idx--) @@ -25816,7 +25816,7 @@ WOLFSSL_API int wolfSSL_CTX_set1_curves_list(WOLFSSL_CTX* ctx, char* names) len = idx - 1 - start; if (len > MAX_CURVE_NAME_SZ - 1) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; XMEMCPY(name, names + start, len); name[len] = 0; @@ -25837,14 +25837,14 @@ WOLFSSL_API int wolfSSL_CTX_set1_curves_list(WOLFSSL_CTX* ctx, char* names) else if (XSTRNCMP(name, "X25519", len) == 0) curve = WOLFSSL_ECC_X25519; else if ((curve = wc_ecc_get_curve_id_from_name(name)) < 0) - return SSL_FAILURE; + return WOLF_SSL_FAILURE; /* Switch the bit to off and therefore is enabled. */ ctx->disabledCurves &= ~(1 << curve); start = idx + 1; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif @@ -25854,28 +25854,28 @@ int wolfSSL_CTX_set_msg_callback(WOLFSSL_CTX *ctx, SSL_Msg_Cb cb) WOLFSSL_STUB("SSL_CTX_set_msg_callback"); (void)ctx; (void)cb; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } int wolfSSL_set_msg_callback(WOLFSSL *ssl, SSL_Msg_Cb cb) { WOLFSSL_STUB("SSL_set_msg_callback"); (void)ssl; (void)cb; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } int wolfSSL_CTX_set_msg_callback_arg(WOLFSSL_CTX *ctx, void* arg) { WOLFSSL_STUB("SSL_CTX_set_msg_callback_arg"); (void)ctx; (void)arg; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } int wolfSSL_set_msg_callback_arg(WOLFSSL *ssl, void* arg) { WOLFSSL_STUB("SSL_set_msg_callback_arg"); (void)ssl; (void)arg; - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } #endif diff --git a/src/tls.c b/src/tls.c index 477860c3c..10af1c188 100755 --- a/src/tls.c +++ b/src/tls.c @@ -73,9 +73,9 @@ #ifdef WOLFSSL_SHA384 - #define P_HASH_MAX_SIZE SHA384_DIGEST_SIZE + #define P_HASH_MAX_SIZE WC_SHA384_DIGEST_SIZE #else - #define P_HASH_MAX_SIZE SHA256_DIGEST_SIZE + #define P_HASH_MAX_SIZE WC_SHA256_DIGEST_SIZE #endif @@ -118,30 +118,30 @@ static int p_hash(byte* result, word32 resLen, const byte* secret, switch (hash) { #ifndef NO_MD5 case md5_mac: - hash = MD5; - len = MD5_DIGEST_SIZE; + hash = WC_MD5; + len = WC_MD5_DIGEST_SIZE; break; #endif #ifndef NO_SHA256 case sha256_mac: - hash = SHA256; - len = SHA256_DIGEST_SIZE; + hash = WC_SHA256; + len = WC_SHA256_DIGEST_SIZE; break; #endif #ifdef WOLFSSL_SHA384 case sha384_mac: - hash = SHA384; - len = SHA384_DIGEST_SIZE; + hash = WC_SHA384; + len = WC_SHA384_DIGEST_SIZE; break; #endif #ifndef NO_SHA case sha_mac: default: - hash = SHA; - len = SHA_DIGEST_SIZE; + hash = WC_SHA; + len = WC_SHA_DIGEST_SIZE; break; #endif } @@ -347,7 +347,7 @@ static int PRF(byte* digest, word32 digLen, const byte* secret, word32 secLen, } #ifdef WOLFSSL_SHA384 - #define HSHASH_SZ SHA384_DIGEST_SIZE + #define HSHASH_SZ WC_SHA384_DIGEST_SIZE #else #define HSHASH_SZ FINISHED_SZ #endif @@ -362,7 +362,7 @@ int BuildTlsHandshakeHash(WOLFSSL* ssl, byte* hash, word32* hashLen) #ifndef NO_OLD_TLS wc_Md5GetHash(&ssl->hsHashes->hashMd5, hash); - wc_ShaGetHash(&ssl->hsHashes->hashSha, &hash[MD5_DIGEST_SIZE]); + wc_ShaGetHash(&ssl->hsHashes->hashSha, &hash[WC_MD5_DIGEST_SIZE]); #endif if (IsAtLeastTLSv1_2(ssl)) { @@ -374,7 +374,7 @@ int BuildTlsHandshakeHash(WOLFSSL* ssl, byte* hash, word32* hashLen) if (ret != 0) return ret; - hashSz = SHA256_DIGEST_SIZE; + hashSz = WC_SHA256_DIGEST_SIZE; } #endif #ifdef WOLFSSL_SHA384 @@ -384,7 +384,7 @@ int BuildTlsHandshakeHash(WOLFSSL* ssl, byte* hash, word32* hashLen) if (ret != 0) return ret; - hashSz = SHA384_DIGEST_SIZE; + hashSz = WC_SHA384_DIGEST_SIZE; } #endif } @@ -805,26 +805,26 @@ int wolfSSL_GetHmacType(WOLFSSL* ssl) #ifndef NO_MD5 case md5_mac: { - return MD5; + return WC_MD5; } #endif #ifndef NO_SHA256 case sha256_mac: { - return SHA256; + return WC_SHA256; } #endif #ifdef WOLFSSL_SHA384 case sha384_mac: { - return SHA384; + return WC_SHA384; } #endif #ifndef NO_SHA case sha_mac: { - return SHA; + return WC_SHA; } #endif #ifdef HAVE_BLAKE2 @@ -835,7 +835,7 @@ int wolfSSL_GetHmacType(WOLFSSL* ssl) #endif default: { - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } } @@ -1173,7 +1173,7 @@ static int TLSX_SetALPN(TLSX** extensions, const void* data, word16 size, return ret; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /** Parses a buffer of ALPN extensions and set the first one matching @@ -1207,7 +1207,7 @@ static int TLSX_ALPN_ParseAndSet(WOLFSSL *ssl, byte *input, word16 length, ssl->alpnSelectArg) == 0) { WOLFSSL_MSG("ALPN protocol match"); if (TLSX_UseALPN(&ssl->extensions, (char*)out, outLen, 0, ssl->heap) - == SSL_SUCCESS) { + == WOLF_SSL_SUCCESS) { if (extension == NULL) { extension = TLSX_Find(ssl->extensions, TLSX_APPLICATION_LAYER_PROTOCOL); @@ -1287,7 +1287,7 @@ static int TLSX_ALPN_ParseAndSet(WOLFSSL *ssl, byte *input, word16 length, alpn->protocol_name, (word16)XSTRLEN(alpn->protocol_name), ssl->heap); - if (r != SSL_SUCCESS) { + if (r != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("TLSX_UseALPN failed"); return BUFFER_ERROR; } @@ -1337,7 +1337,7 @@ int TLSX_UseALPN(TLSX** extensions, const void* data, word16 size, byte options, extension->data = (void*)alpn; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /** Get the protocol name set by the server */ @@ -1360,7 +1360,7 @@ int TLSX_ALPN_GetRequest(TLSX* extensions, void** data, word16 *dataSz) WOLFSSL_MSG("ALPN extension not found"); *data = NULL; *dataSz = 0; - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (alpn->negotiated != 1) { @@ -1368,7 +1368,7 @@ int TLSX_ALPN_GetRequest(TLSX* extensions, void** data, word16 *dataSz) /* consider as an error */ if (alpn->options & WOLFSSL_ALPN_FAILED_ON_MISMATCH) { WOLFSSL_MSG("No protocol match with peer -> Failed"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* continue without negotiated protocol */ @@ -1378,13 +1378,13 @@ int TLSX_ALPN_GetRequest(TLSX* extensions, void** data, word16 *dataSz) if (alpn->next != NULL) { WOLFSSL_MSG("Only one protocol name must be accepted"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } *data = alpn->protocol_name; *dataSz = (word16)XSTRLEN((char*)*data); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #define ALPN_FREE_ALL TLSX_ALPN_FreeAll @@ -1641,7 +1641,7 @@ static int TLSX_SNI_Parse(WOLFSSL* ssl, byte* input, word16 length, int r = TLSX_UseSNI(&ssl->extensions, type, input + offset, size, ssl->heap); - if (r != SSL_SUCCESS) + if (r != WOLF_SSL_SUCCESS) return r; /* throws error. */ if(cacheOnly) { @@ -1760,7 +1760,7 @@ int TLSX_UseSNI(TLSX** extensions, byte type, const void* data, word16 size, } while ((sni = sni->next)); } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #ifndef NO_WOLFSSL_SERVER @@ -1935,7 +1935,7 @@ int TLSX_SNI_GetFromBuffer(const byte* clientHello, word32 helloSz, *inOutSz = min(sniLen, *inOutSz); XMEMCPY(sni, clientHello + offset, *inOutSz); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } } @@ -2001,7 +2001,7 @@ static int TLSX_MFL_Parse(WOLFSSL* ssl, byte* input, word16 length, if (isRequest) { int r = TLSX_UseMaxFragment(&ssl->extensions, *input, ssl->heap); - if (r != SSL_SUCCESS) return r; /* throw error */ + if (r != WOLF_SSL_SUCCESS) return r; /* throw error */ TLSX_SetResponse(ssl, TLSX_MAX_FRAGMENT_LENGTH); } @@ -2033,7 +2033,7 @@ int TLSX_UseMaxFragment(TLSX** extensions, byte mfl, void* heap) return ret; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } @@ -2069,7 +2069,7 @@ static int TLSX_THM_Parse(WOLFSSL* ssl, byte* input, word16 length, if (isRequest) { int r = TLSX_UseTruncatedHMAC(&ssl->extensions, ssl->heap); - if (r != SSL_SUCCESS) + if (r != WOLF_SSL_SUCCESS) return r; /* throw error */ TLSX_SetResponse(ssl, TLSX_TRUNCATED_HMAC); @@ -2091,7 +2091,7 @@ int TLSX_UseTruncatedHMAC(TLSX** extensions, void* heap) if ((ret = TLSX_Push(extensions, TLSX_TRUNCATED_HMAC, NULL, heap)) != 0) return ret; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #define THM_PARSE TLSX_THM_Parse @@ -2209,7 +2209,7 @@ static int TLSX_CSR_Parse(WOLFSSL* ssl, byte* input, word16 length, ret = TLSX_UseCertificateStatusRequest(&ssl->extensions, csr->status_type, csr->options, ssl->heap, ssl->devId); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) return ret; switch (csr->status_type) { @@ -2285,7 +2285,7 @@ static int TLSX_CSR_Parse(WOLFSSL* ssl, byte* input, word16 length, /* accept the first good status_type and return */ ret = TLSX_UseCertificateStatusRequest(&ssl->extensions, status_type, 0, ssl->heap, ssl->devId); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) return ret; /* throw error */ TLSX_SetResponse(ssl, TLSX_STATUS_REQUEST); @@ -2415,7 +2415,7 @@ int TLSX_UseCertificateStatusRequest(TLSX** extensions, byte status_type, return ret; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #define CSR_FREE_ALL TLSX_CSR_Free @@ -2573,7 +2573,7 @@ static int TLSX_CSR2_Parse(WOLFSSL* ssl, byte* input, word16 length, for (; csr2; csr2 = csr2->next) { ret = TLSX_UseCertificateStatusRequestV2(&ssl->extensions, csr2->status_type, csr2->options, ssl->heap, ssl->devId); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) return ret; switch (csr2->status_type) { @@ -2672,7 +2672,7 @@ static int TLSX_CSR2_Parse(WOLFSSL* ssl, byte* input, word16 length, /* accept the first good status_type and return */ ret = TLSX_UseCertificateStatusRequestV2(&ssl->extensions, status_type, 0, ssl->heap, ssl->devId); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) return ret; /* throw error */ TLSX_SetResponse(ssl, TLSX_STATUS_REQUEST_V2); @@ -2845,7 +2845,7 @@ int TLSX_UseCertificateStatusRequestV2(TLSX** extensions, byte status_type, return ret; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #define CSR2_FREE_ALL TLSX_CSR2_FreeAll @@ -2984,7 +2984,7 @@ static int TLSX_EllipticCurve_Parse(WOLFSSL* ssl, byte* input, word16 length, r = TLSX_UseSupportedCurve(&ssl->extensions, name, ssl->heap); - if (r != SSL_SUCCESS) return r; /* throw error */ + if (r != WOLF_SSL_SUCCESS) return r; /* throw error */ } return 0; @@ -3320,7 +3320,7 @@ int TLSX_UseSupportedCurve(TLSX** extensions, word16 name, void* heap) } while ((curve = curve->next)); } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #define EC_FREE_ALL TLSX_EllipticCurve_FreeAll @@ -3412,7 +3412,7 @@ static int TLSX_SecureRenegotiation_Parse(WOLFSSL* ssl, byte* input, TLSX_RENEGOTIATION_INFO) == NULL) { ret = TLSX_AddEmptyRenegotiationInfo(&ssl->extensions, ssl->heap); - if (ret == SSL_SUCCESS) + if (ret == WOLF_SSL_SUCCESS) ret = 0; } else { @@ -3494,7 +3494,7 @@ int TLSX_UseSecureRenegotiation(TLSX** extensions, void* heap) return ret; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #ifdef HAVE_SERVER_RENEGOTIATION_INFO @@ -3512,7 +3512,7 @@ int TLSX_AddEmptyRenegotiationInfo(TLSX** extensions, void* heap) if (ext) ext->resp = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* HAVE_SERVER_RENEGOTIATION_INFO */ @@ -3603,7 +3603,7 @@ static int TLSX_SessionTicket_Parse(WOLFSSL* ssl, byte* input, word16 length, if (length == 0) { /* blank ticket */ ret = TLSX_UseSessionTicket(&ssl->extensions, NULL, ssl->heap); - if (ret == SSL_SUCCESS) { + if (ret == WOLF_SSL_SUCCESS) { ret = 0; TLSX_SetResponse(ssl, TLSX_SESSION_TICKET); /* send blank ticket */ ssl->options.createTicket = 1; /* will send ticket msg */ @@ -3621,7 +3621,7 @@ static int TLSX_SessionTicket_Parse(WOLFSSL* ssl, byte* input, word16 length, } else if (ret == WOLFSSL_TICKET_RET_CREATE) { WOLFSSL_MSG("Using existing client ticket, creating new one"); ret = TLSX_UseSessionTicket(&ssl->extensions, NULL, ssl->heap); - if (ret == SSL_SUCCESS) { + if (ret == WOLF_SSL_SUCCESS) { ret = 0; TLSX_SetResponse(ssl, TLSX_SESSION_TICKET); /* send blank ticket */ @@ -3685,7 +3685,7 @@ int TLSX_UseSessionTicket(TLSX** extensions, SessionTicket* ticket, void* heap) != 0) return ret; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #define WOLF_STK_VALIDATE_REQUEST TLSX_SessionTicket_ValidateRequest @@ -3999,7 +3999,7 @@ static int TLSX_QSH_Parse(WOLFSSL* ssl, byte* input, word16 length, /* peer sent an agreed upon scheme */ r = TLSX_UseQSHScheme(&ssl->extensions, name, NULL, 0, ssl->heap); - if (r != SSL_SUCCESS) return r; /* throw error */ + if (r != WOLF_SSL_SUCCESS) return r; /* throw error */ numKeys--; } @@ -4070,7 +4070,7 @@ static int TLSX_QSH_Parse(WOLFSSL* ssl, byte* input, word16 length, XFREE(temp, ssl->heap, DYNAMIC_TYPE_TLSX); } - if (r != SSL_SUCCESS) {return r;} /* throw error */ + if (r != WOLF_SSL_SUCCESS) {return r;} /* throw error */ numKeys--; } @@ -4266,7 +4266,7 @@ int TLSX_UseQSHScheme(TLSX** extensions, word16 name, byte* pKey, word16 pkeySz, } while ((format = format->next)); } } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #define QSH_FREE_ALL TLSX_QSH_FreeAll @@ -6201,7 +6201,7 @@ static int TLSX_PreSharedKey_Parse(WOLFSSL* ssl, byte* input, word16 length, while (list != NULL && len > 0) { /* Length of binder */ list->binderLen = input[idx++]; - if (list->binderLen < SHA256_DIGEST_SIZE || + if (list->binderLen < WC_SHA256_DIGEST_SIZE || list->binderLen > MAX_DIGEST_SIZE) return BUFFER_E; if (len < OPAQUE8_LEN + list->binderLen) @@ -6309,15 +6309,15 @@ static INLINE byte GetHmacLength(int hmac) switch (hmac) { #ifndef NO_SHA256 case sha256_mac: - return SHA256_DIGEST_SIZE; + return WC_SHA256_DIGEST_SIZE; #endif #ifndef NO_SHA384 case sha384_mac: - return SHA384_DIGEST_SIZE; + return WC_SHA384_DIGEST_SIZE; #endif #ifndef NO_SHA512 case sha512_mac: - return SHA512_DIGEST_SIZE; + return WC_SHA512_DIGEST_SIZE; #endif } return 0; @@ -7398,7 +7398,7 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer) } if (TLSX_UseQSHScheme(&ssl->extensions, WOLFSSL_NTRU_EESS743, public_key, public_key_len, ssl->heap) - != SSL_SUCCESS) + != WOLF_SSL_SUCCESS) ret = -1; /* add NTRU 196 */ @@ -7408,7 +7408,7 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer) } if (TLSX_UseQSHScheme(&ssl->extensions, WOLFSSL_NTRU_EESS593, public_key, public_key_len, ssl->heap) - != SSL_SUCCESS) + != WOLF_SSL_SUCCESS) ret = -1; /* add NTRU 128 */ @@ -7418,7 +7418,7 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer) } if (TLSX_UseQSHScheme(&ssl->extensions, WOLFSSL_NTRU_EESS439, public_key, public_key_len, ssl->heap) - != SSL_SUCCESS) + != WOLF_SSL_SUCCESS) ret = -1; } else if (ssl->sendQSHKeys && ssl->QSH_Key == NULL) { @@ -7439,7 +7439,7 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer) &public_key_len, qsh->name); if (TLSX_UseQSHScheme(&ssl->extensions, qsh->name, public_key, public_key_len, - ssl->heap) != SSL_SUCCESS) + ssl->heap) != WOLF_SSL_SUCCESS) ret = -1; qsh = next; } @@ -7455,29 +7455,29 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer) #ifndef NO_ECC_SECP ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_ECC_SECP160R1, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #ifdef HAVE_ECC_SECPR2 ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_ECC_SECP160R2, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #ifdef HAVE_ECC_KOBLITZ ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_ECC_SECP160K1, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #endif #if defined(HAVE_ECC192) || defined(HAVE_ALL_CURVES) #ifndef NO_ECC_SECP ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_ECC_SECP192R1, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #ifdef HAVE_ECC_KOBLITZ ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_ECC_SECP192K1, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #endif #endif @@ -7485,60 +7485,60 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer) #ifndef NO_ECC_SECP ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_ECC_SECP224R1, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #ifdef HAVE_ECC_KOBLITZ ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_ECC_SECP224K1, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #endif #if !defined(NO_ECC256) || defined(HAVE_ALL_CURVES) #ifndef NO_ECC_SECP ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_ECC_SECP256R1, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #if defined(HAVE_CURVE25519) ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_ECC_X25519, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #ifdef HAVE_ECC_KOBLITZ ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_ECC_SECP256K1, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #ifdef HAVE_ECC_BRAINPOOL ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_ECC_BRAINPOOLP256R1, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #endif #if defined(HAVE_ECC384) || defined(HAVE_ALL_CURVES) #ifndef NO_ECC_SECP ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_ECC_SECP384R1, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #ifdef HAVE_ECC_BRAINPOOL ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_ECC_BRAINPOOLP384R1, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #endif #if defined(HAVE_ECC512) || defined(HAVE_ALL_CURVES) #ifdef HAVE_ECC_BRAINPOOL ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_ECC_BRAINPOOLP512R1, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #endif #if defined(HAVE_ECC521) || defined(HAVE_ALL_CURVES) #ifndef NO_ECC_SECP ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_ECC_SECP521R1, ssl->heap); - if (ret != SSL_SUCCESS) return ret; + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #endif } @@ -7567,31 +7567,31 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer) #ifdef HAVE_FFDHE_2048 ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_FFDHE_2048, ssl->heap); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #ifdef HAVE_FFDHE_3072 ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_FFDHE_3072, ssl->heap); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #ifdef HAVE_FFDHE_4096 ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_FFDHE_4096, ssl->heap); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #ifdef HAVE_FFDHE_6144 ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_FFDHE_6144, ssl->heap); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) return ret; #endif #ifdef HAVE_FFDHE_8192 ret = TLSX_UseSupportedCurve(&ssl->extensions, WOLFSSL_FFDHE_8192, ssl->heap); - if (ret != SSL_SUCCESS) + if (ret != WOLF_SSL_SUCCESS) return ret; #endif ret = 0; @@ -7719,7 +7719,7 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer) (void)public_key_len; (void)ssl; - if (ret == SSL_SUCCESS) + if (ret == WOLF_SSL_SUCCESS) ret = 0; return ret; diff --git a/src/tls13.c b/src/tls13.c index c2372ee9d..ad88269ab 100644 --- a/src/tls13.c +++ b/src/tls13.c @@ -196,22 +196,22 @@ static int Tls13_HKDF_Extract(byte* prk, const byte* salt, int saltLen, switch (mac) { #ifndef NO_SHA256 case sha256_mac: - hash = SHA256; - len = SHA256_DIGEST_SIZE; + hash = WC_SHA256; + len = WC_SHA256_DIGEST_SIZE; break; #endif #ifdef WOLFSSL_SHA384 case sha384_mac: - hash = SHA384; - len = SHA384_DIGEST_SIZE; + hash = WC_SHA384; + len = WC_SHA384_DIGEST_SIZE; break; #endif #ifdef WOLFSSL_TLS13_TLS13_SHA512 case sha512_mac: - hash = SHA512; - len = SHA512_DIGEST_SIZE; + hash = WC_SHA512; + len = WC_SHA512_DIGEST_SIZE; break; #endif } @@ -348,8 +348,8 @@ static int DeriveKeyMsg(WOLFSSL* ssl, byte* output, int outputLen, ret = wc_Sha256Final(&digest.sha256, hash); wc_Sha256Free(&digest.sha256); } - hashSz = SHA256_DIGEST_SIZE; - digestAlg = SHA256; + hashSz = WC_SHA256_DIGEST_SIZE; + digestAlg = WC_SHA256; break; #endif #ifdef WOLFSSL_SHA384 @@ -361,8 +361,8 @@ static int DeriveKeyMsg(WOLFSSL* ssl, byte* output, int outputLen, ret = wc_Sha384Final(&digest.sha384, hash); wc_Sha384Free(&digest.sha384); } - hashSz = SHA384_DIGEST_SIZE; - digestAlg = SHA384; + hashSz = WC_SHA384_DIGEST_SIZE; + digestAlg = WC_SHA384; break; #endif #ifdef WOLFSSL_TLS13_SHA512 @@ -374,8 +374,8 @@ static int DeriveKeyMsg(WOLFSSL* ssl, byte* output, int outputLen, ret = wc_Sha512Final(&digest.sha512, hash); wc_Sha512Free(&digest.sha512); } - hashSz = SHA512_DIGEST_SIZE; - digestAlg = SHA512; + hashSz = WC_SHA512_DIGEST_SIZE; + digestAlg = WC_SHA512; break; #endif } @@ -428,8 +428,8 @@ static int DeriveKey(WOLFSSL* ssl, byte* output, int outputLen, switch (hashAlgo) { #ifndef NO_SHA256 case sha256_mac: - hashSz = SHA256_DIGEST_SIZE; - digestAlg = SHA256; + hashSz = WC_SHA256_DIGEST_SIZE; + digestAlg = WC_SHA256; if (includeMsgs) ret = wc_Sha256GetHash(&ssl->hsHashes->hashSha256, hash); break; @@ -437,8 +437,8 @@ static int DeriveKey(WOLFSSL* ssl, byte* output, int outputLen, #ifdef WOLFSSL_SHA384 case sha384_mac: - hashSz = SHA384_DIGEST_SIZE; - digestAlg = SHA384; + hashSz = WC_SHA384_DIGEST_SIZE; + digestAlg = WC_SHA384; if (includeMsgs) ret = wc_Sha384GetHash(&ssl->hsHashes->hashSha384, hash); break; @@ -446,8 +446,8 @@ static int DeriveKey(WOLFSSL* ssl, byte* output, int outputLen, #ifdef WOLFSSL_TLS13_SHA512 case sha512_mac: - hashSz = SHA512_DIGEST_SIZE; - digestAlg = SHA512; + hashSz = WC_SHA512_DIGEST_SIZE; + digestAlg = WC_SHA512; if (includeMsgs) ret = wc_Sha512GetHash(&ssl->hsHashes->hashSha512, hash); break; @@ -893,30 +893,30 @@ static int BuildTls13HandshakeHmac(WOLFSSL* ssl, byte* key, byte* hash, word32* pHashSz) { Hmac verifyHmac; - int hashType = SHA256; - int hashSz = SHA256_DIGEST_SIZE; + int hashType = WC_SHA256; + int hashSz = WC_SHA256_DIGEST_SIZE; int ret = BAD_FUNC_ARG; /* Get the hash of the previous handshake messages. */ switch (ssl->specs.mac_algorithm) { #ifndef NO_SHA256 case sha256_mac: - hashType = SHA256; - hashSz = SHA256_DIGEST_SIZE; + hashType = WC_SHA256; + hashSz = WC_SHA256_DIGEST_SIZE; ret = wc_Sha256GetHash(&ssl->hsHashes->hashSha256, hash); break; #endif /* !NO_SHA256 */ #ifdef WOLFSSL_SHA384 case sha384_mac: - hashType = SHA384; - hashSz = SHA384_DIGEST_SIZE; + hashType = WC_SHA384; + hashSz = WC_SHA384_DIGEST_SIZE; ret = wc_Sha384GetHash(&ssl->hsHashes->hashSha384, hash); break; #endif /* WOLFSSL_SHA384 */ #ifdef WOLFSSL_TLS13_SHA512 case sha512_mac: - hashType = SHA512; - hashSz = SHA512_DIGEST_SIZE; + hashType = WC_SHA512; + hashSz = WC_SHA512_DIGEST_SIZE; ret = wc_Sha512GetHash(&ssl->hsHashes->hashSha512, hash); break; #endif /* WOLFSSL_TLS13_SHA512 */ @@ -2392,11 +2392,11 @@ static int CreateCookie(WOLFSSL* ssl, byte* hash, byte hashSz) #if !defined(NO_SHA) && defined(NO_SHA256) cookieType = SHA; - macSz = SHA_DIGEST_SIZE; + macSz = WC_SHA_DIGEST_SIZE; #endif /* NO_SHA */ #ifndef NO_SHA256 - cookieType = SHA256; - macSz = SHA256_DIGEST_SIZE; + cookieType = WC_SHA256; + macSz = WC_SHA256_DIGEST_SIZE; #endif /* NO_SHA256 */ ret = wc_HmacSetKey(&cookieHmac, cookieType, @@ -3133,11 +3133,11 @@ static int CheckCookie(WOLFSSL* ssl, byte* cookie, byte cookieSz) #if !defined(NO_SHA) && defined(NO_SHA256) cookieType = SHA; - macSz = SHA_DIGEST_SIZE; + macSz = WC_SHA_DIGEST_SIZE; #endif /* NO_SHA */ #ifndef NO_SHA256 - cookieType = SHA256; - macSz = SHA256_DIGEST_SIZE; + cookieType = WC_SHA256; + macSz = WC_SHA256_DIGEST_SIZE; #endif /* NO_SHA256 */ if (cookieSz < ssl->specs.hash_size + macSz) @@ -3920,21 +3920,21 @@ static INLINE int GetMsgHash(WOLFSSL* ssl, byte* hash) case sha256_mac: ret = wc_Sha256GetHash(&ssl->hsHashes->hashSha256, hash); if (ret == 0) - ret = SHA256_DIGEST_SIZE; + ret = WC_SHA256_DIGEST_SIZE; break; #endif /* !NO_SHA256 */ #ifdef WOLFSSL_SHA384 case sha384_mac: ret = wc_Sha384GetHash(&ssl->hsHashes->hashSha384, hash); if (ret == 0) - ret = SHA384_DIGEST_SIZE; + ret = WC_SHA384_DIGEST_SIZE; break; #endif /* WOLFSSL_SHA384 */ #ifdef WOLFSSL_TLS13_SHA512 case sha512_mac: ret = wc_Sha512GetHash(&ssl->hsHashes->hashSha512, hash); if (ret == 0) - ret = SHA512_DIGEST_SIZE; + ret = WC_SHA512_DIGEST_SIZE; break; #endif /* WOLFSSL_TLS13_SHA512 */ } @@ -4029,7 +4029,7 @@ static int CreateRSAEncodedSig(byte* sig, byte* sigData, int sigDataSz, ret = wc_Sha256Final(&digest.sha256, hash); wc_Sha256Free(&digest.sha256); } - hashSz = SHA256_DIGEST_SIZE; + hashSz = WC_SHA256_DIGEST_SIZE; break; #endif #ifdef WOLFSSL_SHA384 @@ -4041,7 +4041,7 @@ static int CreateRSAEncodedSig(byte* sig, byte* sigData, int sigDataSz, ret = wc_Sha384Final(&digest.sha384, hash); wc_Sha384Free(&digest.sha384); } - hashSz = SHA384_DIGEST_SIZE; + hashSz = WC_SHA384_DIGEST_SIZE; break; #endif #ifdef WOLFSSL_SHA512 @@ -4053,7 +4053,7 @@ static int CreateRSAEncodedSig(byte* sig, byte* sigData, int sigDataSz, ret = wc_Sha512Final(&digest.sha512, hash); wc_Sha512Free(&digest.sha512); } - hashSz = SHA512_DIGEST_SIZE; + hashSz = WC_SHA512_DIGEST_SIZE; break; #endif } @@ -4090,7 +4090,7 @@ static int CreateECCEncodedSig(byte* sigData, int sigDataSz, int hashAlgo) ret = wc_Sha256Final(&digest.sha256, sigData); wc_Sha256Free(&digest.sha256); } - hashSz = SHA256_DIGEST_SIZE; + hashSz = WC_SHA256_DIGEST_SIZE; break; #endif #ifdef WOLFSSL_SHA384 @@ -4102,7 +4102,7 @@ static int CreateECCEncodedSig(byte* sigData, int sigDataSz, int hashAlgo) ret = wc_Sha384Final(&digest.sha384, sigData); wc_Sha384Free(&digest.sha384); } - hashSz = SHA384_DIGEST_SIZE; + hashSz = WC_SHA384_DIGEST_SIZE; break; #endif #ifdef WOLFSSL_SHA512 @@ -4114,7 +4114,7 @@ static int CreateECCEncodedSig(byte* sigData, int sigDataSz, int hashAlgo) ret = wc_Sha512Final(&digest.sha512, sigData); wc_Sha512Free(&digest.sha512); } - hashSz = SHA512_DIGEST_SIZE; + hashSz = WC_SHA512_DIGEST_SIZE; break; #endif } @@ -6385,7 +6385,7 @@ int DoTls13HandShakeMsg(WOLFSSL* ssl, byte* input, word32* inOutIdx, * Please see note at top of README if you get an error from connect. * * ssl The SSL/TLS object. - * returns SSL_SUCCESS on successful handshake, SSL_FATAL_ERROR when + * returns WOLF_SSL_SUCCESS on successful handshake, WOLF_SSL_FATAL_ERROR when * unrecoverable error occurs and 0 otherwise. * For more error information use wolfSSL_get_error(). */ @@ -6401,7 +6401,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) if (ssl->options.side != WOLFSSL_CLIENT_END) { WOLFSSL_ERROR(ssl->error = SIDE_ERROR); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (ssl->buffers.outputBuffer.length > 0) { @@ -6421,7 +6421,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) } else { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } @@ -6431,7 +6431,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) /* Always send client hello first. */ if ((ssl->error = SendTls13ClientHello(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->options.connectState = CLIENT_HELLO_SENT; @@ -6439,7 +6439,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) #ifdef WOLFSSL_EARLY_DATA if (ssl->earlyData) { ssl->options.handShakeState = CLIENT_HELLO_COMPLETE; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif FALL_THROUGH; @@ -6451,7 +6451,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) while (ssl->options.serverState < neededState) { if ((ssl->error = ProcessReply(ssl)) < 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* if resumption failed, reset needed state. */ if (neededState == SERVER_FINISHED_COMPLETE && @@ -6466,7 +6466,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) case HELLO_AGAIN: if (ssl->options.certOnly) - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; if (!ssl->options.tls1_3) return wolfSSL_connect(ssl); @@ -6476,7 +6476,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) /* Try again with different security parameters. */ if ((ssl->error = SendTls13ClientHello(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } @@ -6494,7 +6494,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) while (ssl->options.serverState < neededState) { if ((ssl->error = ProcessReply(ssl)) < 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } /* if resumption failed, reset needed state */ else if (neededState == SERVER_FINISHED_COMPLETE) { @@ -6513,7 +6513,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) if (ssl->earlyData) { if ((ssl->error = SendTls13EndOfEarlyData(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } WOLFSSL_MSG("sent: end_of_early_data"); } @@ -6529,7 +6529,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) ssl->error = SendTls13Certificate(ssl); if (ssl->error != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } WOLFSSL_MSG("sent: certificate"); } @@ -6546,7 +6546,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) ssl->error = SendTls13CertificateVerify(ssl); if (ssl->error != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } WOLFSSL_MSG("sent: certificate verify"); } @@ -6559,7 +6559,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) case FIRST_REPLY_THIRD: if ((ssl->error = SendTls13Finished(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } WOLFSSL_MSG("sent: finished"); @@ -6574,17 +6574,17 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) if (cbret < 0) { ssl->error = cbret; WOLFSSL_MSG("HandShake Done Cb don't continue error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } #endif /* NO_HANDSHAKE_DONE_CB */ - WOLFSSL_LEAVE("wolfSSL_connect_TLSv13()", SSL_SUCCESS); - return SSL_SUCCESS; + WOLFSSL_LEAVE("wolfSSL_connect_TLSv13()", WOLF_SSL_SUCCESS); + return WOLF_SSL_SUCCESS; default: WOLFSSL_MSG("Unknown connect state ERROR"); - return SSL_FATAL_ERROR; /* unknown connect state */ + return WOLF_SSL_FATAL_ERROR; /* unknown connect state */ } } @@ -6597,7 +6597,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) * secretSz Size of secret data in bytes. * Use a value of 0 to indicate use of default size. * returns BAD_FUNC_ARG when ssl is NULL or not using TLS v1.3, SIDE_ERROR when - * called on a client; SSL_SUCCESS on success and otherwise failure. + * called on a client; WOLF_SSL_SUCCESS on success and otherwise failure. */ int wolfSSL_send_hrr_cookie(WOLFSSL* ssl, const unsigned char* secret, unsigned int secretSz) @@ -6611,10 +6611,10 @@ int wolfSSL_send_hrr_cookie(WOLFSSL* ssl, const unsigned char* secret, if (secretSz == 0) { #if !defined(NO_SHA) && defined(NO_SHA256) - secretSz = SHA_DIGEST_SIZE; + secretSz = WC_SHA_DIGEST_SIZE; #endif /* NO_SHA */ #ifndef NO_SHA256 - secretSz = SHA256_DIGEST_SIZE; + secretSz = WC_SHA256_DIGEST_SIZE; #endif /* NO_SHA256 */ } @@ -6652,7 +6652,7 @@ int wolfSSL_send_hrr_cookie(WOLFSSL* ssl, const unsigned char* secret, ssl->options.sendCookie = 1; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif @@ -6676,7 +6676,7 @@ int wolfSSL_UseKeyShare(WOLFSSL* ssl, word16 group) if (ret != 0) return ret; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* Send no key share entries - use HelloRetryRequest to negotiate shared group. @@ -6697,7 +6697,7 @@ int wolfSSL_NoKeyShares(WOLFSSL* ssl) if (ret != 0) return ret; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* Do not send a ticket after TLS v1.3 handshake for resumption. @@ -6771,13 +6771,13 @@ int wolfSSL_no_dhe_psk(WOLFSSL* ssl) } /* Update the keys for encryption and decryption. - * If using non-blocking I/O and SSL_ERROR_WANT_WRITE is returned then + * If using non-blocking I/O and WOLF_SSL_ERROR_WANT_WRITE is returned then * calling wolfSSL_write() will have the message sent when ready. * * ssl The SSL/TLS object. * returns BAD_FUNC_ARG when ssl is NULL, or not using TLS v1.3, - * SSL_ERROR_WANT_WRITE when non-blocking I/O is not ready to write, - * SSL_SUCCESS on success and otherwise failure. + * WOLF_SSL_ERROR_WANT_WRITE when non-blocking I/O is not ready to write, + * WOLF_SSL_SUCCESS on success and otherwise failure. */ int wolfSSL_update_keys(WOLFSSL* ssl) { @@ -6788,9 +6788,9 @@ int wolfSSL_update_keys(WOLFSSL* ssl) ret = SendTls13KeyUpdate(ssl); if (ret == WANT_WRITE) - ret = SSL_ERROR_WANT_WRITE; + ret = WOLF_SSL_ERROR_WANT_WRITE; else if (ret == 0) - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; return ret; } @@ -6864,9 +6864,9 @@ int wolfSSL_request_certificate(WOLFSSL* ssl) ret = SendTls13CertificateRequest(ssl, &certReqCtx->ctx, certReqCtx->len); if (ret == WANT_WRITE) - ret = SSL_ERROR_WANT_WRITE; + ret = WOLF_SSL_ERROR_WANT_WRITE; else if (ret == 0) - ret = SSL_SUCCESS; + ret = WOLF_SSL_SUCCESS; return ret; } #endif /* !NO_CERTS && WOLFSSL_POST_HANDSHAKE_AUTH */ @@ -6879,7 +6879,7 @@ int wolfSSL_request_certificate(WOLFSSL* ssl) * Please see note at top of README if you get an error from accept. * * ssl The SSL/TLS object. - * returns SSL_SUCCESS on successful handshake, SSL_FATAL_ERROR when + * returns WOLF_SSL_SUCCESS on successful handshake, WOLF_SSL_FATAL_ERROR when * unrecoverable error occurs and 0 otherwise. * For more error information use wolfSSL_get_error(). */ @@ -6905,7 +6905,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) if (ssl->options.side != WOLFSSL_SERVER_END) { WOLFSSL_ERROR(ssl->error = SIDE_ERROR); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #ifndef NO_CERTS @@ -6918,7 +6918,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) WOLFSSL_MSG("accept error: don't have server cert and key"); ssl->error = NO_PRIVATE_KEY; WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } #endif @@ -6939,7 +6939,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) } else { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } @@ -6950,7 +6950,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) while (ssl->options.clientState < CLIENT_HELLO_COMPLETE) if ((ssl->error = ProcessReply(ssl)) < 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->options.acceptState = ACCEPT_CLIENT_HELLO_DONE; @@ -6961,7 +6961,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) if (ssl->options.serverState == SERVER_HELLO_RETRY_REQUEST) { if ((ssl->error = SendTls13HelloRetryRequest(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } ssl->options.acceptState = ACCEPT_HELLO_RETRY_REQUEST_DONE; @@ -6972,7 +6972,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) if (ssl->options.serverState == SERVER_HELLO_RETRY_REQUEST) { if ( (ssl->error = ProcessReply(ssl)) < 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } ssl->options.acceptState = ACCEPT_FIRST_REPLY_DONE; @@ -6982,7 +6982,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) case ACCEPT_FIRST_REPLY_DONE : if ((ssl->error = SendTls13ServerHello(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->options.acceptState = SERVER_HELLO_SENT; WOLFSSL_MSG("accept state SERVER_HELLO_SENT"); @@ -6991,7 +6991,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) case SERVER_HELLO_SENT : if ((ssl->error = SendTls13EncryptedExtensions(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->options.acceptState = SERVER_EXTENSIONS_SENT; WOLFSSL_MSG("accept state SERVER_EXTENSIONS_SENT"); @@ -7004,7 +7004,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) ssl->error = SendTls13CertificateRequest(ssl, NULL, 0); if (ssl->error != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } } @@ -7019,7 +7019,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) if (!ssl->options.resuming && ssl->options.sendVerify) { if ((ssl->error = SendTls13Certificate(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } #endif @@ -7032,7 +7032,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) if (!ssl->options.resuming && ssl->options.sendVerify) { if ((ssl->error = SendTls13CertificateVerify(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } #endif @@ -7043,7 +7043,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) case CERT_VERIFY_SENT : if ((ssl->error = SendTls13Finished(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->options.acceptState = ACCEPT_FINISHED_DONE; @@ -7051,7 +7051,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) #ifdef WOLFSSL_EARLY_DATA if (ssl->earlyData) { ssl->options.handShakeState = SERVER_FINISHED_COMPLETE; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif FALL_THROUGH; @@ -7063,7 +7063,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) !ssl->options.noTicketTls13 && ssl->ctx->ticketEncCb != NULL) { if ((ssl->error = SendTls13NewSessionTicket(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } #endif @@ -7076,7 +7076,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) while (ssl->options.clientState < CLIENT_FINISHED_COMPLETE) if ( (ssl->error = ProcessReply(ssl)) < 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } ssl->options.acceptState = ACCEPT_SECOND_REPLY_DONE; @@ -7094,7 +7094,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) !ssl->options.noTicketTls13 && ssl->ctx->ticketEncCb != NULL) { if ((ssl->error = SendTls13NewSessionTicket(ssl)) != 0) { WOLFSSL_ERROR(ssl->error); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } #endif /* HAVE_SESSION_TICKET */ @@ -7109,17 +7109,17 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl) if (cbret < 0) { ssl->error = cbret; WOLFSSL_MSG("HandShake Done Cb don't continue error"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } #endif /* NO_HANDSHAKE_DONE_CB */ - WOLFSSL_LEAVE("SSL_accept()", SSL_SUCCESS); - return SSL_SUCCESS; + WOLFSSL_LEAVE("SSL_accept()", WOLF_SSL_SUCCESS); + return WOLF_SSL_SUCCESS; default : WOLFSSL_MSG("Unknown accept state ERROR"); - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } } #endif @@ -7197,7 +7197,7 @@ int wolfSSL_write_early_data(WOLFSSL* ssl, const void* data, int sz, int* outSz) ssl->earlyData = 1; ret = wolfSSL_connect_TLSv13(ssl); if (ret <= 0) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (ssl->options.handShakeState == CLIENT_HELLO_COMPLETE) { ret = SendData(ssl, data, sz); @@ -7208,7 +7208,7 @@ int wolfSSL_write_early_data(WOLFSSL* ssl, const void* data, int sz, int* outSz) WOLFSSL_LEAVE("SSL_write_early_data()", ret); if (ret < 0) - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; return ret; } @@ -7241,14 +7241,14 @@ int wolfSSL_read_early_data(WOLFSSL* ssl, void* data, int sz, int* outSz) ssl->earlyData = 1; ret = wolfSSL_accept_TLSv13(ssl); if (ret <= 0) - return SSL_FATAL_ERROR; + return WOLF_SSL_FATAL_ERROR; } if (ssl->options.handShakeState == SERVER_FINISHED_COMPLETE) { ret = ReceiveData(ssl, (byte*)data, sz, FALSE); if (ret > 0) *outSz = ret; if (ssl->error == ZERO_RETURN) - ssl->error = SSL_ERROR_NONE; + ssl->error = WOLF_SSL_ERROR_NONE; } else ret = 0; @@ -7256,7 +7256,7 @@ int wolfSSL_read_early_data(WOLFSSL* ssl, void* data, int sz, int* outSz) WOLFSSL_LEAVE("wolfSSL_read_early_data()", ret); if (ret < 0) - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; return ret; } #endif diff --git a/src/wolfio.c b/src/wolfio.c index 11c864f91..0088ce17a 100644 --- a/src/wolfio.c +++ b/src/wolfio.c @@ -417,7 +417,7 @@ int EmbedGenerateCookie(WOLFSSL* ssl, byte *buf, int sz, void *ctx) int sd = ssl->wfd; SOCKADDR_S peer; XSOCKLENT peerSz = sizeof(peer); - byte digest[SHA256_DIGEST_SIZE]; + byte digest[WC_SHA256_DIGEST_SIZE]; int ret = 0; (void)ctx; @@ -432,8 +432,8 @@ int EmbedGenerateCookie(WOLFSSL* ssl, byte *buf, int sz, void *ctx) if (ret != 0) return ret; - if (sz > SHA256_DIGEST_SIZE) - sz = SHA256_DIGEST_SIZE; + if (sz > WC_SHA256_DIGEST_SIZE) + sz = WC_SHA256_DIGEST_SIZE; XMEMCPY(buf, digest, sz); return sz; @@ -460,7 +460,7 @@ int EmbedGenerateCookie(WOLFSSL* ssl, byte *buf, int sz, void *ctx) /* get peer information stored in ssl struct */ peerSz = sizeof(SOCKADDR_S); if ((ret = wolfSSL_dtls_get_peer(ssl, (void*)&peer, &peerSz)) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { return ret; } @@ -494,7 +494,7 @@ int EmbedGenerateCookie(WOLFSSL* ssl, byte *buf, int sz, void *ctx) ip[*ipSz - 1] = '\0'; /* make sure has terminator */ *ipSz = (word16)XSTRLEN(ip); - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } /* set the peer information in human readable form (ip, port, family) @@ -524,7 +524,7 @@ int EmbedGenerateCookie(WOLFSSL* ssl, byte *buf, int sz, void *ctx) /* peer sa is free'd in SSL_ResourceFree */ if ((ret = wolfSSL_dtls_set_peer(ssl, (SOCKADDR_IN*)&addr, - sizeof(SOCKADDR_IN)))!= SSL_SUCCESS) { + sizeof(SOCKADDR_IN)))!= WOLF_SSL_SUCCESS) { WOLFSSL_MSG("Import DTLS peer info error"); return ret; } @@ -541,7 +541,7 @@ int EmbedGenerateCookie(WOLFSSL* ssl, byte *buf, int sz, void *ctx) /* peer sa is free'd in SSL_ResourceFree */ if ((ret = wolfSSL_dtls_set_peer(ssl, (SOCKADDR_IN6*)&addr, - sizeof(SOCKADDR_IN6)))!= SSL_SUCCESS) { + sizeof(SOCKADDR_IN6)))!= WOLF_SSL_SUCCESS) { WOLFSSL_MSG("Import DTLS peer info error"); return ret; } @@ -553,7 +553,7 @@ int EmbedGenerateCookie(WOLFSSL* ssl, byte *buf, int sz, void *ctx) return BUFFER_E; } - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif /* WOLFSSL_SESSION_EXPORT */ #endif /* WOLFSSL_DTLS */ @@ -1280,7 +1280,7 @@ int wolfIO_HttpProcessResponseCrl(WOLFSSL_CRL* crl, int sfd, byte* httpBuf, result = wolfIO_HttpProcessResponse(sfd, "application/pkix-crl", &respBuf, httpBuf, httpBufSz, DYNAMIC_TYPE_CRL, crl->heap); if (result >= 0) { - result = BufferLoadCRL(crl, respBuf, result, SSL_FILETYPE_ASN1, 0); + result = BufferLoadCRL(crl, respBuf, result, WOLF_SSL_FILETYPE_ASN1, 0); } XFREE(respBuf, crl->heap, DYNAMIC_TYPE_CRL); @@ -1747,14 +1747,14 @@ int MicriumGenerateCookie(WOLFSSL* ssl, byte *buf, int sz, void *ctx) { NET_SOCK_ADDR peer; NET_SOCK_ADDR_LEN peerSz = sizeof(peer); - byte digest[SHA_DIGEST_SIZE]; + byte digest[WC_SHA_DIGEST_SIZE]; int ret = 0; (void)ctx; XMEMSET(&peer, 0, sizeof(peer)); if (wolfSSL_dtls_get_peer(ssl, (void*)&peer, - (unsigned int*)&peerSz) != SSL_SUCCESS) { + (unsigned int*)&peerSz) != WOLF_SSL_SUCCESS) { WOLFSSL_MSG("getpeername failed in MicriumGenerateCookie"); return GEN_COOKIE_E; } @@ -1763,8 +1763,8 @@ int MicriumGenerateCookie(WOLFSSL* ssl, byte *buf, int sz, void *ctx) if (ret != 0) return ret; - if (sz > SHA_DIGEST_SIZE) - sz = SHA_DIGEST_SIZE; + if (sz > WC_SHA_DIGEST_SIZE) + sz = WC_SHA_DIGEST_SIZE; XMEMCPY(buf, digest, sz); return sz; diff --git a/tests/api.c b/tests/api.c index c20dcf02b..998a4fd03 100644 --- a/tests/api.c +++ b/tests/api.c @@ -208,7 +208,7 @@ static int test_wolfSSL_Init(void) printf(testingFmt, "wolfSSL_Init()"); result = wolfSSL_Init(); - printf(resultFmt, result == SSL_SUCCESS ? passed : failed); + printf(resultFmt, result == WOLF_SSL_SUCCESS ? passed : failed); return result; } @@ -220,7 +220,7 @@ static int test_wolfSSL_Cleanup(void) printf(testingFmt, "wolfSSL_Cleanup()"); result = wolfSSL_Cleanup(); - printf(resultFmt, result == SSL_SUCCESS ? passed : failed); + printf(resultFmt, result == WOLF_SSL_SUCCESS ? passed : failed); return result; } @@ -319,19 +319,19 @@ static void test_wolfSSL_CTX_use_certificate_file(void) /* invalid context */ AssertFalse(wolfSSL_CTX_use_certificate_file(NULL, svrCertFile, - SSL_FILETYPE_PEM)); + WOLF_SSL_FILETYPE_PEM)); /* invalid cert file */ AssertFalse(wolfSSL_CTX_use_certificate_file(ctx, bogusFile, - SSL_FILETYPE_PEM)); + WOLF_SSL_FILETYPE_PEM)); /* invalid cert type */ AssertFalse(wolfSSL_CTX_use_certificate_file(ctx, svrCertFile, 9999)); #ifdef NO_RSA /* rsa needed */ - AssertFalse(wolfSSL_CTX_use_certificate_file(ctx, svrCertFile,SSL_FILETYPE_PEM)); + AssertFalse(wolfSSL_CTX_use_certificate_file(ctx, svrCertFile,WOLF_SSL_FILETYPE_PEM)); #else /* success */ - AssertTrue(wolfSSL_CTX_use_certificate_file(ctx, svrCertFile, SSL_FILETYPE_PEM)); + AssertTrue(wolfSSL_CTX_use_certificate_file(ctx, svrCertFile, WOLF_SSL_FILETYPE_PEM)); #endif wolfSSL_CTX_free(ctx); @@ -354,14 +354,14 @@ static int test_wolfSSL_CTX_use_certificate_buffer(void) AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method())); ret = wolfSSL_CTX_use_certificate_buffer(ctx, server_cert_der_2048, - sizeof_server_cert_der_2048, SSL_FILETYPE_ASN1); + sizeof_server_cert_der_2048, WOLF_SSL_FILETYPE_ASN1); - printf(resultFmt, ret == SSL_SUCCESS ? passed : failed); + printf(resultFmt, ret == WOLF_SSL_SUCCESS ? passed : failed); wolfSSL_CTX_free(ctx); return ret; #else - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; #endif } /*END test_wolfSSL_CTX_use_certificate_buffer*/ @@ -375,20 +375,20 @@ static void test_wolfSSL_CTX_use_PrivateKey_file(void) /* invalid context */ AssertFalse(wolfSSL_CTX_use_PrivateKey_file(NULL, svrKeyFile, - SSL_FILETYPE_PEM)); + WOLF_SSL_FILETYPE_PEM)); /* invalid key file */ AssertFalse(wolfSSL_CTX_use_PrivateKey_file(ctx, bogusFile, - SSL_FILETYPE_PEM)); + WOLF_SSL_FILETYPE_PEM)); /* invalid key type */ AssertFalse(wolfSSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, 9999)); /* success */ #ifdef NO_RSA /* rsa needed */ - AssertFalse(wolfSSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, SSL_FILETYPE_PEM)); + AssertFalse(wolfSSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, WOLF_SSL_FILETYPE_PEM)); #else /* success */ - AssertTrue(wolfSSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, SSL_FILETYPE_PEM)); + AssertTrue(wolfSSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, WOLF_SSL_FILETYPE_PEM)); #endif wolfSSL_CTX_free(ctx); @@ -407,40 +407,40 @@ static void test_wolfSSL_CTX_trust_peer_cert(void) #if !defined(NO_FILESYSTEM) /* invalid file */ assert(wolfSSL_CTX_trust_peer_cert(ctx, NULL, - SSL_FILETYPE_PEM) != SSL_SUCCESS); + WOLF_SSL_FILETYPE_PEM) != WOLF_SSL_SUCCESS); assert(wolfSSL_CTX_trust_peer_cert(ctx, bogusFile, - SSL_FILETYPE_PEM) != SSL_SUCCESS); + WOLF_SSL_FILETYPE_PEM) != WOLF_SSL_SUCCESS); assert(wolfSSL_CTX_trust_peer_cert(ctx, cliCertFile, - SSL_FILETYPE_ASN1) != SSL_SUCCESS); + WOLF_SSL_FILETYPE_ASN1) != WOLF_SSL_SUCCESS); /* success */ - assert(wolfSSL_CTX_trust_peer_cert(ctx, cliCertFile, SSL_FILETYPE_PEM) - == SSL_SUCCESS); + assert(wolfSSL_CTX_trust_peer_cert(ctx, cliCertFile, WOLF_SSL_FILETYPE_PEM) + == WOLF_SSL_SUCCESS); /* unload cert */ - assert(wolfSSL_CTX_Unload_trust_peers(NULL) != SSL_SUCCESS); - assert(wolfSSL_CTX_Unload_trust_peers(ctx) == SSL_SUCCESS); + assert(wolfSSL_CTX_Unload_trust_peers(NULL) != WOLF_SSL_SUCCESS); + assert(wolfSSL_CTX_Unload_trust_peers(ctx) == WOLF_SSL_SUCCESS); #endif /* Test of loading certs from buffers */ /* invalid buffer */ assert(wolfSSL_CTX_trust_peer_buffer(ctx, NULL, -1, - SSL_FILETYPE_ASN1) != SSL_SUCCESS); + WOLF_SSL_FILETYPE_ASN1) != WOLF_SSL_SUCCESS); /* success */ #ifdef USE_CERT_BUFFERS_1024 assert(wolfSSL_CTX_trust_peer_buffer(ctx, client_cert_der_1024, - sizeof_client_cert_der_1024, SSL_FILETYPE_ASN1) == SSL_SUCCESS); + sizeof_client_cert_der_1024, WOLF_SSL_FILETYPE_ASN1) == WOLF_SSL_SUCCESS); #endif #ifdef USE_CERT_BUFFERS_2048 assert(wolfSSL_CTX_trust_peer_buffer(ctx, client_cert_der_2048, - sizeof_client_cert_der_2048, SSL_FILETYPE_ASN1) == SSL_SUCCESS); + sizeof_client_cert_der_2048, WOLF_SSL_FILETYPE_ASN1) == WOLF_SSL_SUCCESS); #endif /* unload cert */ - assert(wolfSSL_CTX_Unload_trust_peers(NULL) != SSL_SUCCESS); - assert(wolfSSL_CTX_Unload_trust_peers(ctx) == SSL_SUCCESS); + assert(wolfSSL_CTX_Unload_trust_peers(NULL) != WOLF_SSL_SUCCESS); + assert(wolfSSL_CTX_Unload_trust_peers(ctx) == WOLF_SSL_SUCCESS); wolfSSL_CTX_free(ctx); #endif @@ -458,8 +458,8 @@ static void test_wolfSSL_CTX_load_verify_locations(void) AssertFalse(wolfSSL_CTX_load_verify_locations(NULL, caCertFile, 0)); /* invalid ca file */ - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_load_verify_locations(ctx, NULL, 0)); - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_load_verify_locations(ctx, bogusFile, 0)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_load_verify_locations(ctx, NULL, 0)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_load_verify_locations(ctx, bogusFile, 0)); #ifndef WOLFSSL_TIRTOS @@ -484,18 +484,18 @@ static void test_wolfSSL_CTX_SetTmpDH_file(void) AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method())); /* invalid context */ - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_file(NULL, - dhParamFile, SSL_FILETYPE_PEM)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_file(NULL, + dhParamFile, WOLF_SSL_FILETYPE_PEM)); /* invalid dhParamFile file */ - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_file(ctx, - NULL, SSL_FILETYPE_PEM)); - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_file(ctx, - bogusFile, SSL_FILETYPE_PEM)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_file(ctx, + NULL, WOLF_SSL_FILETYPE_PEM)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_file(ctx, + bogusFile, WOLF_SSL_FILETYPE_PEM)); /* success */ - AssertIntEQ(SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_file(ctx, dhParamFile, - SSL_FILETYPE_PEM)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_file(ctx, dhParamFile, + WOLF_SSL_FILETYPE_PEM)); wolfSSL_CTX_free(ctx); #endif @@ -509,18 +509,18 @@ static void test_wolfSSL_CTX_SetTmpDH_buffer(void) AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method())); /* invalid context */ - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_buffer(NULL, dh_key_der_2048, - sizeof_dh_key_der_2048, SSL_FILETYPE_ASN1)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_buffer(NULL, dh_key_der_2048, + sizeof_dh_key_der_2048, WOLF_SSL_FILETYPE_ASN1)); /* invalid dhParamFile file */ - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_buffer(NULL, NULL, - 0, SSL_FILETYPE_ASN1)); - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_buffer(ctx, dsa_key_der_2048, - sizeof_dsa_key_der_2048, SSL_FILETYPE_ASN1)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_buffer(NULL, NULL, + 0, WOLF_SSL_FILETYPE_ASN1)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_buffer(ctx, dsa_key_der_2048, + sizeof_dsa_key_der_2048, WOLF_SSL_FILETYPE_ASN1)); /* success */ - AssertIntEQ(SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_buffer(ctx, dh_key_der_2048, - sizeof_dh_key_der_2048, SSL_FILETYPE_ASN1)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_CTX_SetTmpDH_buffer(ctx, dh_key_der_2048, + sizeof_dh_key_der_2048, WOLF_SSL_FILETYPE_ASN1)); wolfSSL_CTX_free(ctx); #endif @@ -541,8 +541,8 @@ static void test_server_wolfSSL_new(void) AssertNotNull(ctx_nocert = wolfSSL_CTX_new(wolfSSLv23_server_method())); AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method())); - AssertTrue(wolfSSL_CTX_use_certificate_file(ctx, svrCertFile, SSL_FILETYPE_PEM)); - AssertTrue(wolfSSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, SSL_FILETYPE_PEM)); + AssertTrue(wolfSSL_CTX_use_certificate_file(ctx, svrCertFile, WOLF_SSL_FILETYPE_PEM)); + AssertTrue(wolfSSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, WOLF_SSL_FILETYPE_PEM)); /* invalid context */ AssertNull(ssl = wolfSSL_new(NULL)); @@ -599,30 +599,30 @@ static void test_wolfSSL_SetTmpDH_file(void) AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method())); #ifndef NO_RSA AssertTrue(wolfSSL_CTX_use_certificate_file(ctx, svrCertFile, - SSL_FILETYPE_PEM)); + WOLF_SSL_FILETYPE_PEM)); AssertTrue(wolfSSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, - SSL_FILETYPE_PEM)); + WOLF_SSL_FILETYPE_PEM)); #else AssertTrue(wolfSSL_CTX_use_certificate_file(ctx, eccCertFile, - SSL_FILETYPE_PEM)); + WOLF_SSL_FILETYPE_PEM)); AssertTrue(wolfSSL_CTX_use_PrivateKey_file(ctx, eccKeyFile, - SSL_FILETYPE_PEM)); + WOLF_SSL_FILETYPE_PEM)); #endif AssertNotNull(ssl = wolfSSL_new(ctx)); /* invalid ssl */ - AssertIntNE(SSL_SUCCESS, wolfSSL_SetTmpDH_file(NULL, - dhParamFile, SSL_FILETYPE_PEM)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_SetTmpDH_file(NULL, + dhParamFile, WOLF_SSL_FILETYPE_PEM)); /* invalid dhParamFile file */ - AssertIntNE(SSL_SUCCESS, wolfSSL_SetTmpDH_file(ssl, - NULL, SSL_FILETYPE_PEM)); - AssertIntNE(SSL_SUCCESS, wolfSSL_SetTmpDH_file(ssl, - bogusFile, SSL_FILETYPE_PEM)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_SetTmpDH_file(ssl, + NULL, WOLF_SSL_FILETYPE_PEM)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_SetTmpDH_file(ssl, + bogusFile, WOLF_SSL_FILETYPE_PEM)); /* success */ - AssertIntEQ(SSL_SUCCESS, wolfSSL_SetTmpDH_file(ssl, dhParamFile, - SSL_FILETYPE_PEM)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_SetTmpDH_file(ssl, dhParamFile, + WOLF_SSL_FILETYPE_PEM)); wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); @@ -637,24 +637,24 @@ static void test_wolfSSL_SetTmpDH_buffer(void) AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method())); AssertTrue(wolfSSL_CTX_use_certificate_buffer(ctx, server_cert_der_2048, - sizeof_server_cert_der_2048, SSL_FILETYPE_ASN1)); + sizeof_server_cert_der_2048, WOLF_SSL_FILETYPE_ASN1)); AssertTrue(wolfSSL_CTX_use_PrivateKey_buffer(ctx, server_key_der_2048, - sizeof_server_key_der_2048, SSL_FILETYPE_ASN1)); + sizeof_server_key_der_2048, WOLF_SSL_FILETYPE_ASN1)); AssertNotNull(ssl = wolfSSL_new(ctx)); /* invalid ssl */ - AssertIntNE(SSL_SUCCESS, wolfSSL_SetTmpDH_buffer(NULL, dh_key_der_2048, - sizeof_dh_key_der_2048, SSL_FILETYPE_ASN1)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_SetTmpDH_buffer(NULL, dh_key_der_2048, + sizeof_dh_key_der_2048, WOLF_SSL_FILETYPE_ASN1)); /* invalid dhParamFile file */ - AssertIntNE(SSL_SUCCESS, wolfSSL_SetTmpDH_buffer(NULL, NULL, - 0, SSL_FILETYPE_ASN1)); - AssertIntNE(SSL_SUCCESS, wolfSSL_SetTmpDH_buffer(ssl, dsa_key_der_2048, - sizeof_dsa_key_der_2048, SSL_FILETYPE_ASN1)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_SetTmpDH_buffer(NULL, NULL, + 0, WOLF_SSL_FILETYPE_ASN1)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_SetTmpDH_buffer(ssl, dsa_key_der_2048, + sizeof_dsa_key_der_2048, WOLF_SSL_FILETYPE_ASN1)); /* success */ - AssertIntEQ(SSL_SUCCESS, wolfSSL_SetTmpDH_buffer(ssl, dh_key_der_2048, - sizeof_dh_key_der_2048, SSL_FILETYPE_ASN1)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_SetTmpDH_buffer(ssl, dh_key_der_2048, + sizeof_dh_key_der_2048, WOLF_SSL_FILETYPE_ASN1)); wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); @@ -668,7 +668,7 @@ static void test_wolfSSL_SetTmpDH_buffer(void) */ static int test_wolfSSL_SetMinVersion(void) { - int failFlag = SSL_SUCCESS; + int failFlag = WOLF_SSL_SUCCESS; #ifndef NO_WOLFSSL_CLIENT WOLFSSL_CTX* ctx; WOLFSSL* ssl; @@ -688,12 +688,12 @@ static int test_wolfSSL_SetMinVersion(void) printf(testingFmt, "wolfSSL_SetMinVersion()"); for (itr = 0; itr < (int)(sizeof(versions)/sizeof(int)); itr++){ - if(wolfSSL_SetMinVersion(ssl, *(versions + itr)) != SSL_SUCCESS){ - failFlag = SSL_FAILURE; + if(wolfSSL_SetMinVersion(ssl, *(versions + itr)) != WOLF_SSL_SUCCESS){ + failFlag = WOLF_SSL_FAILURE; } } - printf(resultFmt, failFlag == SSL_SUCCESS ? passed : failed); + printf(resultFmt, failFlag == WOLF_SSL_SUCCESS ? passed : failed); wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); @@ -782,7 +782,7 @@ static int test_export(WOLFSSL* inSsl, byte* buf, word32 sz, void* userCtx) wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); (void)userCtx; - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; } #endif @@ -828,26 +828,26 @@ static THREAD_RETURN WOLFSSL_THREAD test_server_nofail(void* args) #endif wolfSSL_CTX_set_verify(ctx, - SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, 0); + WOLF_SSL_VERIFY_PEER | WOLF_SSL_VERIFY_FAIL_IF_NO_PEER_CERT, 0); #ifdef OPENSSL_EXTRA wolfSSL_CTX_set_default_passwd_cb(ctx, PasswordCallBack); #endif - if (wolfSSL_CTX_load_verify_locations(ctx, cliCertFile, 0) != SSL_SUCCESS) + if (wolfSSL_CTX_load_verify_locations(ctx, cliCertFile, 0) != WOLF_SSL_SUCCESS) { /*err_sys("can't load ca file, Please run from wolfSSL home dir");*/ goto done; } - if (wolfSSL_CTX_use_certificate_file(ctx, svrCertFile, SSL_FILETYPE_PEM) - != SSL_SUCCESS) + if (wolfSSL_CTX_use_certificate_file(ctx, svrCertFile, WOLF_SSL_FILETYPE_PEM) + != WOLF_SSL_SUCCESS) { /*err_sys("can't load server cert chain file, " "Please run from wolfSSL home dir");*/ goto done; } - if (wolfSSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, SSL_FILETYPE_PEM) - != SSL_SUCCESS) + if (wolfSSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, WOLF_SSL_FILETYPE_PEM) + != WOLF_SSL_SUCCESS) { /*err_sys("can't load server key file, " "Please run from wolfSSL home dir");*/ @@ -858,14 +858,14 @@ static THREAD_RETURN WOLFSSL_THREAD test_server_nofail(void* args) tcp_accept(&sockfd, &clientfd, (func_args*)args, port, 0, 0, 0, 0, 1); CloseSocket(sockfd); - if (wolfSSL_set_fd(ssl, clientfd) != SSL_SUCCESS) { + if (wolfSSL_set_fd(ssl, clientfd) != WOLF_SSL_SUCCESS) { /*err_sys("SSL_set_fd failed");*/ goto done; } #ifdef NO_PSK #if !defined(NO_FILESYSTEM) && !defined(NO_DH) - wolfSSL_SetTmpDH_file(ssl, dhParamFile, SSL_FILETYPE_PEM); + wolfSSL_SetTmpDH_file(ssl, dhParamFile, WOLF_SSL_FILETYPE_PEM); #elif !defined(NO_DH) SetDH(ssl); /* will repick suites with DHE, higher priority than PSK */ #endif @@ -881,12 +881,12 @@ static THREAD_RETURN WOLFSSL_THREAD test_server_nofail(void* args) err = 0; /* Reset error */ ret = wolfSSL_accept(ssl); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { err = wolfSSL_get_error(ssl, 0); } - } while (ret != SSL_SUCCESS && err == WC_PENDING_E); + } while (ret != WOLF_SSL_SUCCESS && err == WC_PENDING_E); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { char buffer[WOLFSSL_MAX_ERROR_SZ]; printf("error = %d, %s\n", err, wolfSSL_ERR_error_string(err, buffer)); /*err_sys("SSL_accept failed");*/ @@ -968,20 +968,20 @@ static void test_client_nofail(void* args) wolfSSL_CTX_set_default_passwd_cb(ctx, PasswordCallBack); #endif - if (wolfSSL_CTX_load_verify_locations(ctx, caCertFile, 0) != SSL_SUCCESS) + if (wolfSSL_CTX_load_verify_locations(ctx, caCertFile, 0) != WOLF_SSL_SUCCESS) { /* err_sys("can't load ca file, Please run from wolfSSL home dir");*/ goto done2; } - if (wolfSSL_CTX_use_certificate_file(ctx, cliCertFile, SSL_FILETYPE_PEM) - != SSL_SUCCESS) + if (wolfSSL_CTX_use_certificate_file(ctx, cliCertFile, WOLF_SSL_FILETYPE_PEM) + != WOLF_SSL_SUCCESS) { /*err_sys("can't load client cert file, " "Please run from wolfSSL home dir");*/ goto done2; } - if (wolfSSL_CTX_use_PrivateKey_file(ctx, cliKeyFile, SSL_FILETYPE_PEM) - != SSL_SUCCESS) + if (wolfSSL_CTX_use_PrivateKey_file(ctx, cliKeyFile, WOLF_SSL_FILETYPE_PEM) + != WOLF_SSL_SUCCESS) { /*err_sys("can't load client key file, " "Please run from wolfSSL home dir");*/ @@ -991,7 +991,7 @@ static void test_client_nofail(void* args) ssl = wolfSSL_new(ctx); tcp_connect(&sockfd, wolfSSLIP, ((func_args*)args)->signal->port, 0, 0, ssl); - if (wolfSSL_set_fd(ssl, sockfd) != SSL_SUCCESS) { + if (wolfSSL_set_fd(ssl, sockfd) != WOLF_SSL_SUCCESS) { /*err_sys("SSL_set_fd failed");*/ goto done2; } @@ -1006,12 +1006,12 @@ static void test_client_nofail(void* args) err = 0; /* Reset error */ ret = wolfSSL_connect(ssl); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { err = wolfSSL_get_error(ssl, 0); } - } while (ret != SSL_SUCCESS && err == WC_PENDING_E); + } while (ret != WOLF_SSL_SUCCESS && err == WC_PENDING_E); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { char buffer[WOLFSSL_MAX_ERROR_SZ]; printf("error = %d, %s\n", err, wolfSSL_ERR_error_string(err, buffer)); /*err_sys("SSL_connect failed");*/ @@ -1081,23 +1081,23 @@ static THREAD_RETURN WOLFSSL_THREAD run_wolfssl_server(void* args) #endif wolfSSL_CTX_set_verify(ctx, - SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, 0); + WOLF_SSL_VERIFY_PEER | WOLF_SSL_VERIFY_FAIL_IF_NO_PEER_CERT, 0); #ifdef OPENSSL_EXTRA wolfSSL_CTX_set_default_passwd_cb(ctx, PasswordCallBack); #endif #ifdef WOLFSSL_SESSION_EXPORT - AssertIntEQ(SSL_SUCCESS, wolfSSL_CTX_dtls_set_export(ctx, test_export)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_CTX_dtls_set_export(ctx, test_export)); #endif - AssertIntEQ(SSL_SUCCESS, wolfSSL_CTX_load_verify_locations(ctx, cliCertFile, 0)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_CTX_load_verify_locations(ctx, cliCertFile, 0)); - AssertIntEQ(SSL_SUCCESS, - wolfSSL_CTX_use_certificate_file(ctx, svrCertFile, SSL_FILETYPE_PEM)); + AssertIntEQ(WOLF_SSL_SUCCESS, + wolfSSL_CTX_use_certificate_file(ctx, svrCertFile, WOLF_SSL_FILETYPE_PEM)); - AssertIntEQ(SSL_SUCCESS, - wolfSSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, SSL_FILETYPE_PEM)); + AssertIntEQ(WOLF_SSL_SUCCESS, + wolfSSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, WOLF_SSL_FILETYPE_PEM)); if (callbacks->ctx_ready) callbacks->ctx_ready(ctx); @@ -1119,11 +1119,11 @@ static THREAD_RETURN WOLFSSL_THREAD run_wolfssl_server(void* args) CloseSocket(sfd); } - AssertIntEQ(SSL_SUCCESS, wolfSSL_set_fd(ssl, cfd)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_set_fd(ssl, cfd)); #ifdef NO_PSK #if !defined(NO_FILESYSTEM) && !defined(NO_DH) - wolfSSL_SetTmpDH_file(ssl, dhParamFile, SSL_FILETYPE_PEM); + wolfSSL_SetTmpDH_file(ssl, dhParamFile, WOLF_SSL_FILETYPE_PEM); #elif !defined(NO_DH) SetDH(ssl); /* will repick suites with DHE, higher priority than PSK */ #endif @@ -1142,12 +1142,12 @@ static THREAD_RETURN WOLFSSL_THREAD run_wolfssl_server(void* args) err = 0; /* Reset error */ ret = wolfSSL_accept(ssl); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { err = wolfSSL_get_error(ssl, 0); } - } while (ret != SSL_SUCCESS && err == WC_PENDING_E); + } while (ret != WOLF_SSL_SUCCESS && err == WC_PENDING_E); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { char buffer[WOLFSSL_MAX_ERROR_SZ]; printf("error = %d, %s\n", err, wolfSSL_ERR_error_string(err, buffer)); /*err_sys("SSL_accept failed");*/ @@ -1227,13 +1227,13 @@ static void run_wolfssl_client(void* args) wolfSSL_CTX_set_default_passwd_cb(ctx, PasswordCallBack); #endif - AssertIntEQ(SSL_SUCCESS, wolfSSL_CTX_load_verify_locations(ctx, caCertFile, 0)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_CTX_load_verify_locations(ctx, caCertFile, 0)); - AssertIntEQ(SSL_SUCCESS, - wolfSSL_CTX_use_certificate_file(ctx, cliCertFile, SSL_FILETYPE_PEM)); + AssertIntEQ(WOLF_SSL_SUCCESS, + wolfSSL_CTX_use_certificate_file(ctx, cliCertFile, WOLF_SSL_FILETYPE_PEM)); - AssertIntEQ(SSL_SUCCESS, - wolfSSL_CTX_use_PrivateKey_file(ctx, cliKeyFile, SSL_FILETYPE_PEM)); + AssertIntEQ(WOLF_SSL_SUCCESS, + wolfSSL_CTX_use_PrivateKey_file(ctx, cliKeyFile, WOLF_SSL_FILETYPE_PEM)); if (callbacks->ctx_ready) callbacks->ctx_ready(ctx); @@ -1247,7 +1247,7 @@ static void run_wolfssl_client(void* args) tcp_connect(&sfd, wolfSSLIP, ((func_args*)args)->signal->port, 0, 0, ssl); } - AssertIntEQ(SSL_SUCCESS, wolfSSL_set_fd(ssl, sfd)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_set_fd(ssl, sfd)); if (callbacks->ssl_ready) callbacks->ssl_ready(ssl); @@ -1262,12 +1262,12 @@ static void run_wolfssl_client(void* args) err = 0; /* Reset error */ ret = wolfSSL_connect(ssl); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { err = wolfSSL_get_error(ssl, 0); } - } while (ret != SSL_SUCCESS && err == WC_PENDING_E); + } while (ret != WOLF_SSL_SUCCESS && err == WC_PENDING_E); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { char buffer[WOLFSSL_MAX_ERROR_SZ]; printf("error = %d, %s\n", err, wolfSSL_ERR_error_string(err, buffer)); /*err_sys("SSL_connect failed");*/ @@ -1560,17 +1560,17 @@ static void test_wolfSSL_UseSNI_params(void) AssertNotNull(ssl); /* invalid [ctx|ssl] */ - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_UseSNI(NULL, 0, "ctx", 3)); - AssertIntNE(SSL_SUCCESS, wolfSSL_UseSNI( NULL, 0, "ssl", 3)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseSNI(NULL, 0, "ctx", 3)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_UseSNI( NULL, 0, "ssl", 3)); /* invalid type */ - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_UseSNI(ctx, -1, "ctx", 3)); - AssertIntNE(SSL_SUCCESS, wolfSSL_UseSNI( ssl, -1, "ssl", 3)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseSNI(ctx, -1, "ctx", 3)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_UseSNI( ssl, -1, "ssl", 3)); /* invalid data */ - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_UseSNI(ctx, 0, NULL, 3)); - AssertIntNE(SSL_SUCCESS, wolfSSL_UseSNI( ssl, 0, NULL, 3)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseSNI(ctx, 0, NULL, 3)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_UseSNI( ssl, 0, NULL, 3)); /* success case */ - AssertIntEQ(SSL_SUCCESS, wolfSSL_CTX_UseSNI(ctx, 0, "ctx", 3)); - AssertIntEQ(SSL_SUCCESS, wolfSSL_UseSNI( ssl, 0, "ssl", 3)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseSNI(ctx, 0, "ctx", 3)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseSNI( ssl, 0, "ssl", 3)); wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); @@ -1579,19 +1579,19 @@ static void test_wolfSSL_UseSNI_params(void) /* BEGIN of connection tests callbacks */ static void use_SNI_at_ctx(WOLFSSL_CTX* ctx) { - AssertIntEQ(SSL_SUCCESS, + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseSNI(ctx, WOLFSSL_SNI_HOST_NAME, "www.wolfssl.com", 15)); } static void use_SNI_at_ssl(WOLFSSL* ssl) { - AssertIntEQ(SSL_SUCCESS, + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseSNI(ssl, WOLFSSL_SNI_HOST_NAME, "www.wolfssl.com", 15)); } static void different_SNI_at_ssl(WOLFSSL* ssl) { - AssertIntEQ(SSL_SUCCESS, + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseSNI(ssl, WOLFSSL_SNI_HOST_NAME, "ww2.wolfssl.com", 15)); } @@ -1831,14 +1831,14 @@ static void test_wolfSSL_SNI_GetFromBuffer(void) sizeof(buffer), 0, result, &length)); buffer[4] = 0x64; - AssertIntEQ(SSL_SUCCESS, wolfSSL_SNI_GetFromBuffer(buffer, sizeof(buffer), + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_SNI_GetFromBuffer(buffer, sizeof(buffer), 0, result, &length)); result[length] = 0; AssertStrEQ("www.paypal.com", (const char*) result); length = 32; - AssertIntEQ(SSL_SUCCESS, wolfSSL_SNI_GetFromBuffer(buffer2, sizeof(buffer2), + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_SNI_GetFromBuffer(buffer2, sizeof(buffer2), 0, result, &length)); result[length] = 0; AssertStrEQ("api.textmate.org", (const char*) result); @@ -1882,24 +1882,24 @@ static void test_wolfSSL_UseMaxFragment(void) AssertNotNull(ssl); /* error cases */ - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(NULL, WOLFSSL_MFL_2_9)); - AssertIntNE(SSL_SUCCESS, wolfSSL_UseMaxFragment( NULL, WOLFSSL_MFL_2_9)); - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(ctx, 0)); - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(ctx, 6)); - AssertIntNE(SSL_SUCCESS, wolfSSL_UseMaxFragment(ssl, 0)); - AssertIntNE(SSL_SUCCESS, wolfSSL_UseMaxFragment(ssl, 6)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(NULL, WOLFSSL_MFL_2_9)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_UseMaxFragment( NULL, WOLFSSL_MFL_2_9)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(ctx, 0)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(ctx, 6)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_UseMaxFragment(ssl, 0)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_UseMaxFragment(ssl, 6)); /* success case */ - AssertIntEQ(SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(ctx, WOLFSSL_MFL_2_9)); - AssertIntEQ(SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(ctx, WOLFSSL_MFL_2_10)); - AssertIntEQ(SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(ctx, WOLFSSL_MFL_2_11)); - AssertIntEQ(SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(ctx, WOLFSSL_MFL_2_12)); - AssertIntEQ(SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(ctx, WOLFSSL_MFL_2_13)); - AssertIntEQ(SSL_SUCCESS, wolfSSL_UseMaxFragment( ssl, WOLFSSL_MFL_2_9)); - AssertIntEQ(SSL_SUCCESS, wolfSSL_UseMaxFragment( ssl, WOLFSSL_MFL_2_10)); - AssertIntEQ(SSL_SUCCESS, wolfSSL_UseMaxFragment( ssl, WOLFSSL_MFL_2_11)); - AssertIntEQ(SSL_SUCCESS, wolfSSL_UseMaxFragment( ssl, WOLFSSL_MFL_2_12)); - AssertIntEQ(SSL_SUCCESS, wolfSSL_UseMaxFragment( ssl, WOLFSSL_MFL_2_13)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(ctx, WOLFSSL_MFL_2_9)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(ctx, WOLFSSL_MFL_2_10)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(ctx, WOLFSSL_MFL_2_11)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(ctx, WOLFSSL_MFL_2_12)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseMaxFragment(ctx, WOLFSSL_MFL_2_13)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseMaxFragment( ssl, WOLFSSL_MFL_2_9)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseMaxFragment( ssl, WOLFSSL_MFL_2_10)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseMaxFragment( ssl, WOLFSSL_MFL_2_11)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseMaxFragment( ssl, WOLFSSL_MFL_2_12)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseMaxFragment( ssl, WOLFSSL_MFL_2_13)); wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); @@ -1916,12 +1916,12 @@ static void test_wolfSSL_UseTruncatedHMAC(void) AssertNotNull(ssl); /* error cases */ - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_UseTruncatedHMAC(NULL)); - AssertIntNE(SSL_SUCCESS, wolfSSL_UseTruncatedHMAC(NULL)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseTruncatedHMAC(NULL)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_UseTruncatedHMAC(NULL)); /* success case */ - AssertIntEQ(SSL_SUCCESS, wolfSSL_CTX_UseTruncatedHMAC(ctx)); - AssertIntEQ(SSL_SUCCESS, wolfSSL_UseTruncatedHMAC(ssl)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseTruncatedHMAC(ctx)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseTruncatedHMAC(ssl)); wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); @@ -1938,18 +1938,18 @@ static void test_wolfSSL_UseSupportedCurve(void) AssertNotNull(ssl); /* error cases */ - AssertIntNE(SSL_SUCCESS, + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseSupportedCurve(NULL, WOLFSSL_ECC_SECP256R1)); - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_UseSupportedCurve(ctx, 0)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseSupportedCurve(ctx, 0)); - AssertIntNE(SSL_SUCCESS, + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_UseSupportedCurve(NULL, WOLFSSL_ECC_SECP256R1)); - AssertIntNE(SSL_SUCCESS, wolfSSL_UseSupportedCurve(ssl, 0)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_UseSupportedCurve(ssl, 0)); /* success case */ - AssertIntEQ(SSL_SUCCESS, + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_CTX_UseSupportedCurve(ctx, WOLFSSL_ECC_SECP256R1)); - AssertIntEQ(SSL_SUCCESS, + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseSupportedCurve(ssl, WOLFSSL_ECC_SECP256R1)); wolfSSL_free(ssl); @@ -1971,7 +1971,7 @@ static void use_ALPN_all(WOLFSSL* ssl) 0x73, 0x70, 0x64, 0x79, 0x2f, 0x31, 0x2c, 0x73, 0x70, 0x64, 0x79, 0x2f, 0x32, 0x2c, 0x73, 0x70, 0x64, 0x79, 0x2f, 0x33}; - AssertIntEQ(SSL_SUCCESS, wolfSSL_UseALPN(ssl, alpn_list, sizeof(alpn_list), + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseALPN(ssl, alpn_list, sizeof(alpn_list), WOLFSSL_ALPN_FAILED_ON_MISMATCH)); } @@ -1982,7 +1982,7 @@ static void use_ALPN_all_continue(WOLFSSL* ssl) 0x73, 0x70, 0x64, 0x79, 0x2f, 0x31, 0x2c, 0x73, 0x70, 0x64, 0x79, 0x2f, 0x32, 0x2c, 0x73, 0x70, 0x64, 0x79, 0x2f, 0x33}; - AssertIntEQ(SSL_SUCCESS, wolfSSL_UseALPN(ssl, alpn_list, sizeof(alpn_list), + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseALPN(ssl, alpn_list, sizeof(alpn_list), WOLFSSL_ALPN_CONTINUE_ON_MISMATCH)); } @@ -1991,7 +1991,7 @@ static void use_ALPN_one(WOLFSSL* ssl) /* spdy/2 */ char proto[] = {0x73, 0x70, 0x64, 0x79, 0x2f, 0x32}; - AssertIntEQ(SSL_SUCCESS, wolfSSL_UseALPN(ssl, proto, sizeof(proto), + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseALPN(ssl, proto, sizeof(proto), WOLFSSL_ALPN_FAILED_ON_MISMATCH)); } @@ -2000,7 +2000,7 @@ static void use_ALPN_unknown(WOLFSSL* ssl) /* http/2.0 */ char proto[] = {0x68, 0x74, 0x74, 0x70, 0x2f, 0x32, 0x2e, 0x30}; - AssertIntEQ(SSL_SUCCESS, wolfSSL_UseALPN(ssl, proto, sizeof(proto), + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseALPN(ssl, proto, sizeof(proto), WOLFSSL_ALPN_FAILED_ON_MISMATCH)); } @@ -2009,7 +2009,7 @@ static void use_ALPN_unknown_continue(WOLFSSL* ssl) /* http/2.0 */ char proto[] = {0x68, 0x74, 0x74, 0x70, 0x2f, 0x32, 0x2e, 0x30}; - AssertIntEQ(SSL_SUCCESS, wolfSSL_UseALPN(ssl, proto, sizeof(proto), + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseALPN(ssl, proto, sizeof(proto), WOLFSSL_ALPN_CONTINUE_ON_MISMATCH)); } @@ -2021,7 +2021,7 @@ static void verify_ALPN_not_matching_spdy3(WOLFSSL* ssl) char *proto; word16 protoSz = 0; - AssertIntEQ(SSL_SUCCESS, wolfSSL_ALPN_GetProtocol(ssl, &proto, &protoSz)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_ALPN_GetProtocol(ssl, &proto, &protoSz)); /* check value */ AssertIntNE(1, sizeof(nego_proto) == protoSz); @@ -2048,7 +2048,7 @@ static void verify_ALPN_matching_http1(WOLFSSL* ssl) char *proto; word16 protoSz = 0; - AssertIntEQ(SSL_SUCCESS, wolfSSL_ALPN_GetProtocol(ssl, &proto, &protoSz)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_ALPN_GetProtocol(ssl, &proto, &protoSz)); /* check value */ AssertIntEQ(1, sizeof(nego_proto) == protoSz); @@ -2062,7 +2062,7 @@ static void verify_ALPN_matching_spdy2(WOLFSSL* ssl) char *proto; word16 protoSz = 0; - AssertIntEQ(SSL_SUCCESS, wolfSSL_ALPN_GetProtocol(ssl, &proto, &protoSz)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_ALPN_GetProtocol(ssl, &proto, &protoSz)); /* check value */ AssertIntEQ(1, sizeof(nego_proto) == protoSz); @@ -2079,14 +2079,14 @@ static void verify_ALPN_client_list(WOLFSSL* ssl) char *clist = NULL; word16 clistSz = 0; - AssertIntEQ(SSL_SUCCESS, wolfSSL_ALPN_GetPeerProtocol(ssl, &clist, + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_ALPN_GetPeerProtocol(ssl, &clist, &clistSz)); /* check value */ AssertIntEQ(1, sizeof(alpn_list) == clistSz); AssertIntEQ(0, XMEMCMP(alpn_list, clist, clistSz)); - AssertIntEQ(SSL_SUCCESS, wolfSSL_ALPN_FreePeerProtocol(ssl, &clist)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_ALPN_FreePeerProtocol(ssl, &clist)); } static void test_wolfSSL_UseALPN_connection(void) @@ -2155,15 +2155,15 @@ static void test_wolfSSL_UseALPN_params(void) AssertNotNull(ssl); /* error cases */ - AssertIntNE(SSL_SUCCESS, + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_UseALPN(NULL, http1, sizeof(http1), WOLFSSL_ALPN_FAILED_ON_MISMATCH)); - AssertIntNE(SSL_SUCCESS, wolfSSL_UseALPN(ssl, NULL, 0, + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_UseALPN(ssl, NULL, 0, WOLFSSL_ALPN_FAILED_ON_MISMATCH)); /* success case */ /* http1 only */ - AssertIntEQ(SSL_SUCCESS, + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseALPN(ssl, http1, sizeof(http1), WOLFSSL_ALPN_FAILED_ON_MISMATCH)); @@ -2173,7 +2173,7 @@ static void test_wolfSSL_UseALPN_params(void) buff[idx++] = ','; XMEMCPY(buff+idx, spdy1, sizeof(spdy1)); idx += sizeof(spdy1); - AssertIntEQ(SSL_SUCCESS, wolfSSL_UseALPN(ssl, buff, idx, + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseALPN(ssl, buff, idx, WOLFSSL_ALPN_FAILED_ON_MISMATCH)); /* http1, spdy2, spdy1 */ @@ -2185,7 +2185,7 @@ static void test_wolfSSL_UseALPN_params(void) buff[idx++] = ','; XMEMCPY(buff+idx, spdy1, sizeof(spdy1)); idx += sizeof(spdy1); - AssertIntEQ(SSL_SUCCESS, wolfSSL_UseALPN(ssl, buff, idx, + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseALPN(ssl, buff, idx, WOLFSSL_ALPN_FAILED_ON_MISMATCH)); /* spdy3, http1, spdy2, spdy1 */ @@ -2200,7 +2200,7 @@ static void test_wolfSSL_UseALPN_params(void) buff[idx++] = ','; XMEMCPY(buff+idx, spdy1, sizeof(spdy1)); idx += sizeof(spdy1); - AssertIntEQ(SSL_SUCCESS, wolfSSL_UseALPN(ssl, buff, idx, + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_UseALPN(ssl, buff, idx, WOLFSSL_ALPN_CONTINUE_ON_MISMATCH)); wolfSSL_free(ssl); @@ -2227,12 +2227,12 @@ static void test_wolfSSL_DisableExtendedMasterSecret(void) AssertNotNull(ssl); /* error cases */ - AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_DisableExtendedMasterSecret(NULL)); - AssertIntNE(SSL_SUCCESS, wolfSSL_DisableExtendedMasterSecret(NULL)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_CTX_DisableExtendedMasterSecret(NULL)); + AssertIntNE(WOLF_SSL_SUCCESS, wolfSSL_DisableExtendedMasterSecret(NULL)); /* success cases */ - AssertIntEQ(SSL_SUCCESS, wolfSSL_CTX_DisableExtendedMasterSecret(ctx)); - AssertIntEQ(SSL_SUCCESS, wolfSSL_DisableExtendedMasterSecret(ssl)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_CTX_DisableExtendedMasterSecret(ctx)); + AssertIntEQ(WOLF_SSL_SUCCESS, wolfSSL_DisableExtendedMasterSecret(ssl)); wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); @@ -2259,7 +2259,7 @@ static void test_wolfSSL_X509_NAME_get_entry(void) int idx; #ifndef NO_FILESYSTEM - x509 = wolfSSL_X509_load_certificate_file(cliCertFile, SSL_FILETYPE_PEM); + x509 = wolfSSL_X509_load_certificate_file(cliCertFile, WOLF_SSL_FILETYPE_PEM); AssertNotNull(x509); name = X509_get_subject_name(x509); @@ -2302,7 +2302,7 @@ static void test_wolfSSL_PKCS12(void) WC_PKCS12 *pkcs12; WOLFSSL_X509 *cert; WOLFSSL_X509 *tmp; - STACK_OF(WOLFSSL_X509) *ca; + WOLF_STACK_OF(WOLFSSL_X509) *ca; printf(testingFmt, "wolfSSL_PKCS12()"); @@ -2369,7 +2369,7 @@ static void test_wolfSSL_PKCS12(void) */ static int test_wolfSSL_CTX_SetMinVersion(void) { - int failFlag = SSL_SUCCESS; + int failFlag = WOLF_SSL_SUCCESS; #ifndef NO_WOLFSSL_CLIENT WOLFSSL_CTX* ctx; int itr; @@ -2381,7 +2381,7 @@ static int test_wolfSSL_CTX_SetMinVersion(void) const int versions[] = { WOLFSSL_TLSV1_2 }; #endif - failFlag = SSL_SUCCESS; + failFlag = WOLF_SSL_SUCCESS; AssertTrue(wolfSSL_Init()); ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method()); @@ -2389,12 +2389,12 @@ static int test_wolfSSL_CTX_SetMinVersion(void) printf(testingFmt, "wolfSSL_CTX_SetMinVersion()"); for (itr = 0; itr < (int)(sizeof(versions)/sizeof(int)); itr++){ - if(wolfSSL_CTX_SetMinVersion(ctx, *(versions + itr)) != SSL_SUCCESS){ - failFlag = SSL_FAILURE; + if(wolfSSL_CTX_SetMinVersion(ctx, *(versions + itr)) != WOLF_SSL_SUCCESS){ + failFlag = WOLF_SSL_FAILURE; } } - printf(resultFmt, failFlag == SSL_SUCCESS ? passed : failed); + printf(resultFmt, failFlag == WOLF_SSL_SUCCESS ? passed : failed); wolfSSL_CTX_free(ctx); AssertTrue(wolfSSL_Cleanup()); @@ -2430,20 +2430,20 @@ static int test_wolfSSL_UseOCSPStapling(void) ret = wolfSSL_UseOCSPStapling(ssl, WOLFSSL_CSR2_OCSP, WOLFSSL_CSR2_OCSP_USE_NONCE); - printf(resultFmt, ret == SSL_SUCCESS ? passed : failed); + printf(resultFmt, ret == WOLF_SSL_SUCCESS ? passed : failed); wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); - if(ret != SSL_SUCCESS){ + if(ret != WOLF_SSL_SUCCESS){ wolfSSL_Cleanup(); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } return wolfSSL_Cleanup(); #else - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; #endif } /*END test_wolfSSL_UseOCSPStapling */ @@ -2470,19 +2470,19 @@ static int test_wolfSSL_UseOCSPStaplingV2 (void) ret = wolfSSL_UseOCSPStaplingV2(ssl, WOLFSSL_CSR2_OCSP, WOLFSSL_CSR2_OCSP_USE_NONCE ); - printf(resultFmt, ret == SSL_SUCCESS ? passed : failed); + printf(resultFmt, ret == WOLF_SSL_SUCCESS ? passed : failed); wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); - if (ret != SSL_SUCCESS){ + if (ret != WOLF_SSL_SUCCESS){ wolfSSL_Cleanup(); - return SSL_FAILURE; + return WOLF_SSL_FAILURE; } return wolfSSL_Cleanup(); #else - return SSL_SUCCESS; + return WOLF_SSL_SUCCESS; #endif } /*END test_wolfSSL_UseOCSPStaplingV2*/ @@ -2507,7 +2507,7 @@ static void test_wolfSSL_mcast(void) AssertNotNull(ctx); result = wolfSSL_CTX_mcast_set_member_id(ctx, 0); - AssertIntEQ(result, SSL_SUCCESS); + AssertIntEQ(result, WOLF_SSL_SUCCESS); ssl = wolfSSL_new(ctx); AssertNotNull(ssl); @@ -2518,7 +2518,7 @@ static void test_wolfSSL_mcast(void) result = wolfSSL_set_secret(ssl, 23, preMasterSecret, sizeof(preMasterSecret), clientRandom, serverRandom, suite); - AssertIntEQ(result, SSL_SUCCESS); + AssertIntEQ(result, WOLF_SSL_SUCCESS); result = wolfSSL_mcast_read(ssl, &newId, buf, sizeof(buf)); AssertIntLE(result, 0); @@ -2542,7 +2542,7 @@ static int test_wc_InitMd5 (void) int flag = 0; #ifndef NO_MD5 - Md5 md5; + wc_Md5 md5; int ret; printf(testingFmt, "wc_InitMd5()"); @@ -2550,14 +2550,14 @@ static int test_wc_InitMd5 (void) /* Test good arg. */ ret = wc_InitMd5(&md5); if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } /* Test bad arg. */ if (!flag) { ret = wc_InitMd5(NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -2578,8 +2578,8 @@ static int test_wc_Md5Update (void) int flag = 0; #ifndef NO_MD5 - Md5 md5; - byte hash[MD5_DIGEST_SIZE]; + wc_Md5 md5; + byte hash[WC_MD5_DIGEST_SIZE]; testVector a, b, c; int ret; @@ -2632,8 +2632,8 @@ static int test_wc_Md5Update (void) } if (!flag) { - if (XMEMCMP(hash, a.output, MD5_DIGEST_SIZE) != 0) { - flag = SSL_FATAL_ERROR; + if (XMEMCMP(hash, a.output, WC_MD5_DIGEST_SIZE) != 0) { + flag = WOLF_SSL_FATAL_ERROR; } } @@ -2650,18 +2650,18 @@ static int test_wc_Md5Update (void) if (!flag) { c.input = NULL; - c.inLen = MD5_DIGEST_SIZE; + c.inLen = WC_MD5_DIGEST_SIZE; ret = wc_Md5Update(&md5, (byte*)c.input, (word32)c.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_Md5Update(NULL, (byte*)a.input, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -2683,11 +2683,11 @@ static int test_wc_Md5Final (void) int flag = 0; #ifndef NO_MD5 /* Instantiate */ - Md5 md5; + wc_Md5 md5; byte* hash_test[3]; - byte hash1[MD5_DIGEST_SIZE]; - byte hash2[2*MD5_DIGEST_SIZE]; - byte hash3[5*MD5_DIGEST_SIZE]; + byte hash1[WC_MD5_DIGEST_SIZE]; + byte hash2[2*WC_MD5_DIGEST_SIZE]; + byte hash3[5*WC_MD5_DIGEST_SIZE]; int times, i, ret; /* Initialize */ @@ -2711,7 +2711,7 @@ static int test_wc_Md5Final (void) if (!flag) { ret = wc_Md5Final(&md5, hash_test[i]); if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } } @@ -2720,21 +2720,21 @@ static int test_wc_Md5Final (void) if (!flag) { ret = wc_Md5Final(NULL, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_Md5Final(NULL, hash1); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_Md5Final(&md5, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -2754,7 +2754,7 @@ static int test_wc_InitSha(void) { int flag = 0; #ifndef NO_SHA - Sha sha; + wc_Sha sha; int ret; printf(testingFmt, "wc_InitSha()"); @@ -2762,14 +2762,14 @@ static int test_wc_InitSha(void) /* Test good arg. */ ret = wc_InitSha(&sha); if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } /* Test bad arg. */ if (!flag) { ret = wc_InitSha(NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -2790,8 +2790,8 @@ static int test_wc_ShaUpdate (void) int flag = 0; #ifndef NO_SHA - Sha sha; - byte hash[SHA_DIGEST_SIZE]; + wc_Sha sha; + byte hash[WC_SHA_DIGEST_SIZE]; testVector a, b, c; int ret; @@ -2844,8 +2844,8 @@ static int test_wc_ShaUpdate (void) } if (!flag) { - if (XMEMCMP(hash, a.output, SHA_DIGEST_SIZE) != 0) { - flag = SSL_FATAL_ERROR; + if (XMEMCMP(hash, a.output, WC_SHA_DIGEST_SIZE) != 0) { + flag = WOLF_SSL_FATAL_ERROR; } } @@ -2862,18 +2862,18 @@ static int test_wc_ShaUpdate (void) if (!flag) { c.input = NULL; - c.inLen = SHA_DIGEST_SIZE; + c.inLen = WC_SHA_DIGEST_SIZE; ret = wc_ShaUpdate(&sha, (byte*)c.input, (word32)c.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_ShaUpdate(NULL, (byte*)a.input, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -2894,11 +2894,11 @@ static int test_wc_ShaFinal (void) { int flag = 0; #ifndef NO_SHA - Sha sha; + wc_Sha sha; byte* hash_test[3]; - byte hash1[SHA_DIGEST_SIZE]; - byte hash2[2*SHA_DIGEST_SIZE]; - byte hash3[5*SHA_DIGEST_SIZE]; + byte hash1[WC_SHA_DIGEST_SIZE]; + byte hash2[2*WC_SHA_DIGEST_SIZE]; + byte hash3[5*WC_SHA_DIGEST_SIZE]; int times, i, ret; /*Initialize*/ @@ -2922,7 +2922,7 @@ static int test_wc_ShaFinal (void) if (!flag) { ret = wc_ShaFinal(&sha, hash_test[i]); if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } } @@ -2931,21 +2931,21 @@ static int test_wc_ShaFinal (void) if (!flag) { ret = wc_ShaFinal(NULL, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_ShaFinal(NULL, hash1); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_ShaFinal(&sha, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -2965,7 +2965,7 @@ static int test_wc_InitSha256 (void) { int flag = 0; #ifndef NO_SHA256 - Sha256 sha256; + wc_Sha256 sha256; int ret; printf(testingFmt, "wc_InitSha256()"); @@ -2973,14 +2973,14 @@ static int test_wc_InitSha256 (void) /* Test good arg. */ ret = wc_InitSha256(&sha256); if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } /* Test bad arg. */ if (!flag) { ret = wc_InitSha256(NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3000,8 +3000,8 @@ static int test_wc_Sha256Update (void) { int flag = 0; #ifndef NO_SHA256 - Sha256 sha256; - byte hash[SHA256_DIGEST_SIZE]; + wc_Sha256 sha256; + byte hash[WC_SHA256_DIGEST_SIZE]; testVector a, b, c; int ret; @@ -3055,8 +3055,8 @@ static int test_wc_Sha256Update (void) } if (!flag) { - if (XMEMCMP(hash, a.output, SHA256_DIGEST_SIZE) != 0) { - flag = SSL_FATAL_ERROR; + if (XMEMCMP(hash, a.output, WC_SHA256_DIGEST_SIZE) != 0) { + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3073,18 +3073,18 @@ static int test_wc_Sha256Update (void) if (!flag) { c.input = NULL; - c.inLen = SHA256_DIGEST_SIZE; + c.inLen = WC_SHA256_DIGEST_SIZE; ret = wc_Sha256Update(&sha256, (byte*)c.input, (word32)c.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_Sha256Update(NULL, (byte*)a.input, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3105,11 +3105,11 @@ static int test_wc_Sha256Final (void) { int flag = 0; #ifndef NO_SHA256 - Sha256 sha256; + wc_Sha256 sha256; byte* hash_test[3]; - byte hash1[SHA256_DIGEST_SIZE]; - byte hash2[2*SHA256_DIGEST_SIZE]; - byte hash3[5*SHA256_DIGEST_SIZE]; + byte hash1[WC_SHA256_DIGEST_SIZE]; + byte hash2[2*WC_SHA256_DIGEST_SIZE]; + byte hash3[5*WC_SHA256_DIGEST_SIZE]; int times, i, ret; /* Initialize */ @@ -3133,7 +3133,7 @@ static int test_wc_Sha256Final (void) if (!flag) { ret = wc_Sha256Final(&sha256, hash_test[i]); if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } } @@ -3142,21 +3142,21 @@ static int test_wc_Sha256Final (void) if (!flag ) { ret = wc_Sha256Final(NULL, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_Sha256Final(NULL, hash1); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_Sha256Final(&sha256, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3178,7 +3178,7 @@ static int test_wc_InitSha512 (void) { int flag = 0; #ifdef WOLFSSL_SHA512 - Sha512 sha512; + wc_Sha512 sha512; int ret; printf(testingFmt, "wc_InitSha512()"); @@ -3186,14 +3186,14 @@ static int test_wc_InitSha512 (void) /* Test good arg. */ ret = wc_InitSha512(&sha512); if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } /* Test bad arg. */ if (!flag) { ret = wc_InitSha512(NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3215,8 +3215,8 @@ static int test_wc_Sha512Update (void) int flag = 0; #ifdef WOLFSSL_SHA512 - Sha512 sha512; - byte hash[SHA512_DIGEST_SIZE]; + wc_Sha512 sha512; + byte hash[WC_SHA512_DIGEST_SIZE]; testVector a, b, c; int ret; @@ -3272,8 +3272,8 @@ static int test_wc_Sha512Update (void) } if (!flag) { - if (XMEMCMP(hash, a.output, SHA512_DIGEST_SIZE) != 0) { - flag = SSL_FATAL_ERROR; + if (XMEMCMP(hash, a.output, WC_SHA512_DIGEST_SIZE) != 0) { + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3290,18 +3290,18 @@ static int test_wc_Sha512Update (void) if (!flag) { c.input = NULL; - c.inLen = SHA512_DIGEST_SIZE; + c.inLen = WC_SHA512_DIGEST_SIZE; ret = wc_Sha512Update(&sha512, (byte*)c.input, (word32)c.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_Sha512Update(NULL, (byte*)a.input, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3323,11 +3323,11 @@ static int test_wc_Sha512Final (void) { int flag = 0; #ifdef WOLFSSL_SHA512 - Sha512 sha512; + wc_Sha512 sha512; byte* hash_test[3]; - byte hash1[SHA512_DIGEST_SIZE]; - byte hash2[2*SHA512_DIGEST_SIZE]; - byte hash3[5*SHA512_DIGEST_SIZE]; + byte hash1[WC_SHA512_DIGEST_SIZE]; + byte hash2[2*WC_SHA512_DIGEST_SIZE]; + byte hash3[5*WC_SHA512_DIGEST_SIZE]; int times, i, ret; /* Initialize */ @@ -3351,7 +3351,7 @@ static int test_wc_Sha512Final (void) if (!flag) { ret = wc_Sha512Final(&sha512, hash_test[i]); if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } } @@ -3359,20 +3359,20 @@ static int test_wc_Sha512Final (void) if (!flag) { ret = wc_Sha512Final(NULL, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } if (!flag) {} ret = wc_Sha512Final(NULL, hash1); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_Sha512Final(&sha512, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3394,7 +3394,7 @@ static int test_wc_InitSha384 (void) { int flag = 0; #ifdef WOLFSSL_SHA384 - Sha384 sha384; + wc_Sha384 sha384; int ret; printf(testingFmt, "wc_InitSha384()"); @@ -3402,14 +3402,14 @@ static int test_wc_InitSha384 (void) /* Test good arg. */ ret = wc_InitSha384(&sha384); if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } /* Test bad arg. */ if (!flag) { ret = wc_InitSha384(NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3429,8 +3429,8 @@ static int test_wc_Sha384Update (void) int flag = 0; #ifdef WOLFSSL_SHA384 - Sha384 sha384; - byte hash[SHA384_DIGEST_SIZE]; + wc_Sha384 sha384; + byte hash[WC_SHA384_DIGEST_SIZE]; testVector a, b, c; int ret; @@ -3485,8 +3485,8 @@ static int test_wc_Sha384Update (void) } if (!flag) { - if (XMEMCMP(hash, a.output, SHA384_DIGEST_SIZE) != 0) { - flag = SSL_FATAL_ERROR; + if (XMEMCMP(hash, a.output, WC_SHA384_DIGEST_SIZE) != 0) { + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3503,18 +3503,18 @@ static int test_wc_Sha384Update (void) if (!flag) { c.input = NULL; - c.inLen = SHA384_DIGEST_SIZE; + c.inLen = WC_SHA384_DIGEST_SIZE; ret = wc_Sha384Update(&sha384, (byte*)c.input, (word32)c.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_Sha384Update(NULL, (byte*)a.input, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3534,11 +3534,11 @@ static int test_wc_Sha384Final (void) { int flag = 0; #ifdef WOLFSSL_SHA384 - Sha384 sha384; + wc_Sha384 sha384; byte* hash_test[3]; - byte hash1[SHA384_DIGEST_SIZE]; - byte hash2[2*SHA384_DIGEST_SIZE]; - byte hash3[5*SHA384_DIGEST_SIZE]; + byte hash1[WC_SHA384_DIGEST_SIZE]; + byte hash2[2*WC_SHA384_DIGEST_SIZE]; + byte hash3[5*WC_SHA384_DIGEST_SIZE]; int times, i, ret; /* Initialize */ @@ -3562,7 +3562,7 @@ static int test_wc_Sha384Final (void) if (!flag) { ret = wc_Sha384Final(&sha384, hash_test[i]); if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } } @@ -3571,21 +3571,21 @@ static int test_wc_Sha384Final (void) if (!flag) { ret = wc_Sha384Final(NULL, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_Sha384Final(NULL, hash1); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_Sha384Final(&sha384, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3607,7 +3607,7 @@ static int test_wc_InitSha224 (void) { int flag = 0; #ifdef WOLFSSL_SHA224 - Sha224 sha224; + wc_Sha224 sha224; int ret; printf(testingFmt, "wc_InitSha224()"); @@ -3615,14 +3615,14 @@ static int test_wc_InitSha224 (void) /* Test good arg. */ ret = wc_InitSha224(&sha224); if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } /* Test bad arg. */ if (!flag) { ret = wc_InitSha224(NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3642,8 +3642,8 @@ static int test_wc_Sha224Update (void) { int flag = 0; #ifdef WOLFSSL_SHA224 - Sha224 sha224; - byte hash[SHA224_DIGEST_SIZE]; + wc_Sha224 sha224; + byte hash[WC_SHA224_DIGEST_SIZE]; testVector a, b, c; int ret; @@ -3696,8 +3696,8 @@ static int test_wc_Sha224Update (void) } if (!flag) { - if (XMEMCMP(hash, a.output, SHA224_DIGEST_SIZE) != 0) { - flag = SSL_FATAL_ERROR; + if (XMEMCMP(hash, a.output, WC_SHA224_DIGEST_SIZE) != 0) { + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3714,18 +3714,18 @@ static int test_wc_Sha224Update (void) if (!flag) { c.input = NULL; - c.inLen = SHA224_DIGEST_SIZE; + c.inLen = WC_SHA224_DIGEST_SIZE; ret = wc_Sha224Update(&sha224, (byte*)c.input, (word32)c.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_Sha224Update(NULL, (byte*)a.input, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3748,11 +3748,11 @@ static int test_wc_Sha224Final (void) { int flag = 0; #ifdef WOLFSSL_SHA224 - Sha224 sha224; + wc_Sha224 sha224; byte* hash_test[3]; - byte hash1[SHA224_DIGEST_SIZE]; - byte hash2[2*SHA224_DIGEST_SIZE]; - byte hash3[5*SHA224_DIGEST_SIZE]; + byte hash1[WC_SHA224_DIGEST_SIZE]; + byte hash2[2*WC_SHA224_DIGEST_SIZE]; + byte hash3[5*WC_SHA224_DIGEST_SIZE]; int times, i, ret; /* Initialize */ @@ -3776,7 +3776,7 @@ static int test_wc_Sha224Final (void) if (!flag) { ret = wc_Sha224Final(&sha224, hash_test[i]); if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } } @@ -3785,21 +3785,21 @@ static int test_wc_Sha224Final (void) if (!flag) { ret = wc_Sha224Final(NULL, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_Sha224Final(NULL, hash1); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_Sha224Final(&sha224, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3829,14 +3829,14 @@ static int test_wc_InitRipeMd (void) /* Test good arg. */ ret = wc_InitRipeMd(&ripemd); if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } /* Test bad arg. */ if (!flag) { ret = wc_InitRipeMd(NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3911,7 +3911,7 @@ static int test_wc_RipeMdUpdate (void) if (!flag) { if (XMEMCMP(hash, a.output, RIPEMD_DIGEST_SIZE) != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3932,14 +3932,14 @@ static int test_wc_RipeMdUpdate (void) ret = wc_RipeMdUpdate(&ripemd, (byte*)c.input, (word32)c.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_RipeMdUpdate(NULL, (byte*)a.input, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -3987,7 +3987,7 @@ static int test_wc_RipeMdFinal (void) if (!flag) { ret = wc_RipeMdFinal(&ripemd, hash_test[i]); if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } } @@ -3996,21 +3996,21 @@ static int test_wc_RipeMdFinal (void) if (!flag) { ret = wc_RipeMdFinal(NULL, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_RipeMdFinal(NULL, hash1); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_RipeMdFinal(&ripemd, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -4064,7 +4064,7 @@ static int test_wc_IdeaSetKey (void) flag = 1; } if (flag == 1) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } else { ret = 0; } @@ -4095,7 +4095,7 @@ static int test_wc_IdeaSetIV (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -4131,7 +4131,7 @@ static int test_wc_IdeaCipher (void) if (ret == 0) { ret = wc_IdeaCipher(&idea, enc, plain); if (ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } if (ret == 0) { @@ -4143,7 +4143,7 @@ static int test_wc_IdeaCipher (void) ret = XMEMCMP(plain, dec, IDEA_BLOCK_SIZE); } if (ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } /* Pass Bad Args. */ @@ -4158,7 +4158,7 @@ static int test_wc_IdeaCipher (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -4199,7 +4199,7 @@ static int test_wc_IdeaCbcEncyptDecrypt (void) ret = wc_IdeaCbcDecrypt(&idea, msg_dec, msg_enc, (word32)XSTRLEN(message) + 1); if (XMEMCMP(message, msg_dec, (word32)XSTRLEN(message))) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -4216,7 +4216,7 @@ static int test_wc_IdeaCbcEncyptDecrypt (void) (word32)XSTRLEN(message) + 1); } if (ret != BAD_FUNC_ARG) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } else { ret = 0; } @@ -4235,7 +4235,7 @@ static int test_wc_IdeaCbcEncyptDecrypt (void) (word32)XSTRLEN(message) + 1); } if (ret != BAD_FUNC_ARG) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } else { ret = 0; } @@ -4278,7 +4278,7 @@ static int test_wc_Md5HmacSetKey (void) return ret; for (itr = 0; itr < times; itr++) { - ret = wc_HmacSetKey(&hmac, MD5, (byte*)keys[itr], + ret = wc_HmacSetKey(&hmac, WC_MD5, (byte*)keys[itr], (word32)XSTRLEN(keys[itr])); if (ret != 0) { flag = ret; @@ -4287,17 +4287,17 @@ static int test_wc_Md5HmacSetKey (void) /* Bad args. */ if (!flag) { - ret = wc_HmacSetKey(NULL, MD5, (byte*)keys[0], + ret = wc_HmacSetKey(NULL, WC_MD5, (byte*)keys[0], (word32)XSTRLEN(keys[0])); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { - ret = wc_HmacSetKey(&hmac, MD5, NULL, (word32)XSTRLEN(keys[0])); + ret = wc_HmacSetKey(&hmac, WC_MD5, NULL, (word32)XSTRLEN(keys[0])); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -4305,19 +4305,19 @@ static int test_wc_Md5HmacSetKey (void) ret = wc_HmacSetKey(&hmac, 20, (byte*)keys[0], (word32)XSTRLEN(keys[0])); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { - ret = wc_HmacSetKey(&hmac, MD5, (byte*)keys[0], 0); + ret = wc_HmacSetKey(&hmac, WC_MD5, (byte*)keys[0], 0); #ifdef HAVE_FIPS if (ret != HMAC_MIN_KEYLEN_E) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } #else if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } #endif } @@ -4332,7 +4332,7 @@ static int test_wc_Md5HmacSetKey (void) /* - * testing wc_HmacSetKey() on Sha hash. + * testing wc_HmacSetKey() on wc_Sha hash. */ static int test_wc_ShaHmacSetKey (void) { @@ -4363,7 +4363,7 @@ static int test_wc_ShaHmacSetKey (void) return ret; for (itr = 0; itr < times; itr++) { - ret = wc_HmacSetKey(&hmac, SHA, (byte*)keys[itr], + ret = wc_HmacSetKey(&hmac, WC_SHA, (byte*)keys[itr], (word32)XSTRLEN(keys[itr])); if (ret != 0) { flag = ret; @@ -4372,17 +4372,17 @@ static int test_wc_ShaHmacSetKey (void) /* Bad args. */ if (!flag) { - ret = wc_HmacSetKey(NULL, SHA, (byte*)keys[0], + ret = wc_HmacSetKey(NULL, WC_SHA, (byte*)keys[0], (word32)XSTRLEN(keys[0])); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { - ret = wc_HmacSetKey(&hmac, SHA, NULL, (word32)XSTRLEN(keys[0])); + ret = wc_HmacSetKey(&hmac, WC_SHA, NULL, (word32)XSTRLEN(keys[0])); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -4390,19 +4390,19 @@ static int test_wc_ShaHmacSetKey (void) ret = wc_HmacSetKey(&hmac, 20, (byte*)keys[0], (word32)XSTRLEN(keys[0])); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { - ret = wc_HmacSetKey(&hmac, SHA, (byte*)keys[0], 0); + ret = wc_HmacSetKey(&hmac, WC_SHA, (byte*)keys[0], 0); #ifdef HAVE_FIPS if (ret != HMAC_MIN_KEYLEN_E) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } #else if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } #endif } @@ -4447,7 +4447,7 @@ static int test_wc_Sha224HmacSetKey (void) return ret; for (itr = 0; itr < times; itr++) { - ret = wc_HmacSetKey(&hmac, SHA224, (byte*)keys[itr], + ret = wc_HmacSetKey(&hmac, WC_SHA224, (byte*)keys[itr], (word32)XSTRLEN(keys[itr])); if (ret != 0) { flag = ret; @@ -4456,17 +4456,17 @@ static int test_wc_Sha224HmacSetKey (void) /* Bad args. */ if (!flag) { - ret = wc_HmacSetKey(NULL, SHA224, (byte*)keys[0], + ret = wc_HmacSetKey(NULL, WC_SHA224, (byte*)keys[0], (word32)XSTRLEN(keys[0])); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { - ret = wc_HmacSetKey(&hmac, SHA224, NULL, (word32)XSTRLEN(keys[0])); + ret = wc_HmacSetKey(&hmac, WC_SHA224, NULL, (word32)XSTRLEN(keys[0])); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -4474,19 +4474,19 @@ static int test_wc_Sha224HmacSetKey (void) ret = wc_HmacSetKey(&hmac, 20, (byte*)keys[0], (word32)XSTRLEN(keys[0])); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { - ret = wc_HmacSetKey(&hmac, SHA224, (byte*)keys[0], 0); + ret = wc_HmacSetKey(&hmac, WC_SHA224, (byte*)keys[0], 0); #ifdef HAVE_FIPS if (ret != HMAC_MIN_KEYLEN_E) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } #else if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } #endif } @@ -4531,7 +4531,7 @@ static int test_wc_Sha256HmacSetKey (void) return ret; for (itr = 0; itr < times; itr++) { - ret = wc_HmacSetKey(&hmac, SHA256, (byte*)keys[itr], + ret = wc_HmacSetKey(&hmac, WC_SHA256, (byte*)keys[itr], (word32)XSTRLEN(keys[itr])); if (ret != 0) { flag = ret; @@ -4540,17 +4540,17 @@ static int test_wc_Sha256HmacSetKey (void) /* Bad args. */ if (!flag) { - ret = wc_HmacSetKey(NULL, SHA256, (byte*)keys[0], + ret = wc_HmacSetKey(NULL, WC_SHA256, (byte*)keys[0], (word32)XSTRLEN(keys[0])); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { - ret = wc_HmacSetKey(&hmac, SHA256, NULL, (word32)XSTRLEN(keys[0])); + ret = wc_HmacSetKey(&hmac, WC_SHA256, NULL, (word32)XSTRLEN(keys[0])); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -4558,19 +4558,19 @@ static int test_wc_Sha256HmacSetKey (void) ret = wc_HmacSetKey(&hmac, 20, (byte*)keys[0], (word32)XSTRLEN(keys[0])); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { - ret = wc_HmacSetKey(&hmac, SHA256, (byte*)keys[0], 0); + ret = wc_HmacSetKey(&hmac, WC_SHA256, (byte*)keys[0], 0); #ifdef HAVE_FIPS if (ret != HMAC_MIN_KEYLEN_E) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } #else if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } #endif } @@ -4615,7 +4615,7 @@ static int test_wc_Sha384HmacSetKey (void) return ret; for (itr = 0; itr < times; itr++) { - ret = wc_HmacSetKey(&hmac, SHA384, (byte*)keys[itr], + ret = wc_HmacSetKey(&hmac, WC_SHA384, (byte*)keys[itr], (word32)XSTRLEN(keys[itr])); if (ret != 0) { flag = ret; @@ -4624,17 +4624,17 @@ static int test_wc_Sha384HmacSetKey (void) /* Bad args. */ if (!flag) { - ret = wc_HmacSetKey(NULL, SHA384, (byte*)keys[0], + ret = wc_HmacSetKey(NULL, WC_SHA384, (byte*)keys[0], (word32)XSTRLEN(keys[0])); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { - ret = wc_HmacSetKey(&hmac, SHA384, NULL, (word32)XSTRLEN(keys[0])); + ret = wc_HmacSetKey(&hmac, WC_SHA384, NULL, (word32)XSTRLEN(keys[0])); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -4642,19 +4642,19 @@ static int test_wc_Sha384HmacSetKey (void) ret = wc_HmacSetKey(&hmac, 20, (byte*)keys[0], (word32)XSTRLEN(keys[0])); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { - ret = wc_HmacSetKey(&hmac, SHA384, (byte*)keys[0], 0); + ret = wc_HmacSetKey(&hmac, WC_SHA384, (byte*)keys[0], 0); #ifdef HAVE_FIPS if (ret != HMAC_MIN_KEYLEN_E) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } #else if (ret != 0) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } #endif } @@ -4669,7 +4669,7 @@ static int test_wc_Sha384HmacSetKey (void) /* - * testing wc_HmacUpdate on Md5 hash. + * testing wc_HmacUpdate on wc_Md5 hash. */ static int test_wc_Md5HmacUpdate (void) { @@ -4699,7 +4699,7 @@ static int test_wc_Md5HmacUpdate (void) if (ret != 0) return ret; - ret = wc_HmacSetKey(&hmac, MD5, (byte*)keys, (word32)XSTRLEN(keys)); + ret = wc_HmacSetKey(&hmac, WC_MD5, (byte*)keys, (word32)XSTRLEN(keys)); if (ret != 0) { flag = ret; } @@ -4722,14 +4722,14 @@ static int test_wc_Md5HmacUpdate (void) if (!flag) { ret = wc_HmacUpdate(NULL, (byte*)a.input, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_HmacUpdate(&hmac, NULL, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -4779,7 +4779,7 @@ static int test_wc_ShaHmacUpdate (void) if (ret != 0) return ret; - ret = wc_HmacSetKey(&hmac, SHA, (byte*)keys, (word32)XSTRLEN(keys)); + ret = wc_HmacSetKey(&hmac, WC_SHA, (byte*)keys, (word32)XSTRLEN(keys)); if (ret != 0) { flag = ret; } @@ -4802,14 +4802,14 @@ static int test_wc_ShaHmacUpdate (void) if (!flag) { ret = wc_HmacUpdate(NULL, (byte*)a.input, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_HmacUpdate(&hmac, NULL, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -4859,7 +4859,7 @@ static int test_wc_Sha224HmacUpdate (void) if (ret != 0) return ret; - ret = wc_HmacSetKey(&hmac, SHA224, (byte*)keys, (word32)XSTRLEN(keys)); + ret = wc_HmacSetKey(&hmac, WC_SHA224, (byte*)keys, (word32)XSTRLEN(keys)); if (ret != 0) { flag = ret; } @@ -4882,14 +4882,14 @@ static int test_wc_Sha224HmacUpdate (void) if (!flag) { ret = wc_HmacUpdate(NULL, (byte*)a.input, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_HmacUpdate(&hmac, NULL, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -4933,13 +4933,13 @@ static int test_wc_Sha256HmacUpdate (void) flag = 0; - printf(testingFmt, "wc_HmacUpdate() with SHA256"); + printf(testingFmt, "wc_HmacUpdate() with WC_SHA256"); ret = wc_HmacInit(&hmac, NULL, INVALID_DEVID); if (ret != 0) return ret; - ret = wc_HmacSetKey(&hmac, SHA256, (byte*)keys, (word32)XSTRLEN(keys)); + ret = wc_HmacSetKey(&hmac, WC_SHA256, (byte*)keys, (word32)XSTRLEN(keys)); if (ret != 0) { flag = ret; } @@ -4962,14 +4962,14 @@ static int test_wc_Sha256HmacUpdate (void) if (!flag) { ret = wc_HmacUpdate(NULL, (byte*)a.input, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_HmacUpdate(&hmac, NULL, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -5019,7 +5019,7 @@ static int test_wc_Sha384HmacUpdate (void) if (ret != 0) return ret; - ret = wc_HmacSetKey(&hmac, SHA384, (byte*)keys, (word32)XSTRLEN(keys)); + ret = wc_HmacSetKey(&hmac, WC_SHA384, (byte*)keys, (word32)XSTRLEN(keys)); if (ret != 0) { flag = ret; } @@ -5042,14 +5042,14 @@ static int test_wc_Sha384HmacUpdate (void) if (!flag) { ret = wc_HmacUpdate(NULL, (byte*)a.input, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } if (!flag) { ret = wc_HmacUpdate(&hmac, NULL, (word32)a.inLen); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -5077,7 +5077,7 @@ static int test_wc_Md5HmacFinal (void) int flag = 0; #if !defined(NO_HMAC) && !defined(NO_MD5) Hmac hmac; - byte hash[MD5_DIGEST_SIZE]; + byte hash[WC_MD5_DIGEST_SIZE]; testVector a; int ret; const char* key; @@ -5097,7 +5097,7 @@ static int test_wc_Md5HmacFinal (void) if (ret != 0) return ret; - ret = wc_HmacSetKey(&hmac, MD5, (byte*)key, (word32)XSTRLEN(key)); + ret = wc_HmacSetKey(&hmac, WC_MD5, (byte*)key, (word32)XSTRLEN(key)); if (ret != 0) { flag = ret; } @@ -5117,8 +5117,8 @@ static int test_wc_Md5HmacFinal (void) } if (!flag) { - if (XMEMCMP(hash, a.output, MD5_DIGEST_SIZE) != 0) { - flag = SSL_FATAL_ERROR; + if (XMEMCMP(hash, a.output, WC_MD5_DIGEST_SIZE) != 0) { + flag = WOLF_SSL_FATAL_ERROR; } } @@ -5126,7 +5126,7 @@ static int test_wc_Md5HmacFinal (void) if (!flag) { ret = wc_HmacFinal(NULL, hash); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -5134,7 +5134,7 @@ static int test_wc_Md5HmacFinal (void) if (!flag) { ret = wc_HmacFinal(&hmac, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } #endif @@ -5156,7 +5156,7 @@ static int test_wc_ShaHmacFinal (void) int flag = 0; #if !defined(NO_HMAC) && !defined(NO_SHA) Hmac hmac; - byte hash[SHA_DIGEST_SIZE]; + byte hash[WC_SHA_DIGEST_SIZE]; testVector a; int ret; const char* key; @@ -5177,7 +5177,7 @@ static int test_wc_ShaHmacFinal (void) if (ret != 0) return ret; - ret = wc_HmacSetKey(&hmac, SHA, (byte*)key, (word32)XSTRLEN(key)); + ret = wc_HmacSetKey(&hmac, WC_SHA, (byte*)key, (word32)XSTRLEN(key)); if (ret != 0) { flag = ret; } @@ -5197,8 +5197,8 @@ static int test_wc_ShaHmacFinal (void) } if (!flag) { - if (XMEMCMP(hash, a.output, SHA_DIGEST_SIZE) != 0) { - flag = SSL_FATAL_ERROR; + if (XMEMCMP(hash, a.output, WC_SHA_DIGEST_SIZE) != 0) { + flag = WOLF_SSL_FATAL_ERROR; } } @@ -5206,7 +5206,7 @@ static int test_wc_ShaHmacFinal (void) if (!flag) { ret = wc_HmacFinal(NULL, hash); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -5214,7 +5214,7 @@ static int test_wc_ShaHmacFinal (void) if (!flag) { ret = wc_HmacFinal(&hmac, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } #endif @@ -5237,7 +5237,7 @@ static int test_wc_Sha224HmacFinal (void) int flag = 0; #if !defined(NO_HMAC) && defined(WOLFSSL_SHA224) Hmac hmac; - byte hash[SHA224_DIGEST_SIZE]; + byte hash[WC_SHA224_DIGEST_SIZE]; testVector a; int ret; const char* key; @@ -5258,7 +5258,7 @@ static int test_wc_Sha224HmacFinal (void) if (ret != 0) return ret; - ret = wc_HmacSetKey(&hmac, SHA224, (byte*)key, (word32)XSTRLEN(key)); + ret = wc_HmacSetKey(&hmac, WC_SHA224, (byte*)key, (word32)XSTRLEN(key)); if (ret != 0) { flag = ret; } @@ -5278,8 +5278,8 @@ static int test_wc_Sha224HmacFinal (void) } if (!flag) { - if (XMEMCMP(hash, a.output, SHA224_DIGEST_SIZE) != 0) { - flag = SSL_FATAL_ERROR; + if (XMEMCMP(hash, a.output, WC_SHA224_DIGEST_SIZE) != 0) { + flag = WOLF_SSL_FATAL_ERROR; } } @@ -5287,7 +5287,7 @@ static int test_wc_Sha224HmacFinal (void) if (!flag) { ret = wc_HmacFinal(NULL, hash); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -5295,7 +5295,7 @@ static int test_wc_Sha224HmacFinal (void) if (!flag) { ret = wc_HmacFinal(&hmac, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } #endif @@ -5316,7 +5316,7 @@ static int test_wc_Sha256HmacFinal (void) int flag = 0; #if !defined(NO_HMAC) && !defined(NO_SHA256) Hmac hmac; - byte hash[SHA256_DIGEST_SIZE]; + byte hash[WC_SHA256_DIGEST_SIZE]; testVector a; int ret; const char* key; @@ -5332,13 +5332,13 @@ static int test_wc_Sha256HmacFinal (void) flag = 0; - printf(testingFmt, "wc_HmacFinal() with SHA256"); + printf(testingFmt, "wc_HmacFinal() with WC_SHA256"); ret = wc_HmacInit(&hmac, NULL, INVALID_DEVID); if (ret != 0) return ret; - ret = wc_HmacSetKey(&hmac, SHA256, (byte*)key, (word32)XSTRLEN(key)); + ret = wc_HmacSetKey(&hmac, WC_SHA256, (byte*)key, (word32)XSTRLEN(key)); if (ret != 0) { flag = ret; } @@ -5358,8 +5358,8 @@ static int test_wc_Sha256HmacFinal (void) } if (!flag) { - if (XMEMCMP(hash, a.output, SHA256_DIGEST_SIZE) != 0) { - flag = SSL_FATAL_ERROR; + if (XMEMCMP(hash, a.output, WC_SHA256_DIGEST_SIZE) != 0) { + flag = WOLF_SSL_FATAL_ERROR; } } @@ -5367,7 +5367,7 @@ static int test_wc_Sha256HmacFinal (void) if (!flag) { ret = wc_HmacFinal(NULL, hash); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } @@ -5375,7 +5375,7 @@ static int test_wc_Sha256HmacFinal (void) if (!flag) { ret = wc_HmacFinal(&hmac, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } #endif @@ -5396,7 +5396,7 @@ static int test_wc_Sha384HmacFinal (void) int flag = 0; #if !defined(NO_HMAC) && defined(WOLFSSL_SHA384) Hmac hmac; - byte hash[SHA384_DIGEST_SIZE]; + byte hash[WC_SHA384_DIGEST_SIZE]; testVector a; int ret; const char* key; @@ -5419,7 +5419,7 @@ static int test_wc_Sha384HmacFinal (void) if (ret != 0) return ret; - ret = wc_HmacSetKey(&hmac, SHA384, (byte*)key, (word32)XSTRLEN(key)); + ret = wc_HmacSetKey(&hmac, WC_SHA384, (byte*)key, (word32)XSTRLEN(key)); if (ret != 0) { flag = ret; } @@ -5439,8 +5439,8 @@ static int test_wc_Sha384HmacFinal (void) } if (!flag) { - if (XMEMCMP(hash, a.output, SHA384_DIGEST_SIZE) != 0) { - flag = SSL_FATAL_ERROR; + if (XMEMCMP(hash, a.output, WC_SHA384_DIGEST_SIZE) != 0) { + flag = WOLF_SSL_FATAL_ERROR; } } @@ -5448,14 +5448,14 @@ static int test_wc_Sha384HmacFinal (void) if (!flag) { ret = wc_HmacFinal(NULL, hash); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } #ifndef HAVE_FIPS if (!flag) { ret = wc_HmacFinal(&hmac, NULL); if (ret != BAD_FUNC_ARG) { - flag = SSL_FATAL_ERROR; + flag = WOLF_SSL_FATAL_ERROR; } } #endif @@ -5503,7 +5503,7 @@ static int test_wc_Des3_SetIV (void) if (ret == 0) { if (XMEMCMP(iv, des.reg, DES_BLOCK_SIZE) != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -5514,7 +5514,7 @@ static int test_wc_Des3_SetIV (void) if (ret == BAD_FUNC_ARG) { ret = wc_Des3_SetIV(&des, NULL); } else if (ret == 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #endif @@ -5560,7 +5560,7 @@ static int test_wc_Des3_SetKey (void) ret = wc_Des3_SetKey(&des, key, iv, DES_ENCRYPTION); if (ret == 0) { if (XMEMCMP(iv, des.reg, DES_BLOCK_SIZE) != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -5640,7 +5640,7 @@ static int test_wc_Des3_CbcEncryptDecrypt (void) if (ret == 0) { if (XMEMCMP(plain, vector, 24) != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -5654,7 +5654,7 @@ static int test_wc_Des3_CbcEncryptDecrypt (void) ret = wc_Des3_CbcEncrypt(&des, cipher, NULL, sizeof(vector)); } if (ret != BAD_FUNC_ARG) { - ret = SSL_FATAL_ERROR;; + ret = WOLF_SSL_FATAL_ERROR;; } else { ret = 0; } @@ -5669,7 +5669,7 @@ static int test_wc_Des3_CbcEncryptDecrypt (void) ret = wc_Des3_CbcDecrypt(&des, plain, NULL, 24); } if (ret != BAD_FUNC_ARG) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } else { ret = 0; } @@ -5728,7 +5728,7 @@ static int test_wc_Des3_CbcEncryptDecryptWithKey (void) ret = wc_Des3_CbcDecryptWithKey(plain, cipher, cipherSz, key, iv); if (ret == 0) { if (XMEMCMP(plain, vector, 24) != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } } @@ -5747,7 +5747,7 @@ static int test_wc_Des3_CbcEncryptDecryptWithKey (void) key, NULL); } else { /* Return code catch. */ - ret = SSL_FAILURE; + ret = WOLF_SSL_FAILURE; } } @@ -5762,7 +5762,7 @@ static int test_wc_Des3_CbcEncryptDecryptWithKey (void) if (ret == BAD_FUNC_ARG) { ret = wc_Des3_CbcDecryptWithKey(plain, cipher, cipherSz, key, NULL); } else { - ret = SSL_FAILURE; + ret = WOLF_SSL_FAILURE; } } @@ -5802,7 +5802,7 @@ static int test_wc_Chacha_SetKey (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } printf(resultFmt, ret == 0 ? passed : failed); @@ -5818,7 +5818,7 @@ static int test_wc_Chacha_SetKey (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FAILURE; + ret = WOLF_SSL_FAILURE; } } printf(resultFmt, ret == 0 ? passed : failed); @@ -5879,7 +5879,7 @@ static int test_wc_Chacha_Process (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -5995,7 +5995,7 @@ static int test_wc_ChaCha20Poly1305_aead (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } printf(resultFmt, ret == 0 ? passed : failed); @@ -6037,7 +6037,7 @@ static int test_wc_ChaCha20Poly1305_aead (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -6083,7 +6083,7 @@ static int test_wc_AesSetIV (void) /* NULL iv should return 0. */ ret = wc_AesSetIV(&aes, NULL); } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -6157,7 +6157,7 @@ static int test_wc_AesSetKey (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -6196,9 +6196,9 @@ static int test_wc_AesCbcEncryptDecrypt (void) byte iv[] = "1234567890abcdef"; byte enc[sizeof(vector)]; byte dec[sizeof(vector)]; - int cbcE = SSL_FATAL_ERROR; - int cbcD = SSL_FATAL_ERROR; - int cbcDWK = SSL_FATAL_ERROR; + int cbcE = WOLF_SSL_FATAL_ERROR; + int cbcD = WOLF_SSL_FATAL_ERROR; + int cbcDWK = WOLF_SSL_FATAL_ERROR; byte dec2[sizeof(vector)]; /* Init stack variables. */ @@ -6222,7 +6222,7 @@ static int test_wc_AesCbcEncryptDecrypt (void) if (ret == 0) { ret = wc_AesCbcDecrypt(&aes, dec, enc, AES_BLOCK_SIZE); if (ret != 0 || XMEMCMP(vector, dec, AES_BLOCK_SIZE) != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } else { /* Set flag. */ cbcD = 0; @@ -6251,7 +6251,7 @@ static int test_wc_AesCbcEncryptDecrypt (void) if (cbcE == BAD_FUNC_ARG) { cbcE = 0; } else { - cbcE = SSL_FATAL_ERROR; + cbcE = WOLF_SSL_FATAL_ERROR; } } printf(resultFmt, cbcE == 0 ? passed : failed); @@ -6275,7 +6275,7 @@ static int test_wc_AesCbcEncryptDecrypt (void) if (cbcD == BAD_FUNC_ARG) { cbcD = 0; } else { - cbcD = SSL_FATAL_ERROR; + cbcD = WOLF_SSL_FATAL_ERROR; } } printf(resultFmt, cbcD == 0 ? passed : failed); @@ -6303,7 +6303,7 @@ static int test_wc_AesCbcEncryptDecrypt (void) if (cbcDWK == BAD_FUNC_ARG) { cbcDWK = 0; } else { - cbcDWK = SSL_FATAL_ERROR; + cbcDWK = WOLF_SSL_FATAL_ERROR; } } @@ -6371,7 +6371,7 @@ static int test_wc_AesCtrEncryptDecrypt (void) if (ret == 0) { ret = wc_AesCtrEncrypt(&aesDec, dec, enc, sizeof(enc)/sizeof(byte)); if (ret != 0 || XMEMCMP(vector, dec, sizeof(vector))) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } } @@ -6388,7 +6388,7 @@ static int test_wc_AesCtrEncryptDecrypt (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -6474,7 +6474,7 @@ static int test_wc_AesGcmSetKey (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -6519,8 +6519,8 @@ static int test_wc_AesGcmEncryptDecrypt (void) byte enc[sizeof(vector)]; byte resultT[AES_BLOCK_SIZE]; byte dec[sizeof(vector)]; - int gcmD = SSL_FATAL_ERROR; - int gcmE = SSL_FATAL_ERROR; + int gcmD = WOLF_SSL_FATAL_ERROR; + int gcmE = WOLF_SSL_FATAL_ERROR; /* Init stack variables. */ XMEMSET(enc, 0, sizeof(vector)); @@ -6542,7 +6542,7 @@ static int test_wc_AesGcmEncryptDecrypt (void) iv, sizeof(iv)/sizeof(byte), resultT, sizeof(resultT), a, sizeof(a)); if(gcmD == 0 && (XMEMCMP(vector, dec, sizeof(vector)) != 0)) { - gcmD = SSL_FATAL_ERROR; + gcmD = WOLF_SSL_FATAL_ERROR; } } printf(testingFmt, "wc_AesGcmEncrypt()"); @@ -6570,7 +6570,7 @@ static int test_wc_AesGcmEncryptDecrypt (void) if (gcmE == BAD_FUNC_ARG) { gcmE = 0; } else { - gcmE = SSL_FATAL_ERROR; + gcmE = WOLF_SSL_FATAL_ERROR; } #endif } /* END wc_AesGcmEncrypt */ @@ -6616,7 +6616,7 @@ static int test_wc_AesGcmEncryptDecrypt (void) if (gcmD == BAD_FUNC_ARG) { gcmD = 0; } else { - gcmD = SSL_FATAL_ERROR; + gcmD = WOLF_SSL_FATAL_ERROR; } } /* END wc_AesGcmDecrypt */ @@ -6707,7 +6707,7 @@ static int test_wc_GmacSetKey (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -6852,7 +6852,7 @@ static int test_wc_GmacUpdate (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -6928,7 +6928,7 @@ static int test_wc_CamelliaSetKey (void) if (ret == 0) { ret = wc_CamelliaSetKey(NULL, key32, (word32)sizeof(key32), iv); if (ret != BAD_FUNC_ARG) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } else { ret = 0; } @@ -6965,7 +6965,7 @@ static int test_wc_CamelliaSetIV (void) if (ret == 0) { ret = wc_CamelliaSetIV(NULL, NULL); if (ret != BAD_FUNC_ARG) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } else { ret = 0; } @@ -7003,8 +7003,8 @@ static int test_wc_CamelliaEncryptDecryptDirect (void) }; byte enc[sizeof(plainT)]; byte dec[sizeof(enc)]; - int camE = SSL_FATAL_ERROR; - int camD = SSL_FATAL_ERROR; + int camE = WOLF_SSL_FATAL_ERROR; + int camD = WOLF_SSL_FATAL_ERROR; /*Init stack variables.*/ XMEMSET(enc, 0, 16); @@ -7016,7 +7016,7 @@ static int test_wc_CamelliaEncryptDecryptDirect (void) if (ret == 0) { ret = wc_CamelliaDecryptDirect(&camellia, dec, enc); if (XMEMCMP(plainT, dec, CAMELLIA_BLOCK_SIZE)) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } } @@ -7033,7 +7033,7 @@ static int test_wc_CamelliaEncryptDecryptDirect (void) if (camE == BAD_FUNC_ARG) { camE = 0; } else { - camE = SSL_FATAL_ERROR; + camE = WOLF_SSL_FATAL_ERROR; } } @@ -7055,7 +7055,7 @@ static int test_wc_CamelliaEncryptDecryptDirect (void) if (camD == BAD_FUNC_ARG) { camD = 0; } else { - camD = SSL_FATAL_ERROR; + camD = WOLF_SSL_FATAL_ERROR; } } @@ -7090,8 +7090,8 @@ static int test_wc_CamelliaCbcEncryptDecrypt (void) }; byte enc[CAMELLIA_BLOCK_SIZE]; byte dec[CAMELLIA_BLOCK_SIZE]; - int camCbcE = SSL_FATAL_ERROR; - int camCbcD = SSL_FATAL_ERROR; + int camCbcE = WOLF_SSL_FATAL_ERROR; + int camCbcD = WOLF_SSL_FATAL_ERROR; /* Init stack variables. */ XMEMSET(enc, 0, CAMELLIA_BLOCK_SIZE); @@ -7101,7 +7101,7 @@ static int test_wc_CamelliaCbcEncryptDecrypt (void) if (ret == 0) { ret = wc_CamelliaCbcEncrypt(&camellia, enc, plainT, CAMELLIA_BLOCK_SIZE); if (ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } if (ret == 0) { @@ -7109,7 +7109,7 @@ static int test_wc_CamelliaCbcEncryptDecrypt (void) if (ret == 0) { ret = wc_CamelliaCbcDecrypt(&camellia, dec, enc, CAMELLIA_BLOCK_SIZE); if (XMEMCMP(plainT, dec, CAMELLIA_BLOCK_SIZE)) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } } @@ -7129,7 +7129,7 @@ static int test_wc_CamelliaCbcEncryptDecrypt (void) if (camCbcE == BAD_FUNC_ARG) { camCbcE = 0; } else { - camCbcE = SSL_FATAL_ERROR; + camCbcE = WOLF_SSL_FATAL_ERROR; } } @@ -7153,7 +7153,7 @@ static int test_wc_CamelliaCbcEncryptDecrypt (void) if (camCbcD == BAD_FUNC_ARG) { camCbcD = 0; } else { - camCbcD = SSL_FATAL_ERROR; + camCbcD = WOLF_SSL_FATAL_ERROR; } } /* END bad args. */ @@ -7233,7 +7233,7 @@ static int test_wc_RabbitProcess (void) if (ret == 0) { ret = wc_RabbitProcess(&dec, plain, cipher, (word32)inlen); if (ret != 0 || XMEMCMP(input, plain, inlen)) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } else { ret = 0; } @@ -7250,7 +7250,7 @@ static int test_wc_RabbitProcess (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -7292,7 +7292,7 @@ static int test_wc_Arc4SetKey (void) /* Exits normally if keyLen is incorrect. */ ret = wc_Arc4SetKey(&arc, (byte*)key, 0); } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } /* END test bad args. */ @@ -7343,7 +7343,7 @@ static int test_wc_Arc4Process (void) (word32)(sizeof(input)/sizeof(char))); if (ret != 0 || XMEMCMP(plain, input, (unsigned int)(sizeof(input)/sizeof(char)))) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } else { ret = 0; } @@ -7364,7 +7364,7 @@ static int test_wc_Arc4Process (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -7404,12 +7404,12 @@ static int test_wc_InitRsaKey (void) ret = 0; } else { #endif - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } /* end if */ if (wc_FreeRsaKey(&key) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } printf(resultFmt, ret == 0 ? passed : failed); @@ -7436,7 +7436,7 @@ static int test_wc_RsaPrivateKeyDecode (void) tmp = (byte*)XMALLOC(FOURK_BUF, NULL, DYNAMIC_TYPE_TMP_BUFFER); if (tmp == NULL) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } if (ret == 0) { ret = wc_InitRsaKey(&key, NULL); @@ -7465,7 +7465,7 @@ static int test_wc_RsaPrivateKeyDecode (void) if (ret == ASN_PARSE_E) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #else @@ -7481,7 +7481,7 @@ static int test_wc_RsaPrivateKeyDecode (void) if (ret == USER_CRYPTO_ERROR) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #endif @@ -7490,7 +7490,7 @@ static int test_wc_RsaPrivateKeyDecode (void) XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER); } if (wc_FreeRsaKey(&key) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } printf(resultFmt, ret == 0 ? passed : failed); @@ -7515,7 +7515,7 @@ static int test_wc_RsaPublicKeyDecode (void) tmp = (byte*)XMALLOC(GEN_BUF, NULL, DYNAMIC_TYPE_TMP_BUFFER); if (tmp == NULL) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } if (ret == 0) { ret = wc_InitRsaKey(&keyPub, NULL); @@ -7546,7 +7546,7 @@ static int test_wc_RsaPublicKeyDecode (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #else @@ -7562,7 +7562,7 @@ static int test_wc_RsaPublicKeyDecode (void) if (ret == USER_CRYPTO_ERROR) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #endif @@ -7571,7 +7571,7 @@ static int test_wc_RsaPublicKeyDecode (void) XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER); } if (wc_FreeRsaKey(&keyPub) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } printf(resultFmt, ret == 0 ? passed : failed); @@ -7614,7 +7614,7 @@ static int test_wc_RsaPublicKeyDecodeRaw (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #else @@ -7630,13 +7630,13 @@ static int test_wc_RsaPublicKeyDecodeRaw (void) if (ret == USER_CRYPTO_ERROR) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #endif if (wc_FreeRsaKey(&key) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } printf(resultFmt, ret == 0 ? passed : failed); @@ -7665,7 +7665,7 @@ static int test_wc_MakeRsaKey (void) if (ret == 0) { ret = wc_MakeRsaKey(&genKey, 1024, 65537, &rng); if (ret == 0 && wc_FreeRsaKey(&genKey) != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } } @@ -7687,7 +7687,7 @@ static int test_wc_MakeRsaKey (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #else @@ -7708,13 +7708,13 @@ static int test_wc_MakeRsaKey (void) if (ret == USER_CRYPTO_ERROR) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #endif if (wc_FreeRng(&rng) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } printf(resultFmt, ret == 0 ? passed : failed); @@ -7769,7 +7769,7 @@ static int test_wc_SetKeyUsage (void) if (ret == KEYUSAGE_E) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -7793,7 +7793,7 @@ static int test_wc_RsaKeyToDer (void) der = (byte*)XMALLOC(610, NULL, DYNAMIC_TYPE_TMP_BUFFER); if (der == NULL) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } /* Init structures. */ if (ret == 0) { @@ -7806,7 +7806,7 @@ static int test_wc_RsaKeyToDer (void) if (ret == 0) { ret = wc_MakeRsaKey(&genKey, 1024, 65537, &rng); if (ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -7817,7 +7817,7 @@ static int test_wc_RsaKeyToDer (void) if (ret > 0) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #ifndef HAVE_USER_RSA @@ -7835,7 +7835,7 @@ static int test_wc_RsaKeyToDer (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #else @@ -7853,7 +7853,7 @@ static int test_wc_RsaKeyToDer (void) if (ret == USER_CRYPTO_ERROR) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #endif @@ -7862,10 +7862,10 @@ static int test_wc_RsaKeyToDer (void) XFREE(der, NULL, DYNAMIC_TYPE_TMP_BUFFER); } if (wc_FreeRsaKey(&genKey) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } if (wc_FreeRng(&rng) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } printf(resultFmt, ret == 0 ? passed : failed); @@ -7888,7 +7888,7 @@ static int test_wc_RsaKeyToPublicDer (void) der = (byte*)XMALLOC(derLen, NULL, DYNAMIC_TYPE_TMP_BUFFER); if (der == NULL) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } if (ret == 0) { ret = wc_InitRsaKey(&key, NULL); @@ -7907,7 +7907,7 @@ static int test_wc_RsaKeyToPublicDer (void) if (ret >= 0) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -7924,7 +7924,7 @@ static int test_wc_RsaKeyToPublicDer (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #else @@ -7940,7 +7940,7 @@ static int test_wc_RsaKeyToPublicDer (void) if (ret == USER_CRYPTO_ERROR) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #endif @@ -7949,10 +7949,10 @@ static int test_wc_RsaKeyToPublicDer (void) XFREE(der, NULL, DYNAMIC_TYPE_TMP_BUFFER); } if (wc_FreeRsaKey(&key) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } if (wc_FreeRng(&rng) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } printf(resultFmt, ret == 0 ? passed : failed); @@ -7996,7 +7996,7 @@ static int test_wc_RsaPublicEncryptDecrypt (void) cipherLen = ret; ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -8029,10 +8029,10 @@ static int test_wc_RsaPublicEncryptDecrypt (void) FREE_VAR(plain, NULL); FREE_VAR(cipher, NULL); if (wc_FreeRsaKey(&key) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } if (wc_FreeRng(&rng) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } printf(resultFmt, ret == 0 ? passed : failed); @@ -8084,7 +8084,7 @@ static int test_wc_RsaPublicEncryptDecrypt_ex (void) idx = ret; ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -8111,7 +8111,7 @@ static int test_wc_RsaPublicEncryptDecrypt_ex (void) if (!XMEMCMP(plain, inStr, plainSz)) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -8132,7 +8132,7 @@ static int test_wc_RsaPublicEncryptDecrypt_ex (void) if (!XMEMCMP(inStr, res, plainSz)) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } } @@ -8141,10 +8141,10 @@ static int test_wc_RsaPublicEncryptDecrypt_ex (void) FREE_VAR(plain, NULL); FREE_VAR(cipher, NULL); if (wc_FreeRsaKey(&key) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } if (wc_FreeRng(&rng) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } printf(resultFmt, ret == 0 ? passed : failed); @@ -8191,7 +8191,7 @@ static int test_wc_RsaSSL_SignVerify (void) idx = ret; ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #ifndef HAVE_USER_RSA @@ -8210,7 +8210,7 @@ static int test_wc_RsaSSL_SignVerify (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #else @@ -8229,7 +8229,7 @@ static int test_wc_RsaSSL_SignVerify (void) if (ret == USER_CRYPTO_ERROR) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #endif @@ -8246,7 +8246,7 @@ static int test_wc_RsaSSL_SignVerify (void) if (ret == (int)inLen) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #ifndef HAVE_USER_RSA @@ -8265,7 +8265,7 @@ static int test_wc_RsaSSL_SignVerify (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #else @@ -8284,7 +8284,7 @@ static int test_wc_RsaSSL_SignVerify (void) if (ret == USER_CRYPTO_ERROR) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #endif @@ -8293,10 +8293,10 @@ static int test_wc_RsaSSL_SignVerify (void) FREE_VAR(out, NULL); FREE_VAR(plain, NULL); if (wc_FreeRsaKey(&key) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } if (wc_FreeRng(&rng) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } printf(resultFmt, ret == 0 ? passed : failed); @@ -8333,11 +8333,11 @@ static int test_wc_RsaEncryptSize (void) if (ret == enc128) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } if (wc_FreeRsaKey(&key) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } else { ret = 0; } @@ -8350,7 +8350,7 @@ static int test_wc_RsaEncryptSize (void) if (ret == enc512) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -8361,16 +8361,16 @@ static int test_wc_RsaEncryptSize (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } #endif } if (wc_FreeRsaKey(&key) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } if (wc_FreeRng(&rng) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } printf(resultFmt, ret == 0 ? passed : failed); @@ -8404,7 +8404,7 @@ static int test_wc_RsaFlattenPublicKey (void) if (ret >= 0) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -8432,7 +8432,7 @@ static int test_wc_RsaFlattenPublicKey (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #else @@ -8454,15 +8454,15 @@ static int test_wc_RsaFlattenPublicKey (void) if (ret == USER_CRYPTO_ERROR) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } #endif if (wc_FreeRsaKey(&key) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } if (wc_FreeRng(&rng) || ret != 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } printf(resultFmt, ret == 0 ? passed : failed); @@ -8525,7 +8525,7 @@ static int test_wc_AesCcmSetKey (void) ret = wc_AesCcmSetKey(&aes, key32, sizeof(key32) - 1); } if (ret != BAD_FUNC_ARG) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } else { ret = 0; } @@ -8582,9 +8582,9 @@ static int test_wc_AesCcmEncryptDecrypt (void) }; byte cipherOut[sizeof(plainT)]; byte authTag[sizeof(t)]; - int ccmE = SSL_FATAL_ERROR; + int ccmE = WOLF_SSL_FATAL_ERROR; #ifdef HAVE_AES_DECRYPT - int ccmD = SSL_FATAL_ERROR; + int ccmD = WOLF_SSL_FATAL_ERROR; byte plainOut[sizeof(cipherOut)]; #endif @@ -8599,8 +8599,8 @@ static int test_wc_AesCcmEncryptDecrypt (void) authIn , sizeof(authIn)); if ((XMEMCMP(cipherOut, c, sizeof(c)) && ccmE == 0) || XMEMCMP(t, authTag, sizeof(t))) { - ccmE = SSL_FATAL_ERROR; - ret = SSL_FATAL_ERROR; + ccmE = WOLF_SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } #ifdef HAVE_AES_DECRYPT if (ret == 0) { @@ -8610,7 +8610,7 @@ static int test_wc_AesCcmEncryptDecrypt (void) authIn, sizeof(authIn)); } if (XMEMCMP(plainOut, plainT, sizeof(plainT)) && ccmD == 0) { - ccmD = SSL_FATAL_ERROR; + ccmD = WOLF_SSL_FATAL_ERROR; } #endif } @@ -8654,7 +8654,7 @@ static int test_wc_AesCcmEncryptDecrypt (void) } if (ccmE != BAD_FUNC_ARG) { - ccmE = SSL_FATAL_ERROR; + ccmE = WOLF_SSL_FATAL_ERROR; } else { ccmE = 0; } @@ -8707,7 +8707,7 @@ static int test_wc_AesCcmEncryptDecrypt (void) authIn, sizeof(authIn)); } if (ccmD != BAD_FUNC_ARG) { - ccmD = SSL_FATAL_ERROR; + ccmD = WOLF_SSL_FATAL_ERROR; } else { ccmD = 0; } @@ -8803,7 +8803,7 @@ static int test_wc_Hc128_Process (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -8835,7 +8835,7 @@ static int test_wc_InitDsaKey (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -8857,9 +8857,9 @@ static int test_wc_DsaSignVerify (void) #if !defined(NO_DSA) DsaKey key; WC_RNG rng; - Sha sha; + wc_Sha sha; byte signature[DSA_SIG_SIZE]; - byte hash[SHA_DIGEST_SIZE]; + byte hash[WC_SHA_DIGEST_SIZE]; word32 idx = 0; word32 bytes; int answer; @@ -8878,7 +8878,7 @@ static int test_wc_DsaSignVerify (void) XMEMSET(tmp, 0, sizeof(tmp)); FILE* fp = fopen("./certs/dsa2048.der", "rb"); if (!fp) { - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } bytes = (word32) fread(tmp, 1, sizeof(tmp), fp); fclose(fp); @@ -8922,7 +8922,7 @@ static int test_wc_DsaSignVerify (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -8937,7 +8937,7 @@ static int test_wc_DsaSignVerify (void) ret = wc_DsaVerify(hash, signature, &key, &answer); if (ret != 0 || answer != 1) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } else { ret = 0; } @@ -8957,12 +8957,12 @@ static int test_wc_DsaSignVerify (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } if (wc_FreeRng(&rng) && ret == 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } printf(resultFmt, ret == 0 ? passed : failed); @@ -8986,8 +8986,8 @@ static int test_wc_DsaPublicPrivateKeyDecode (void) DsaKey key; word32 bytes; word32 idx = 0; - int priv = SSL_FATAL_ERROR; - int pub = SSL_FATAL_ERROR; + int priv = WOLF_SSL_FATAL_ERROR; + int pub = WOLF_SSL_FATAL_ERROR; #ifdef USE_CERT_BUFFERS_1024 byte tmp[ONEK_BUF]; @@ -9002,7 +9002,7 @@ static int test_wc_DsaPublicPrivateKeyDecode (void) XMEMSET(tmp, 0, sizeof(tmp)); FILE* fp = fopen("./certs/dsa2048.der", "rb"); if (!fp) { - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } bytes = (word32) fread(tmp, 1, sizeof(tmp), fp); fclose(fp); @@ -9029,7 +9029,7 @@ static int test_wc_DsaPublicPrivateKeyDecode (void) if (priv == ASN_PARSE_E) { priv = 0; } else { - priv = SSL_FATAL_ERROR; + priv = WOLF_SSL_FATAL_ERROR; } } } /* END Private Key */ @@ -9059,7 +9059,7 @@ static int test_wc_DsaPublicPrivateKeyDecode (void) if (pub == ASN_PARSE_E) { pub = 0; } else { - pub = SSL_FATAL_ERROR; + pub = WOLF_SSL_FATAL_ERROR; } } @@ -9107,7 +9107,7 @@ static int test_wc_MakeDsaKey (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } @@ -9128,12 +9128,12 @@ static int test_wc_MakeDsaKey (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } if (wc_FreeRng(&rng) && ret == 0) { - ret = SSL_FAILURE; + ret = WOLF_SSL_FAILURE; } printf(resultFmt, ret == 0 ? passed : failed); @@ -9177,7 +9177,7 @@ static int test_wc_DsaKeyToDer (void) XMEMSET(der, 0, sizeof(der)); FILE* fp = fopen("./certs/dsa2048.der", "rb"); if (!fp) { - return SSL_BAD_FILE; + return WOLF_SSL_BAD_FILE; } bytes = (word32) fread(tmp, 1, sizeof(tmp), fp); fclose(fp); @@ -9216,12 +9216,12 @@ static int test_wc_DsaKeyToDer (void) if (ret == BAD_FUNC_ARG) { ret = 0; } else { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } } if (wc_FreeRng(&rng) && ret == 0) { - ret = SSL_FATAL_ERROR; + ret = WOLF_SSL_FATAL_ERROR; } printf(resultFmt, ret == 0 ? passed : failed); @@ -9291,37 +9291,37 @@ static void test_wolfSSL_certs(void) X509* x509; WOLFSSL* ssl; WOLFSSL_CTX* ctx; - STACK_OF(ASN1_OBJECT)* sk; + WOLF_STACK_OF(ASN1_OBJECT)* sk; int crit; printf(testingFmt, "wolfSSL_certs()"); AssertNotNull(ctx = SSL_CTX_new(wolfSSLv23_server_method())); - AssertTrue(SSL_CTX_use_certificate_file(ctx, svrCertFile, SSL_FILETYPE_PEM)); - AssertTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, SSL_FILETYPE_PEM)); + AssertTrue(SSL_CTX_use_certificate_file(ctx, svrCertFile, WOLF_SSL_FILETYPE_PEM)); + AssertTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, WOLF_SSL_FILETYPE_PEM)); AssertNotNull(ssl = SSL_new(ctx)); - AssertIntEQ(wolfSSL_check_private_key(ssl), SSL_SUCCESS); + AssertIntEQ(wolfSSL_check_private_key(ssl), WOLF_SSL_SUCCESS); #ifdef HAVE_PK_CALLBACKS - AssertIntEQ((int)SSL_set_tlsext_debug_arg(ssl, NULL), SSL_SUCCESS); + AssertIntEQ((int)SSL_set_tlsext_debug_arg(ssl, NULL), WOLF_SSL_SUCCESS); #endif /* HAVE_PK_CALLBACKS */ /* create and use x509 */ - x509 = wolfSSL_X509_load_certificate_file(cliCertFile, SSL_FILETYPE_PEM); + x509 = wolfSSL_X509_load_certificate_file(cliCertFile, WOLF_SSL_FILETYPE_PEM); AssertNotNull(x509); - AssertIntEQ(SSL_use_certificate(ssl, x509), SSL_SUCCESS); + AssertIntEQ(SSL_use_certificate(ssl, x509), WOLF_SSL_SUCCESS); #ifndef HAVE_USER_RSA /* with loading in a new cert the check on private key should now fail */ - AssertIntNE(wolfSSL_check_private_key(ssl), SSL_SUCCESS); + AssertIntNE(wolfSSL_check_private_key(ssl), WOLF_SSL_SUCCESS); #endif #if defined(USE_CERT_BUFFERS_2048) AssertIntEQ(SSL_use_certificate_ASN1(ssl, (unsigned char*)server_cert_der_2048, - sizeof_server_cert_der_2048), SSL_SUCCESS); + sizeof_server_cert_der_2048), WOLF_SSL_SUCCESS); #endif #if !defined(NO_SHA) && !defined(NO_SHA256) @@ -9332,73 +9332,73 @@ static void test_wolfSSL_certs(void) XMEMSET(digest, 0, sizeof(digest)); AssertIntEQ(X509_digest(x509, wolfSSL_EVP_sha1(), digest, &digestSz), - SSL_SUCCESS); + WOLF_SSL_SUCCESS); AssertIntEQ(X509_digest(x509, wolfSSL_EVP_sha256(), digest, &digestSz), - SSL_SUCCESS); + WOLF_SSL_SUCCESS); AssertIntEQ(X509_digest(NULL, wolfSSL_EVP_sha1(), digest, &digestSz), - SSL_FAILURE); + WOLF_SSL_FAILURE); } #endif /* !NO_SHA && !NO_SHA256*/ /* test and checkout X509 extensions */ - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_basic_constraints, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_basic_constraints, &crit, NULL); AssertNotNull(sk); AssertIntEQ(crit, 0); wolfSSL_sk_ASN1_OBJECT_free(sk); - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_key_usage, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_key_usage, &crit, NULL); /* AssertNotNull(sk); NID not yet supported */ AssertIntEQ(crit, -1); wolfSSL_sk_ASN1_OBJECT_free(sk); - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_ext_key_usage, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_ext_key_usage, &crit, NULL); /* AssertNotNull(sk); no extension set */ wolfSSL_sk_ASN1_OBJECT_free(sk); - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_authority_key_identifier, &crit, NULL); AssertNotNull(sk); wolfSSL_sk_ASN1_OBJECT_free(sk); - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_private_key_usage_period, &crit, NULL); /* AssertNotNull(sk); NID not yet supported */ AssertIntEQ(crit, -1); wolfSSL_sk_ASN1_OBJECT_free(sk); - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_subject_alt_name, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_subject_alt_name, &crit, NULL); /* AssertNotNull(sk); no alt names set */ wolfSSL_sk_ASN1_OBJECT_free(sk); - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_issuer_alt_name, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_issuer_alt_name, &crit, NULL); /* AssertNotNull(sk); NID not yet supported */ AssertIntEQ(crit, -1); wolfSSL_sk_ASN1_OBJECT_free(sk); - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_info_access, &crit, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_info_access, &crit, NULL); /* AssertNotNull(sk); no auth info set */ wolfSSL_sk_ASN1_OBJECT_free(sk); - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_sinfo_access, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_sinfo_access, &crit, NULL); /* AssertNotNull(sk); NID not yet supported */ AssertIntEQ(crit, -1); wolfSSL_sk_ASN1_OBJECT_free(sk); - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_name_constraints, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_name_constraints, &crit, NULL); /* AssertNotNull(sk); NID not yet supported */ AssertIntEQ(crit, -1); wolfSSL_sk_ASN1_OBJECT_free(sk); - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_certificate_policies, &crit, NULL); #if !defined(WOLFSSL_SEP) && !defined(WOLFSSL_CERT_EXT) AssertNull(sk); @@ -9407,25 +9407,25 @@ static void test_wolfSSL_certs(void) #endif wolfSSL_sk_ASN1_OBJECT_free(sk); - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_policy_mappings, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_policy_mappings, &crit, NULL); /* AssertNotNull(sk); NID not yet supported */ AssertIntEQ(crit, -1); wolfSSL_sk_ASN1_OBJECT_free(sk); - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_policy_constraints, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_policy_constraints, &crit, NULL); /* AssertNotNull(sk); NID not yet supported */ AssertIntEQ(crit, -1); wolfSSL_sk_ASN1_OBJECT_free(sk); - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_inhibit_any_policy, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_inhibit_any_policy, &crit, NULL); /* AssertNotNull(sk); NID not yet supported */ AssertIntEQ(crit, -1); wolfSSL_sk_ASN1_OBJECT_free(sk); - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_tlsfeature, &crit, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, NID_tlsfeature, &crit, NULL); /* AssertNotNull(sk); NID not yet supported */ AssertIntEQ(crit, -1); @@ -9433,10 +9433,10 @@ static void test_wolfSSL_certs(void) /* test invalid cases */ crit = 0; - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, -1, &crit, NULL); + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509, -1, &crit, NULL); AssertNull(sk); AssertIntEQ(crit, -1); - sk = (STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(NULL, NID_tlsfeature, + sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(NULL, NID_tlsfeature, NULL, NULL); AssertNull(sk); @@ -9500,11 +9500,11 @@ static void test_wolfSSL_private_keys(void) OpenSSL_add_all_algorithms(); AssertNotNull(ctx = SSL_CTX_new(wolfSSLv23_server_method())); - AssertTrue(SSL_CTX_use_certificate_file(ctx, svrCertFile, SSL_FILETYPE_PEM)); - AssertTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, SSL_FILETYPE_PEM)); + AssertTrue(SSL_CTX_use_certificate_file(ctx, svrCertFile, WOLF_SSL_FILETYPE_PEM)); + AssertTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, WOLF_SSL_FILETYPE_PEM)); AssertNotNull(ssl = SSL_new(ctx)); - AssertIntEQ(wolfSSL_check_private_key(ssl), SSL_SUCCESS); + AssertIntEQ(wolfSSL_check_private_key(ssl), WOLF_SSL_SUCCESS); #ifdef USE_CERT_BUFFERS_2048 { @@ -9512,25 +9512,25 @@ static void test_wolfSSL_private_keys(void) AssertIntEQ(SSL_use_RSAPrivateKey_ASN1(ssl, (unsigned char*)client_key_der_2048, - sizeof_client_key_der_2048), SSL_SUCCESS); + sizeof_client_key_der_2048), WOLF_SSL_SUCCESS); #ifndef HAVE_USER_RSA /* Should missmatch now that a different private key loaded */ - AssertIntNE(wolfSSL_check_private_key(ssl), SSL_SUCCESS); + AssertIntNE(wolfSSL_check_private_key(ssl), WOLF_SSL_SUCCESS); #endif AssertIntEQ(SSL_use_PrivateKey_ASN1(0, ssl, (unsigned char*)server_key, - sizeof_server_key_der_2048), SSL_SUCCESS); + sizeof_server_key_der_2048), WOLF_SSL_SUCCESS); /* After loading back in DER format of original key, should match */ - AssertIntEQ(wolfSSL_check_private_key(ssl), SSL_SUCCESS); + AssertIntEQ(wolfSSL_check_private_key(ssl), WOLF_SSL_SUCCESS); /* pkey not set yet, expecting to fail */ - AssertIntEQ(SSL_use_PrivateKey(ssl, pkey), SSL_FAILURE); + AssertIntEQ(SSL_use_PrivateKey(ssl, pkey), WOLF_SSL_FAILURE); /* set PKEY and test again */ AssertNotNull(wolfSSL_d2i_PrivateKey(EVP_PKEY_RSA, &pkey, &server_key, (long)sizeof_server_key_der_2048)); - AssertIntEQ(SSL_use_PrivateKey(ssl, pkey), SSL_SUCCESS); + AssertIntEQ(SSL_use_PrivateKey(ssl, pkey), WOLF_SSL_SUCCESS); } #endif @@ -9567,7 +9567,7 @@ static void test_wolfSSL_PEM_PrivateKey(void) AssertNotNull(wolfSSL_d2i_PrivateKey(EVP_PKEY_RSA, &pkey, &server_key, (long)sizeof_server_key_der_2048)); AssertIntEQ(PEM_write_bio_PrivateKey(bio, pkey, NULL, NULL, 0, NULL, NULL), - SSL_SUCCESS); + WOLF_SSL_SUCCESS); BIO_free(bio); EVP_PKEY_free(pkey); @@ -9595,8 +9595,8 @@ static void test_wolfSSL_tmp_dh(void) printf(testingFmt, "wolfSSL_tmp_dh()"); AssertNotNull(ctx = SSL_CTX_new(wolfSSLv23_server_method())); - AssertTrue(SSL_CTX_use_certificate_file(ctx, svrCertFile, SSL_FILETYPE_PEM)); - AssertTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, SSL_FILETYPE_PEM)); + AssertTrue(SSL_CTX_use_certificate_file(ctx, svrCertFile, WOLF_SSL_FILETYPE_PEM)); + AssertTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, WOLF_SSL_FILETYPE_PEM)); AssertNotNull(ssl = SSL_new(ctx)); f = fopen(file, "rb"); @@ -9613,8 +9613,8 @@ static void test_wolfSSL_tmp_dh(void) dh = wolfSSL_DSA_dup_DH(dsa); AssertNotNull(dh); - AssertIntEQ((int)SSL_CTX_set_tmp_dh(ctx, dh), SSL_SUCCESS); - AssertIntEQ((int)SSL_set_tmp_dh(ssl, dh), SSL_SUCCESS); + AssertIntEQ((int)SSL_CTX_set_tmp_dh(ctx, dh), WOLF_SSL_SUCCESS); + AssertIntEQ((int)SSL_set_tmp_dh(ssl, dh), WOLF_SSL_SUCCESS); BIO_free(bio); DSA_free(dsa); @@ -9641,7 +9641,7 @@ static void test_wolfSSL_ctrl(void) AssertNotNull(bio); AssertNotNull(BIO_s_socket()); - AssertIntEQ((int)wolfSSL_BIO_get_mem_ptr(bio, &ptr), SSL_SUCCESS); + AssertIntEQ((int)wolfSSL_BIO_get_mem_ptr(bio, &ptr), WOLF_SSL_SUCCESS); /* needs tested after stubs filled out @TODO SSL_ctrl @@ -9768,13 +9768,13 @@ static void test_wolfSSL_CTX_add_extra_chain_cert(void) AssertNotNull(ctx = SSL_CTX_new(wolfSSLv23_server_method())); - x509 = wolfSSL_X509_load_certificate_file(caFile, SSL_FILETYPE_PEM); + x509 = wolfSSL_X509_load_certificate_file(caFile, WOLF_SSL_FILETYPE_PEM); AssertNotNull(x509); - AssertIntEQ((int)SSL_CTX_add_extra_chain_cert(ctx, x509), SSL_SUCCESS); + AssertIntEQ((int)SSL_CTX_add_extra_chain_cert(ctx, x509), WOLF_SSL_SUCCESS); - x509 = wolfSSL_X509_load_certificate_file(clientFile, SSL_FILETYPE_PEM); + x509 = wolfSSL_X509_load_certificate_file(clientFile, WOLF_SSL_FILETYPE_PEM); AssertNotNull(x509); - AssertIntEQ((int)SSL_CTX_add_extra_chain_cert(ctx, x509), SSL_SUCCESS); + AssertIntEQ((int)SSL_CTX_add_extra_chain_cert(ctx, x509), WOLF_SSL_SUCCESS); AssertNull(SSL_CTX_get_default_passwd_cb(ctx)); AssertNull(SSL_CTX_get_default_passwd_cb_userdata(ctx)); @@ -9864,11 +9864,11 @@ static void test_wolfSSL_X509_STORE_set_flags(void) printf(testingFmt, "wolfSSL_ERR_peek_last_error_line()"); AssertNotNull((store = wolfSSL_X509_STORE_new())); AssertNotNull((x509 = - wolfSSL_X509_load_certificate_file(svrCertFile, SSL_FILETYPE_PEM))); - AssertIntEQ(X509_STORE_add_cert(store, x509), SSL_SUCCESS); + wolfSSL_X509_load_certificate_file(svrCertFile, WOLF_SSL_FILETYPE_PEM))); + AssertIntEQ(X509_STORE_add_cert(store, x509), WOLF_SSL_SUCCESS); #ifdef HAVE_CRL - AssertIntEQ(X509_STORE_set_flags(store, WOLFSSL_CRL_CHECKALL), SSL_SUCCESS); + AssertIntEQ(X509_STORE_set_flags(store, WOLFSSL_CRL_CHECKALL), WOLF_SSL_SUCCESS); #else AssertIntEQ(X509_STORE_set_flags(store, WOLFSSL_CRL_CHECKALL), NOT_COMPILED_IN); @@ -9899,13 +9899,13 @@ static void test_wolfSSL_X509_LOOKUP_load_file(void) X509_FILETYPE_PEM), 1); AssertIntEQ(wolfSSL_CertManagerVerify(store->cm, cliCertFile, - SSL_FILETYPE_PEM), 1); + WOLF_SSL_FILETYPE_PEM), 1); AssertIntEQ(wolfSSL_CertManagerVerify(store->cm, svrCertFile, - SSL_FILETYPE_PEM), ASN_NO_SIGNER_E); + WOLF_SSL_FILETYPE_PEM), ASN_NO_SIGNER_E); AssertIntEQ(wolfSSL_X509_LOOKUP_load_file(lookup, "certs/ca-cert.pem", X509_FILETYPE_PEM), 1); AssertIntEQ(wolfSSL_CertManagerVerify(store->cm, svrCertFile, - SSL_FILETYPE_PEM), 1); + WOLF_SSL_FILETYPE_PEM), 1); wolfSSL_X509_STORE_free(store); @@ -10023,12 +10023,12 @@ static void test_wolfSSL_BN(void) AssertNotNull(BN_bin2bn(value, sizeof(value), c)); /* a^b mod c = */ - AssertIntEQ(BN_mod_exp(d, NULL, b, c, NULL), SSL_FAILURE); - AssertIntEQ(BN_mod_exp(d, a, b, c, NULL), SSL_SUCCESS); + AssertIntEQ(BN_mod_exp(d, NULL, b, c, NULL), WOLF_SSL_FAILURE); + AssertIntEQ(BN_mod_exp(d, a, b, c, NULL), WOLF_SSL_SUCCESS); /* check result 3^2 mod 5 */ value[0] = 0; - AssertIntEQ(BN_bn2bin(d, value), SSL_SUCCESS); + AssertIntEQ(BN_bn2bin(d, value), WOLF_SSL_SUCCESS); AssertIntEQ((int)(value[0] & 0x04), 4); BN_free(a); @@ -10074,15 +10074,15 @@ static void test_wolfSSL_set_options(void) printf(testingFmt, "wolfSSL_set_options()"); AssertNotNull(ctx = SSL_CTX_new(wolfSSLv23_server_method())); - AssertTrue(SSL_CTX_use_certificate_file(ctx, svrCertFile, SSL_FILETYPE_PEM)); - AssertTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, SSL_FILETYPE_PEM)); + AssertTrue(SSL_CTX_use_certificate_file(ctx, svrCertFile, WOLF_SSL_FILETYPE_PEM)); + AssertTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, WOLF_SSL_FILETYPE_PEM)); AssertNotNull(ssl = SSL_new(ctx)); AssertTrue(SSL_set_options(ssl, SSL_OP_NO_TLSv1) == SSL_OP_NO_TLSv1); AssertTrue(SSL_get_options(ssl) == SSL_OP_NO_TLSv1); AssertIntGT((int)SSL_set_options(ssl, (SSL_OP_COOKIE_EXCHANGE | - SSL_OP_NO_SSLv2)), 0); + WOLF_SSL_OP_NO_SSLv2)), 0); AssertTrue((SSL_set_options(ssl, SSL_OP_COOKIE_EXCHANGE) & SSL_OP_COOKIE_EXCHANGE) == SSL_OP_COOKIE_EXCHANGE); AssertTrue((SSL_set_options(ssl, SSL_OP_NO_TLSv1_2) & @@ -10153,16 +10153,16 @@ static void test_wolfSSL_BIO(void) AssertIntEQ(BIO_read(bio1, buffer, 2), WOLFSSL_BIO_UNSET); AssertIntEQ(BIO_write(bio1, buffer, 2), WOLFSSL_BIO_UNSET); - AssertIntEQ(BIO_set_write_buf_size(bio1, 20), SSL_SUCCESS); - AssertIntEQ(BIO_set_write_buf_size(bio2, 8), SSL_SUCCESS); - AssertIntEQ(BIO_make_bio_pair(bio1, bio2), SSL_SUCCESS); + AssertIntEQ(BIO_set_write_buf_size(bio1, 20), WOLF_SSL_SUCCESS); + AssertIntEQ(BIO_set_write_buf_size(bio2, 8), WOLF_SSL_SUCCESS); + AssertIntEQ(BIO_make_bio_pair(bio1, bio2), WOLF_SSL_SUCCESS); AssertIntEQ(BIO_nwrite(bio1, &bufPt, 10), 10); XMEMCPY(bufPt, buffer, 10); AssertIntEQ(BIO_write(bio1, buffer + 10, 10), 10); /* write buffer full */ AssertIntEQ(BIO_write(bio1, buffer, 10), WOLFSSL_BIO_ERROR); - AssertIntEQ(BIO_flush(bio1), SSL_SUCCESS); + AssertIntEQ(BIO_flush(bio1), WOLF_SSL_SUCCESS); AssertIntEQ((int)BIO_ctrl_pending(bio1), 0); /* write the other direction with pair */ @@ -10187,9 +10187,9 @@ static void test_wolfSSL_BIO(void) AssertIntEQ(BIO_ctrl_reset_read_request(bio1), 1); /* new pair */ - AssertIntEQ(BIO_make_bio_pair(bio1, bio3), SSL_FAILURE); + AssertIntEQ(BIO_make_bio_pair(bio1, bio3), WOLF_SSL_FAILURE); BIO_free(bio2); /* free bio2 and automaticly remove from pair */ - AssertIntEQ(BIO_make_bio_pair(bio1, bio3), SSL_SUCCESS); + AssertIntEQ(BIO_make_bio_pair(bio1, bio3), WOLF_SSL_SUCCESS); AssertIntEQ((int)BIO_ctrl_pending(bio3), 0); AssertIntEQ(BIO_nread(bio3, &bufPt, 10), WOLFSSL_BIO_ERROR); @@ -10220,7 +10220,7 @@ static void test_wolfSSL_BIO(void) AssertIntEQ(bufPt[i], buffer[4 + i]); } - AssertIntEQ(BIO_nread(bio3, NULL, 0), SSL_FAILURE); + AssertIntEQ(BIO_nread(bio3, NULL, 0), WOLF_SSL_FAILURE); AssertIntEQ(BIO_nread0(bio3, &bufPt), 4); for (i = 0; i < 4; i++) { AssertIntEQ(bufPt[i], 0); @@ -10278,15 +10278,15 @@ static void test_wolfSSL_BIO(void) AssertIntEQ((int)BIO_set_mem_eof_return(NULL, -1), 0); f1 = XFOPEN(svrCertFile, "rwb"); - AssertIntEQ((int)BIO_set_fp(f_bio1, f1, BIO_CLOSE), SSL_SUCCESS); + AssertIntEQ((int)BIO_set_fp(f_bio1, f1, BIO_CLOSE), WOLF_SSL_SUCCESS); AssertIntEQ(BIO_write_filename(f_bio2, testFile), - SSL_SUCCESS); + WOLF_SSL_SUCCESS); AssertIntEQ(BIO_read(f_bio1, cert, sizeof(cert)), sizeof(cert)); AssertIntEQ(BIO_write(f_bio2, msg, sizeof(msg)), sizeof(msg)); AssertIntEQ(BIO_write(f_bio2, cert, sizeof(cert)), sizeof(cert)); - AssertIntEQ((int)BIO_get_fp(f_bio2, &f2), SSL_SUCCESS); + AssertIntEQ((int)BIO_get_fp(f_bio2, &f2), WOLF_SSL_SUCCESS); AssertIntEQ(BIO_reset(f_bio2), 0); AssertIntEQ(BIO_seek(f_bio2, 4), 0); @@ -10565,7 +10565,7 @@ static void test_wc_ecc_get_curve_id_from_params(void) #ifndef NO_FILESYSTEM ret = wolfSSL_CertManagerLoadCA(cm, ca, 0); - if (ret != SSL_SUCCESS) { + if (ret != WOLF_SSL_SUCCESS) { printf("wolfSSL_CertManagerLoadCA failed\n"); wolfSSL_CertManagerFree(cm); return ret; @@ -10574,7 +10574,7 @@ static void test_wc_ecc_get_curve_id_from_params(void) (void)ca; #endif - ret = wolfSSL_CertManagerVerifyBuffer(cm, cert_buf, cert_sz, SSL_FILETYPE_ASN1); + ret = wolfSSL_CertManagerVerifyBuffer(cm, cert_buf, cert_sz, WOLF_SSL_FILETYPE_ASN1); /* Let AssertIntEQ handle return code */ wolfSSL_CertManagerFree(cm); @@ -10637,7 +10637,7 @@ static void test_wc_ecc_get_curve_id_from_params(void) #ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_SEND_HRR_COOKIE -static byte fixedKey[SHA384_DIGEST_SIZE] = { 0, }; +static byte fixedKey[WC_SHA384_DIGEST_SIZE] = { 0, }; #endif #ifdef WOLFSSL_EARLY_DATA static const char earlyData[] = "Early Data"; @@ -10668,7 +10668,7 @@ static int test_tls13_apis(void) serverTls12Ctx = wolfSSL_CTX_new(wolfTLSv1_2_server_method()); #ifndef NO_CERTS wolfSSL_CTX_use_certificate_chain_file(serverTls12Ctx, ourCert); - wolfSSL_CTX_use_PrivateKey_file(serverTls12Ctx, ourKey, SSL_FILETYPE_PEM); + wolfSSL_CTX_use_PrivateKey_file(serverTls12Ctx, ourKey, WOLF_SSL_FILETYPE_PEM); #endif serverTls12Ssl = wolfSSL_new(serverTls12Ctx); @@ -10677,7 +10677,7 @@ static int test_tls13_apis(void) serverCtx = wolfSSL_CTX_new(wolfTLSv1_3_server_method()); #ifndef NO_CERTS wolfSSL_CTX_use_certificate_chain_file(serverCtx, ourCert); - wolfSSL_CTX_use_PrivateKey_file(serverCtx, ourKey, SSL_FILETYPE_PEM); + wolfSSL_CTX_use_PrivateKey_file(serverCtx, ourKey, WOLF_SSL_FILETYPE_PEM); #endif serverSsl = wolfSSL_new(serverCtx); @@ -10686,23 +10686,23 @@ static int test_tls13_apis(void) AssertIntEQ(wolfSSL_send_hrr_cookie(clientSsl, NULL, 0), SIDE_ERROR); AssertIntEQ(wolfSSL_send_hrr_cookie(serverTls12Ssl, NULL, 0), BAD_FUNC_ARG); - AssertIntEQ(wolfSSL_send_hrr_cookie(serverSsl, NULL, 0), SSL_SUCCESS); + AssertIntEQ(wolfSSL_send_hrr_cookie(serverSsl, NULL, 0), WOLF_SSL_SUCCESS); AssertIntEQ(wolfSSL_send_hrr_cookie(serverSsl, fixedKey, sizeof(fixedKey)), - SSL_SUCCESS); + WOLF_SSL_SUCCESS); #endif AssertIntEQ(wolfSSL_UseKeyShare(NULL, WOLFSSL_ECC_SECP256R1), BAD_FUNC_ARG); AssertIntEQ(wolfSSL_UseKeyShare(serverSsl, WOLFSSL_ECC_SECP256R1), SIDE_ERROR); AssertIntEQ(wolfSSL_UseKeyShare(clientTls12Ssl, WOLFSSL_ECC_SECP256R1), - SSL_SUCCESS); + WOLF_SSL_SUCCESS); AssertIntEQ(wolfSSL_UseKeyShare(clientSsl, WOLFSSL_ECC_SECP256R1), - SSL_SUCCESS); + WOLF_SSL_SUCCESS); AssertIntEQ(wolfSSL_NoKeyShares(NULL), BAD_FUNC_ARG); AssertIntEQ(wolfSSL_NoKeyShares(serverSsl), SIDE_ERROR); - AssertIntEQ(wolfSSL_NoKeyShares(clientTls12Ssl), SSL_SUCCESS); - AssertIntEQ(wolfSSL_NoKeyShares(clientSsl), SSL_SUCCESS); + AssertIntEQ(wolfSSL_NoKeyShares(clientTls12Ssl), WOLF_SSL_SUCCESS); + AssertIntEQ(wolfSSL_NoKeyShares(clientSsl), WOLF_SSL_SUCCESS); AssertIntEQ(wolfSSL_CTX_no_ticket_TLSv13(NULL), BAD_FUNC_ARG); AssertIntEQ(wolfSSL_CTX_no_ticket_TLSv13(clientCtx), SIDE_ERROR); @@ -10778,7 +10778,7 @@ static int test_tls13_apis(void) BAD_FUNC_ARG); AssertIntEQ(wolfSSL_write_early_data(clientSsl, earlyData, sizeof(earlyData), &outSz), - SSL_FATAL_ERROR); + WOLF_SSL_FATAL_ERROR); AssertIntEQ(wolfSSL_read_early_data(NULL, earlyDataBuffer, sizeof(earlyDataBuffer), &outSz), @@ -10799,7 +10799,7 @@ static int test_tls13_apis(void) BAD_FUNC_ARG); AssertIntEQ(wolfSSL_read_early_data(serverSsl, earlyDataBuffer, sizeof(earlyDataBuffer), &outSz), - SSL_FATAL_ERROR); + WOLF_SSL_FATAL_ERROR); #endif wolfSSL_free(serverSsl); @@ -10849,14 +10849,14 @@ static int test_wc_RNG_GenerateBlock() void ApiTest(void) { printf(" Begin API Tests\n"); - AssertIntEQ(test_wolfSSL_Init(), SSL_SUCCESS); + AssertIntEQ(test_wolfSSL_Init(), WOLF_SSL_SUCCESS); /* wolfcrypt initialization tests */ test_wolfSSL_Method_Allocators(); #ifndef NO_WOLFSSL_SERVER test_wolfSSL_CTX_new(wolfSSLv23_server_method()); #endif test_wolfSSL_CTX_use_certificate_file(); - AssertIntEQ(test_wolfSSL_CTX_use_certificate_buffer(), SSL_SUCCESS); + AssertIntEQ(test_wolfSSL_CTX_use_certificate_buffer(), WOLF_SSL_SUCCESS); test_wolfSSL_CTX_use_PrivateKey_file(); test_wolfSSL_CTX_load_verify_locations(); test_wolfSSL_CTX_trust_peer_cert(); @@ -10868,8 +10868,8 @@ void ApiTest(void) test_wolfSSL_SetTmpDH_buffer(); test_wolfSSL_read_write(); test_wolfSSL_dtls_export(); - AssertIntEQ(test_wolfSSL_SetMinVersion(), SSL_SUCCESS); - AssertIntEQ(test_wolfSSL_CTX_SetMinVersion(), SSL_SUCCESS); + AssertIntEQ(test_wolfSSL_SetMinVersion(), WOLF_SSL_SUCCESS); + AssertIntEQ(test_wolfSSL_CTX_SetMinVersion(), WOLF_SSL_SUCCESS); /* TLS extensions tests */ test_wolfSSL_UseSNI(); @@ -10884,8 +10884,8 @@ void ApiTest(void) test_wolfSSL_PKCS12(); /*OCSP Stapling. */ - AssertIntEQ(test_wolfSSL_UseOCSPStapling(), SSL_SUCCESS); - AssertIntEQ(test_wolfSSL_UseOCSPStaplingV2(), SSL_SUCCESS); + AssertIntEQ(test_wolfSSL_UseOCSPStapling(), WOLF_SSL_SUCCESS); + AssertIntEQ(test_wolfSSL_UseOCSPStaplingV2(), WOLF_SSL_SUCCESS); /* Multicast */ test_wolfSSL_mcast(); @@ -10910,7 +10910,7 @@ void ApiTest(void) test_wolfSSL_PEM_read_bio(); test_wolfSSL_BIO(); test_wolfSSL_DES_ecb_encrypt(); - AssertIntEQ(test_wolfSSL_Cleanup(), SSL_SUCCESS); + AssertIntEQ(test_wolfSSL_Cleanup(), WOLF_SSL_SUCCESS); /* wolfCrypt ASN tests */ test_wc_GetPkcs8TraditionalOffset(); diff --git a/tests/hash.c b/tests/hash.c index 5dd0017be..362bec802 100644 --- a/tests/hash.c +++ b/tests/hash.c @@ -254,9 +254,9 @@ int md4_test(void) int md5_test(void) { - Md5 md5; int ret; - byte hash[MD5_DIGEST_SIZE]; + wc_Md5 md5; + byte hash[WC_MD5_DIGEST_SIZE]; testVector a, b, c, d, e; testVector test_md5[5]; @@ -317,7 +317,7 @@ int md5_test(void) return ret; } - if (XMEMCMP(hash, test_md5[i].output, MD5_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_md5[i].output, WC_MD5_DIGEST_SIZE) != 0) return -5 - i; } @@ -329,8 +329,8 @@ int md5_test(void) #ifndef NO_SHA int sha_test(void) { - Sha sha; - byte hash[SHA_DIGEST_SIZE]; + wc_Sha sha; + byte hash[WC_SHA_DIGEST_SIZE]; testVector a, b, c, d; testVector test_sha[4]; @@ -377,7 +377,7 @@ int sha_test(void) wc_ShaUpdate(&sha, (byte*)test_sha[i].input, (word32)test_sha[i].inLen); wc_ShaFinal(&sha, hash); - if (XMEMCMP(hash, test_sha[i].output, SHA_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_sha[i].output, WC_SHA_DIGEST_SIZE) != 0) return -10 - i; } @@ -388,8 +388,8 @@ int sha_test(void) #ifdef WOLFSSL_SHA224 int sha224_test(void) { - Sha224 sha; - byte hash[SHA224_DIGEST_SIZE]; + wc_Sha224 sha; + byte hash[WC_SHA224_DIGEST_SIZE]; testVector a, b; testVector test_sha[2]; @@ -400,13 +400,13 @@ int sha224_test(void) a.output = "\x23\x09\x7d\x22\x34\x05\xd8\x22\x86\x42\xa4\x77\xbd\xa2\x55" "\xb3\x2a\xad\xbc\xe4\xbd\xa0\xb3\xf7\xe3\x6c\x9d\xa7"; a.inLen = XSTRLEN(a.input); - a.outLen = SHA224_DIGEST_SIZE; + a.outLen = WC_SHA224_DIGEST_SIZE; b.input = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"; b.output = "\x75\x38\x8b\x16\x51\x27\x76\xcc\x5d\xba\x5d\xa1\xfd\x89\x01" "\x50\xb0\xc6\x45\x5c\xb4\xf5\x8b\x19\x52\x52\x25\x25"; b.inLen = XSTRLEN(b.input); - b.outLen = SHA224_DIGEST_SIZE; + b.outLen = WC_SHA224_DIGEST_SIZE; test_sha[0] = a; test_sha[1] = b; @@ -423,7 +423,7 @@ int sha224_test(void) if (ret != 0) return ret; - if (XMEMCMP(hash, test_sha[i].output, SHA224_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_sha[i].output, WC_SHA224_DIGEST_SIZE) != 0) return -10 - i; } @@ -434,8 +434,8 @@ int sha224_test(void) #ifndef NO_SHA256 int sha256_test(void) { - Sha256 sha; - byte hash[SHA256_DIGEST_SIZE]; + wc_Sha256 sha; + byte hash[WC_SHA256_DIGEST_SIZE]; testVector a, b; testVector test_sha[2]; @@ -472,7 +472,7 @@ int sha256_test(void) if (ret != 0) return ret; - if (XMEMCMP(hash, test_sha[i].output, SHA256_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_sha[i].output, WC_SHA256_DIGEST_SIZE) != 0) return -10 - i; } @@ -483,8 +483,8 @@ int sha256_test(void) #ifdef WOLFSSL_SHA512 int sha512_test(void) { - Sha512 sha; - byte hash[SHA512_DIGEST_SIZE]; + wc_Sha512 sha; + byte hash[WC_SHA512_DIGEST_SIZE]; testVector a, b; testVector test_sha[2]; @@ -526,7 +526,7 @@ int sha512_test(void) if (ret != 0) return ret; - if (XMEMCMP(hash, test_sha[i].output, SHA512_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_sha[i].output, WC_SHA512_DIGEST_SIZE) != 0) return -10 - i; } @@ -537,8 +537,8 @@ int sha512_test(void) #ifdef WOLFSSL_SHA384 int sha384_test() { - Sha384 sha; - byte hash[SHA384_DIGEST_SIZE]; + wc_Sha384 sha; + byte hash[WC_SHA384_DIGEST_SIZE]; testVector a, b; testVector test_sha[2]; @@ -578,7 +578,7 @@ int sha384_test() if (ret != 0) return ret; - if (XMEMCMP(hash, test_sha[i].output, SHA384_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_sha[i].output, WC_SHA384_DIGEST_SIZE) != 0) return -10 - i; } @@ -656,7 +656,7 @@ int ripemd_test(void) int hmac_md5_test(void) { Hmac hmac; - byte hash[MD5_DIGEST_SIZE]; + byte hash[WC_MD5_DIGEST_SIZE]; const char* keys[]= { @@ -705,7 +705,7 @@ int hmac_md5_test(void) if (i == 1) continue; /* fips not allowed */ #endif - ret = wc_HmacSetKey(&hmac, MD5, (byte*)keys[i], (word32)XSTRLEN(keys[i])); + ret = wc_HmacSetKey(&hmac, WC_MD5, (byte*)keys[i], (word32)XSTRLEN(keys[i])); if (ret != 0) return -4014; ret = wc_HmacUpdate(&hmac, (byte*)test_hmac[i].input, @@ -716,7 +716,7 @@ int hmac_md5_test(void) if (ret != 0) return -4016; - if (XMEMCMP(hash, test_hmac[i].output, MD5_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_hmac[i].output, WC_MD5_DIGEST_SIZE) != 0) return -20 - i; } @@ -730,7 +730,7 @@ int hmac_md5_test(void) int hmac_sha_test(void) { Hmac hmac; - byte hash[SHA_DIGEST_SIZE]; + byte hash[WC_SHA_DIGEST_SIZE]; const char* keys[]= { @@ -781,7 +781,7 @@ int hmac_sha_test(void) if (i == 1) continue; /* fips not allowed */ #endif - ret = wc_HmacSetKey(&hmac, SHA, (byte*)keys[i], (word32)XSTRLEN(keys[i])); + ret = wc_HmacSetKey(&hmac, WC_SHA, (byte*)keys[i], (word32)XSTRLEN(keys[i])); if (ret != 0) return -4017; ret = wc_HmacUpdate(&hmac, (byte*)test_hmac[i].input, @@ -792,7 +792,7 @@ int hmac_sha_test(void) if (ret != 0) return -4019; - if (XMEMCMP(hash, test_hmac[i].output, SHA_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_hmac[i].output, WC_SHA_DIGEST_SIZE) != 0) return -20 - i; } @@ -806,7 +806,7 @@ int hmac_sha_test(void) int hmac_sha224_test(void) { Hmac hmac; - byte hash[SHA224_DIGEST_SIZE]; + byte hash[WC_SHA224_DIGEST_SIZE]; const char* keys[]= { @@ -827,13 +827,13 @@ int hmac_sha224_test(void) a.output = "\x89\x6f\xb1\x12\x8a\xbb\xdf\x19\x68\x32\x10\x7c\xd4\x9d\xf3" "\x3f\x47\xb4\xb1\x16\x99\x12\xba\x4f\x53\x68\x4b\x22"; a.inLen = XSTRLEN(a.input); - a.outLen = SHA224_DIGEST_SIZE; + a.outLen = WC_SHA224_DIGEST_SIZE; b.input = "what do ya want for nothing?"; b.output = "\xa3\x0e\x01\x09\x8b\xc6\xdb\xbf\x45\x69\x0f\x3a\x7e\x9e\x6d" "\x0f\x8b\xbe\xa2\xa3\x9e\x61\x48\x00\x8f\xd0\x5e\x44"; b.inLen = XSTRLEN(b.input); - b.outLen = SHA224_DIGEST_SIZE; + b.outLen = WC_SHA224_DIGEST_SIZE; c.input = "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" @@ -842,7 +842,7 @@ int hmac_sha224_test(void) c.output = "\x7f\xb3\xcb\x35\x88\xc6\xc1\xf6\xff\xa9\x69\x4d\x7d\x6a\xd2" "\x64\x93\x65\xb0\xc1\xf6\x5d\x69\xd1\xec\x83\x33\xea"; c.inLen = XSTRLEN(c.input); - c.outLen = SHA224_DIGEST_SIZE; + c.outLen = WC_SHA224_DIGEST_SIZE; test_hmac[0] = a; test_hmac[1] = b; @@ -857,7 +857,7 @@ int hmac_sha224_test(void) if (i == 1) continue; /* cavium can't handle short keys, fips not allowed */ #endif - ret = wc_HmacSetKey(&hmac, SHA224, (byte*)keys[i],(word32)XSTRLEN(keys[i])); + ret = wc_HmacSetKey(&hmac, WC_SHA224, (byte*)keys[i],(word32)XSTRLEN(keys[i])); if (ret != 0) return -4021; ret = wc_HmacUpdate(&hmac, (byte*)test_hmac[i].input, @@ -868,7 +868,7 @@ int hmac_sha224_test(void) if (ret != 0) return -4023; - if (XMEMCMP(hash, test_hmac[i].output, SHA224_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_hmac[i].output, WC_SHA224_DIGEST_SIZE) != 0) return -20 - i; } @@ -883,7 +883,7 @@ int hmac_sha224_test(void) int hmac_sha256_test(void) { Hmac hmac; - byte hash[SHA256_DIGEST_SIZE]; + byte hash[WC_SHA256_DIGEST_SIZE]; const char* keys[]= { @@ -937,7 +937,8 @@ int hmac_sha256_test(void) if (i == 1) continue; /* fips not allowed */ #endif - ret = wc_HmacSetKey(&hmac,SHA256, (byte*)keys[i], (word32)XSTRLEN(keys[i])); + ret = wc_HmacSetKey(&hmac, WC_SHA256, (byte*)keys[i], + (word32)XSTRLEN(keys[i])); if (ret != 0) return -4020; ret = wc_HmacUpdate(&hmac, (byte*)test_hmac[i].input, @@ -948,7 +949,7 @@ int hmac_sha256_test(void) if (ret != 0) return -4022; - if (XMEMCMP(hash, test_hmac[i].output, SHA256_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_hmac[i].output, WC_SHA256_DIGEST_SIZE) != 0) return -20 - i; } @@ -963,7 +964,7 @@ int hmac_sha256_test(void) int hmac_sha384_test(void) { Hmac hmac; - byte hash[SHA384_DIGEST_SIZE]; + byte hash[WC_SHA384_DIGEST_SIZE]; const char* keys[]= { @@ -1020,7 +1021,8 @@ int hmac_sha384_test(void) if (i == 1) continue; /* fips not allowed */ #endif - ret = wc_HmacSetKey(&hmac,SHA384, (byte*)keys[i], (word32)XSTRLEN(keys[i])); + ret = wc_HmacSetKey(&hmac, WC_SHA384, (byte*)keys[i], + (word32)XSTRLEN(keys[i])); if (ret != 0) return -4023; ret = wc_HmacUpdate(&hmac, (byte*)test_hmac[i].input, @@ -1031,7 +1033,7 @@ int hmac_sha384_test(void) if (ret != 0) return -4025; - if (XMEMCMP(hash, test_hmac[i].output, SHA384_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_hmac[i].output, WC_SHA384_DIGEST_SIZE) != 0) return -20 - i; } diff --git a/tests/srp.c b/tests/srp.c index 0ca2a2b70..31cdcb655 100644 --- a/tests/srp.c +++ b/tests/srp.c @@ -430,20 +430,20 @@ static void test_SrpGetProofAndVerify(void) static int sha512_key_gen(Srp* srp, byte* secret, word32 size) { - Sha512 hash; + wc_Sha512 hash; int r; - srp->key = (byte*)XMALLOC(SHA512_DIGEST_SIZE, NULL, DYNAMIC_TYPE_SRP); + srp->key = (byte*)XMALLOC(WC_SHA512_DIGEST_SIZE, NULL, DYNAMIC_TYPE_SRP); if (srp->key == NULL) return MEMORY_E; - srp->keySz = SHA512_DIGEST_SIZE; + srp->keySz = WC_SHA512_DIGEST_SIZE; r = wc_InitSha512(&hash); if (!r) r = wc_Sha512Update(&hash, secret, size); if (!r) r = wc_Sha512Final(&hash, srp->key); - XMEMSET(&hash, 0, sizeof(Sha512)); + XMEMSET(&hash, 0, sizeof(wc_Sha512)); return r; } diff --git a/tests/suites.c b/tests/suites.c index dbff4c999..5582c654d 100644 --- a/tests/suites.c +++ b/tests/suites.c @@ -143,13 +143,13 @@ static int IsValidCipherSuite(const char* line, char* suite) #ifdef HAVE_QSH if (XSTRNCMP(suite, "QSH", 3) == 0) { if (wolfSSL_CTX_set_cipher_list(cipherSuiteCtx, suite + 4) - != SSL_SUCCESS) + != WOLF_SSL_SUCCESS) return 0; } #endif if (found) { - if (wolfSSL_CTX_set_cipher_list(cipherSuiteCtx, suite) == SSL_SUCCESS) + if (wolfSSL_CTX_set_cipher_list(cipherSuiteCtx, suite) == WOLF_SSL_SUCCESS) valid = 1; } @@ -539,7 +539,7 @@ int SuiteTest(void) #ifdef WOLFSSL_STATIC_MEMORY if (wolfSSL_CTX_load_static_memory(&cipherSuiteCtx, NULL, memory, sizeof(memory), 0, 1) - != SSL_SUCCESS) { + != WOLF_SSL_SUCCESS) { printf("unable to load static memory and create ctx"); args.return_code = EXIT_FAILURE; goto exit; diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c index 85f098a44..b014c48f0 100644 --- a/testsuite/testsuite.c +++ b/testsuite/testsuite.c @@ -28,18 +28,20 @@ #include #include -#include "wolfcrypt/test/test.h" +#include #ifndef SINGLE_THREADED +#ifdef OPENSSL_EXTRA #include +#endif #include -#include "examples/echoclient/echoclient.h" -#include "examples/echoserver/echoserver.h" -#include "examples/server/server.h" -#include "examples/client/client.h" +#include +#include +#include +#include #ifndef NO_SHA256 @@ -187,8 +189,8 @@ int testsuite_test(int argc, char** argv) /* validate output equals input */ { #ifndef NO_SHA256 - byte input[SHA256_DIGEST_SIZE]; - byte output[SHA256_DIGEST_SIZE]; + byte input[WC_SHA256_DIGEST_SIZE]; + byte output[WC_SHA256_DIGEST_SIZE]; file_test("input", input); file_test(outputName, output); @@ -362,9 +364,9 @@ void file_test(const char* file, byte* check) { FILE* f; int i = 0, j, ret; - Sha256 sha256; + wc_Sha256 sha256; byte buf[1024]; - byte shasum[SHA256_DIGEST_SIZE]; + byte shasum[WC_SHA256_DIGEST_SIZE]; ret = wc_InitSha256(&sha256); if (ret != 0) { @@ -393,7 +395,7 @@ void file_test(const char* file, byte* check) XMEMCPY(check, shasum, sizeof(shasum)); - for(j = 0; j < SHA256_DIGEST_SIZE; ++j ) + for(j = 0; j < WC_SHA256_DIGEST_SIZE; ++j ) printf( "%02x", shasum[j] ); printf(" %s\n", file); diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c index 0680c441c..19a2aa2ec 100644 --- a/wolfcrypt/benchmark/benchmark.c +++ b/wolfcrypt/benchmark/benchmark.c @@ -1758,10 +1758,10 @@ void bench_chacha20_poly1305_aead(void) #ifndef NO_MD5 void bench_md5(int doAsync) { - Md5 hash[BENCH_MAX_PENDING]; + wc_Md5 hash[BENCH_MAX_PENDING]; double start; int ret, i, count = 0, times, pending = 0; - DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, MD5_DIGEST_SIZE, HEAP_HINT); + DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_MD5_DIGEST_SIZE, HEAP_HINT); /* clear for done cleanup */ XMEMSET(hash, 0, sizeof(hash)); @@ -1827,10 +1827,10 @@ exit: #ifndef NO_SHA void bench_sha(int doAsync) { - Sha hash[BENCH_MAX_PENDING]; + wc_Sha hash[BENCH_MAX_PENDING]; double start; int ret, i, count = 0, times, pending = 0; - DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, SHA_DIGEST_SIZE, HEAP_HINT); + DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_SHA_DIGEST_SIZE, HEAP_HINT); /* clear for done cleanup */ XMEMSET(hash, 0, sizeof(hash)); @@ -1878,7 +1878,7 @@ void bench_sha(int doAsync) } while (pending > 0); } while (bench_stats_sym_check(start)); exit_sha: - bench_stats_sym_finish("SHA", doAsync, count, start, ret); + bench_stats_sym_finish("WC_SHA", doAsync, count, start, ret); exit: @@ -1894,10 +1894,10 @@ exit: #ifdef WOLFSSL_SHA224 void bench_sha224(int doAsync) { - Sha224 hash[BENCH_MAX_PENDING]; + wc_Sha224 hash[BENCH_MAX_PENDING]; double start; int ret, i, count = 0, times, pending = 0; - DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, SHA224_DIGEST_SIZE, HEAP_HINT); + DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_SHA224_DIGEST_SIZE, HEAP_HINT); /* clear for done cleanup */ XMEMSET(hash, 0, sizeof(hash)); @@ -1944,7 +1944,7 @@ void bench_sha224(int doAsync) } while (pending > 0); } while (bench_stats_sym_check(start)); exit_sha224: - bench_stats_sym_finish("SHA-224", doAsync, count, start, ret); + bench_stats_sym_finish("WC_SHA-224", doAsync, count, start, ret); exit: @@ -1959,10 +1959,10 @@ exit: #ifndef NO_SHA256 void bench_sha256(int doAsync) { - Sha256 hash[BENCH_MAX_PENDING]; + wc_Sha256 hash[BENCH_MAX_PENDING]; double start; int ret, i, count = 0, times, pending = 0; - DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, SHA256_DIGEST_SIZE, HEAP_HINT); + DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_SHA256_DIGEST_SIZE, HEAP_HINT); /* clear for done cleanup */ XMEMSET(hash, 0, sizeof(hash)); @@ -2009,7 +2009,7 @@ void bench_sha256(int doAsync) } while (pending > 0); } while (bench_stats_sym_check(start)); exit_sha256: - bench_stats_sym_finish("SHA-256", doAsync, count, start, ret); + bench_stats_sym_finish("WC_SHA-256", doAsync, count, start, ret); exit: @@ -2024,10 +2024,10 @@ exit: #ifdef WOLFSSL_SHA384 void bench_sha384(int doAsync) { - Sha384 hash[BENCH_MAX_PENDING]; + wc_Sha384 hash[BENCH_MAX_PENDING]; double start; int ret, i, count = 0, times, pending = 0; - DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, SHA384_DIGEST_SIZE, HEAP_HINT); + DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_SHA384_DIGEST_SIZE, HEAP_HINT); /* clear for done cleanup */ XMEMSET(hash, 0, sizeof(hash)); @@ -2074,7 +2074,7 @@ void bench_sha384(int doAsync) } while (pending > 0); } while (bench_stats_sym_check(start)); exit_sha384: - bench_stats_sym_finish("SHA-384", doAsync, count, start, ret); + bench_stats_sym_finish("WC_SHA-384", doAsync, count, start, ret); exit: @@ -2089,10 +2089,10 @@ exit: #ifdef WOLFSSL_SHA512 void bench_sha512(int doAsync) { - Sha512 hash[BENCH_MAX_PENDING]; + wc_Sha512 hash[BENCH_MAX_PENDING]; double start; int ret, i, count = 0, times, pending = 0; - DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, SHA512_DIGEST_SIZE, HEAP_HINT); + DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_SHA512_DIGEST_SIZE, HEAP_HINT); /* clear for done cleanup */ XMEMSET(hash, 0, sizeof(hash)); @@ -2139,7 +2139,7 @@ void bench_sha512(int doAsync) } while (pending > 0); } while (bench_stats_sym_check(start)); exit_sha512: - bench_stats_sym_finish("SHA-512", doAsync, count, start, ret); + bench_stats_sym_finish("WC_SHA-512", doAsync, count, start, ret); exit: diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index 24521897e..9cf28057a 100644 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -2264,25 +2264,25 @@ static int DecryptKey(const char* password, int passwordSz, byte* salt, switch (id) { case PBE_MD5_DES: - typeH = MD5; + typeH = WC_MD5; derivedLen = 16; /* may need iv for v1.5 */ decryptionType = DES_TYPE; break; case PBE_SHA1_DES: - typeH = SHA; + typeH = WC_SHA; derivedLen = 16; /* may need iv for v1.5 */ decryptionType = DES_TYPE; break; case PBE_SHA1_DES3: - typeH = SHA; + typeH = WC_SHA; derivedLen = 32; /* may need iv for v1.5 */ decryptionType = DES3_TYPE; break; case PBE_SHA1_RC4_128: - typeH = SHA; + typeH = WC_SHA; derivedLen = 16; decryptionType = RC4_TYPE; break; @@ -4368,27 +4368,27 @@ int wc_GetCTC_HashOID(int type) return MD2h; #endif #ifndef NO_MD5 - case MD5: + case WC_MD5: return MD5h; #endif #ifndef NO_SHA - case SHA: + case WC_SHA: return SHAh; #endif #ifdef WOLFSSL_SHA224 - case SHA224: + case WC_SHA224: return SHA224h; #endif #ifndef NO_SHA256 - case SHA256: + case WC_SHA256: return SHA256h; #endif #ifdef WOLFSSL_SHA384 - case SHA384: + case WC_SHA384: return SHA384h; #endif #ifdef WOLFSSL_SHA512 - case SHA512: + case WC_SHA512: return SHA512h; #endif default: @@ -4474,7 +4474,7 @@ static int HashForSignature(const byte* buf, word32 bufSz, word32 sigOID, case CTC_MD5wRSA: if ((ret = wc_Md5Hash(buf, bufSz, digest)) == 0) { *typeH = MD5h; - *digestSz = MD5_DIGEST_SIZE; + *digestSz = WC_MD5_DIGEST_SIZE; } break; #endif @@ -4484,7 +4484,7 @@ static int HashForSignature(const byte* buf, word32 bufSz, word32 sigOID, case CTC_SHAwECDSA: if ((ret = wc_ShaHash(buf, bufSz, digest)) == 0) { *typeH = SHAh; - *digestSz = SHA_DIGEST_SIZE; + *digestSz = WC_SHA_DIGEST_SIZE; } break; #endif @@ -4493,7 +4493,7 @@ static int HashForSignature(const byte* buf, word32 bufSz, word32 sigOID, case CTC_SHA224wECDSA: if ((ret = wc_Sha224Hash(buf, bufSz, digest)) == 0) { *typeH = SHA224h; - *digestSz = SHA224_DIGEST_SIZE; + *digestSz = WC_SHA224_DIGEST_SIZE; } break; #endif @@ -4502,7 +4502,7 @@ static int HashForSignature(const byte* buf, word32 bufSz, word32 sigOID, case CTC_SHA256wECDSA: if ((ret = wc_Sha256Hash(buf, bufSz, digest)) == 0) { *typeH = SHA256h; - *digestSz = SHA256_DIGEST_SIZE; + *digestSz = WC_SHA256_DIGEST_SIZE; } break; #endif @@ -4511,7 +4511,7 @@ static int HashForSignature(const byte* buf, word32 bufSz, word32 sigOID, case CTC_SHA384wECDSA: if ((ret = wc_Sha384Hash(buf, bufSz, digest)) == 0) { *typeH = SHA384h; - *digestSz = SHA384_DIGEST_SIZE; + *digestSz = WC_SHA384_DIGEST_SIZE; } break; #endif @@ -4520,7 +4520,7 @@ static int HashForSignature(const byte* buf, word32 bufSz, word32 sigOID, case CTC_SHA512wECDSA: if ((ret = wc_Sha512Hash(buf, bufSz, digest)) == 0) { *typeH = SHA512h; - *digestSz = SHA512_DIGEST_SIZE; + *digestSz = WC_SHA512_DIGEST_SIZE; } break; #endif @@ -9213,22 +9213,22 @@ static int SetKeyIdFromPublicKey(Cert *cert, RsaKey *rsakey, ecc_key *eckey, #ifdef NO_SHA if (kid_type == SKID_TYPE) { ret = wc_Sha256Hash(buffer, bufferSz, cert->skid); - cert->skidSz = SHA256_DIGEST_SIZE; + cert->skidSz = WC_SHA256_DIGEST_SIZE; } else if (kid_type == AKID_TYPE) { ret = wc_Sha256Hash(buffer, bufferSz, cert->akid); - cert->akidSz = SHA256_DIGEST_SIZE; + cert->akidSz = WC_SHA256_DIGEST_SIZE; } else ret = BAD_FUNC_ARG; #else /* NO_SHA */ if (kid_type == SKID_TYPE) { ret = wc_ShaHash(buffer, bufferSz, cert->skid); - cert->skidSz = SHA_DIGEST_SIZE; + cert->skidSz = WC_SHA_DIGEST_SIZE; } else if (kid_type == AKID_TYPE) { ret = wc_ShaHash(buffer, bufferSz, cert->akid); - cert->akidSz = SHA_DIGEST_SIZE; + cert->akidSz = WC_SHA_DIGEST_SIZE; } else ret = BAD_FUNC_ARG; @@ -11276,7 +11276,7 @@ int CompareOcspReqResp(OcspRequest* req, OcspResponse* resp) #endif -/* store SHA hash of NAME */ +/* store WC_SHA hash of NAME */ WOLFSSL_LOCAL int GetNameHash(const byte* source, word32* idx, byte* hash, int maxIdx) { @@ -11462,7 +11462,7 @@ int ParseCRL(DecodedCRL* dcrl, const byte* buff, word32 sz, void* cm) /* raw crl hash */ /* hash here if needed for optimized comparisons - * Sha sha; + * wc_Sha sha; * wc_InitSha(&sha); * wc_ShaUpdate(&sha, buff, sz); * wc_ShaFinal(&sha, dcrl->crlHash); */ diff --git a/wolfcrypt/src/dsa.c b/wolfcrypt/src/dsa.c index b327d331a..c6c446508 100644 --- a/wolfcrypt/src/dsa.c +++ b/wolfcrypt/src/dsa.c @@ -410,7 +410,7 @@ int wc_DsaSign(const byte* digest, byte* out, DsaKey* key, WC_RNG* rng) ret = MP_MOD_E; /* generate H from sha digest */ - if (ret == 0 && mp_read_unsigned_bin(&H, digest,SHA_DIGEST_SIZE) != MP_OKAY) + if (ret == 0 && mp_read_unsigned_bin(&H, digest,WC_SHA_DIGEST_SIZE) != MP_OKAY) ret = MP_READ_E; /* generate s, s = (kInv * (H + x*r)) % q */ @@ -483,7 +483,7 @@ int wc_DsaVerify(const byte* digest, const byte* sig, DsaKey* key, int* answer) } /* put H into u1 from sha digest */ - if (ret == 0 && mp_read_unsigned_bin(&u1,digest,SHA_DIGEST_SIZE) != MP_OKAY) + if (ret == 0 && mp_read_unsigned_bin(&u1,digest,WC_SHA_DIGEST_SIZE) != MP_OKAY) ret = MP_READ_E; /* w = s invmod q */ diff --git a/wolfcrypt/src/ecc.c b/wolfcrypt/src/ecc.c index 111b1d2bc..4495d05ed 100755 --- a/wolfcrypt/src/ecc.c +++ b/wolfcrypt/src/ecc.c @@ -7192,7 +7192,7 @@ static int ecc_get_key_sizes(ecEncCtx* ctx, int* encKeySz, int* ivSz, switch (ctx->macAlgo) { case ecHMAC_SHA256: - *digestSz = SHA256_DIGEST_SIZE; + *digestSz = WC_SHA256_DIGEST_SIZE; break; default: return BAD_FUNC_ARG; @@ -7295,7 +7295,7 @@ int wc_ecc_encrypt(ecc_key* privKey, ecc_key* pubKey, const byte* msg, if (ret == 0) { switch (ctx->kdfAlgo) { case ecHKDF_SHA256 : - ret = wc_HKDF(SHA256, sharedSecret, sharedSz, ctx->kdfSalt, + ret = wc_HKDF(WC_SHA256, sharedSecret, sharedSz, ctx->kdfSalt, ctx->kdfSaltSz, ctx->kdfInfo, ctx->kdfInfoSz, keys, keysLen); break; @@ -7339,7 +7339,7 @@ int wc_ecc_encrypt(ecc_key* privKey, ecc_key* pubKey, const byte* msg, Hmac hmac; ret = wc_HmacInit(&hmac, NULL, INVALID_DEVID); if (ret == 0) { - ret = wc_HmacSetKey(&hmac, SHA256, macKey, SHA256_DIGEST_SIZE); + ret = wc_HmacSetKey(&hmac, WC_SHA256, macKey, WC_SHA256_DIGEST_SIZE); if (ret == 0) ret = wc_HmacUpdate(&hmac, out, msgSz); if (ret == 0) @@ -7457,7 +7457,7 @@ int wc_ecc_decrypt(ecc_key* privKey, ecc_key* pubKey, const byte* msg, if (ret == 0) { switch (ctx->kdfAlgo) { case ecHKDF_SHA256 : - ret = wc_HKDF(SHA256, sharedSecret, sharedSz, ctx->kdfSalt, + ret = wc_HKDF(WC_SHA256, sharedSecret, sharedSz, ctx->kdfSalt, ctx->kdfSaltSz, ctx->kdfInfo, ctx->kdfInfoSz, keys, keysLen); break; @@ -7476,12 +7476,12 @@ int wc_ecc_decrypt(ecc_key* privKey, ecc_key* pubKey, const byte* msg, switch (ctx->macAlgo) { case ecHMAC_SHA256: { - byte verify[SHA256_DIGEST_SIZE]; + byte verify[WC_SHA256_DIGEST_SIZE]; Hmac hmac; ret = wc_HmacInit(&hmac, NULL, INVALID_DEVID); if (ret == 0) { - ret = wc_HmacSetKey(&hmac, SHA256, macKey, SHA256_DIGEST_SIZE); + ret = wc_HmacSetKey(&hmac, WC_SHA256, macKey, WC_SHA256_DIGEST_SIZE); if (ret == 0) ret = wc_HmacUpdate(&hmac, msg, msgSz-digestSz); if (ret == 0) diff --git a/wolfcrypt/src/ed25519.c b/wolfcrypt/src/ed25519.c index c0181cad3..8e2c032a5 100644 --- a/wolfcrypt/src/ed25519.c +++ b/wolfcrypt/src/ed25519.c @@ -112,10 +112,10 @@ int wc_ed25519_sign_msg(const byte* in, word32 inlen, byte* out, #else ge_p3 R; #endif - byte nonce[SHA512_DIGEST_SIZE]; - byte hram[SHA512_DIGEST_SIZE]; + byte nonce[WC_SHA512_DIGEST_SIZE]; + byte hram[WC_SHA512_DIGEST_SIZE]; byte az[ED25519_PRV_KEY_SIZE]; - Sha512 sha; + wc_Sha512 sha; int ret; /* sanity check on arguments */ @@ -214,13 +214,13 @@ int wc_ed25519_verify_msg(const byte* sig, word32 siglen, const byte* msg, word32 msglen, int* res, ed25519_key* key) { byte rcheck[ED25519_KEY_SIZE]; - byte h[SHA512_DIGEST_SIZE]; + byte h[WC_SHA512_DIGEST_SIZE]; #ifndef FREESCALE_LTC_ECC ge_p3 A; ge_p2 R; #endif int ret; - Sha512 sha; + wc_Sha512 sha; /* sanity check on arguments */ if (sig == NULL || msg == NULL || res == NULL || key == NULL) diff --git a/wolfcrypt/src/evp.c b/wolfcrypt/src/evp.c index 59c695041..d4a4bcdf2 100644 --- a/wolfcrypt/src/evp.c +++ b/wolfcrypt/src/evp.c @@ -617,32 +617,32 @@ int wolfSSL_EVP_DigestSignInit(WOLFSSL_EVP_MD_CTX *ctx, #endif if (XSTRNCMP(type, "SHA256", 6) == 0) { - hashType = SHA256; + hashType = WC_SHA256; } #ifdef WOLFSSL_SHA224 else if (XSTRNCMP(type, "SHA224", 6) == 0) { - hashType = SHA224; + hashType = WC_SHA224; } #endif #ifdef WOLFSSL_SHA384 else if (XSTRNCMP(type, "SHA384", 6) == 0) { - hashType = SHA384; + hashType = WC_SHA384; } #endif #ifdef WOLFSSL_SHA512 else if (XSTRNCMP(type, "SHA512", 6) == 0) { - hashType = SHA512; + hashType = WC_SHA512; } #endif #ifndef NO_MD5 else if (XSTRNCMP(type, "MD5", 3) == 0) { - hashType = MD5; + hashType = WC_MD5; } #endif #ifndef NO_SHA /* has to be last since would pick or 224, 256, 384, or 512 too */ else if (XSTRNCMP(type, "SHA", 3) == 0) { - hashType = SHA; + hashType = WC_SHA; } #endif /* NO_SHA */ else @@ -694,37 +694,37 @@ int wolfSSL_EVP_DigestSignFinal(WOLFSSL_EVP_MD_CTX *ctx, switch (ctx->hash.hmac.macType) { #ifndef NO_MD5 - case MD5: - hashLen = MD5_DIGEST_SIZE; + case WC_MD5: + hashLen = WC_MD5_DIGEST_SIZE; break; #endif /* !NO_MD5 */ #ifndef NO_SHA - case SHA: - hashLen = SHA_DIGEST_SIZE; + case WC_SHA: + hashLen = WC_SHA_DIGEST_SIZE; break; #endif /* !NO_SHA */ #ifdef WOLFSSL_SHA224 - case SHA224: - hashLen = SHA224_DIGEST_SIZE; + case WC_SHA224: + hashLen = WC_SHA224_DIGEST_SIZE; break; #endif /* WOLFSSL_SHA224 */ #ifndef NO_SHA256 - case SHA256: - hashLen = SHA256_DIGEST_SIZE; + case WC_SHA256: + hashLen = WC_SHA256_DIGEST_SIZE; break; #endif /* !NO_SHA256 */ #ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA384 - case SHA384: - hashLen = SHA384_DIGEST_SIZE; + case WC_SHA384: + hashLen = WC_SHA384_DIGEST_SIZE; break; #endif /* WOLFSSL_SHA384 */ - case SHA512: - hashLen = SHA512_DIGEST_SIZE; + case WC_SHA512: + hashLen = WC_SHA512_DIGEST_SIZE; break; #endif /* WOLFSSL_SHA512 */ diff --git a/wolfcrypt/src/hash.c b/wolfcrypt/src/hash.c index 58a9c2251..9a6c9f222 100644 --- a/wolfcrypt/src/hash.c +++ b/wolfcrypt/src/hash.c @@ -109,37 +109,37 @@ int wc_HashGetDigestSize(enum wc_HashType hash_type) { case WC_HASH_TYPE_MD5: #ifndef NO_MD5 - dig_size = MD5_DIGEST_SIZE; + dig_size = WC_MD5_DIGEST_SIZE; #endif break; case WC_HASH_TYPE_SHA: #ifndef NO_SHA - dig_size = SHA_DIGEST_SIZE; + dig_size = WC_SHA_DIGEST_SIZE; #endif break; case WC_HASH_TYPE_SHA224: #ifdef WOLFSSL_SHA224 - dig_size = SHA224_DIGEST_SIZE; + dig_size = WC_SHA224_DIGEST_SIZE; #endif break; case WC_HASH_TYPE_SHA256: #ifndef NO_SHA256 - dig_size = SHA256_DIGEST_SIZE; + dig_size = WC_SHA256_DIGEST_SIZE; #endif break; case WC_HASH_TYPE_SHA384: #if defined(WOLFSSL_SHA512) && defined(WOLFSSL_SHA384) - dig_size = SHA384_DIGEST_SIZE; + dig_size = WC_SHA384_DIGEST_SIZE; #endif break; case WC_HASH_TYPE_SHA512: #ifdef WOLFSSL_SHA512 - dig_size = SHA512_DIGEST_SIZE; + dig_size = WC_SHA512_DIGEST_SIZE; #endif break; case WC_HASH_TYPE_MD5_SHA: #if !defined(NO_MD5) && !defined(NO_SHA) - dig_size = MD5_DIGEST_SIZE + SHA_DIGEST_SIZE; + dig_size = WC_MD5_DIGEST_SIZE + WC_SHA_DIGEST_SIZE; #endif break; @@ -209,7 +209,7 @@ int wc_Hash(enum wc_HashType hash_type, const byte* data, #if !defined(NO_MD5) && !defined(NO_SHA) ret = wc_Md5Hash(data, data_len, hash); if (ret == 0) { - ret = wc_ShaHash(data, data_len, &hash[MD5_DIGEST_SIZE]); + ret = wc_ShaHash(data, data_len, &hash[WC_MD5_DIGEST_SIZE]); } #endif break; @@ -392,13 +392,13 @@ int wc_HashFinal(wc_HashAlg* hash, enum wc_HashType type, byte* out) { int ret; #ifdef WOLFSSL_SMALL_STACK - Md5* md5; + wc_Md5* md5; #else - Md5 md5[1]; + wc_Md5 md5[1]; #endif #ifdef WOLFSSL_SMALL_STACK - md5 = (Md5*)XMALLOC(sizeof(Md5), NULL, DYNAMIC_TYPE_TMP_BUFFER); + md5 = (wc_Md5*)XMALLOC(sizeof(wc_Md5), NULL, DYNAMIC_TYPE_TMP_BUFFER); if (md5 == NULL) return MEMORY_E; #endif @@ -424,13 +424,13 @@ int wc_HashFinal(wc_HashAlg* hash, enum wc_HashType type, byte* out) { int ret = 0; #ifdef WOLFSSL_SMALL_STACK - Sha* sha; + wc_Sha* sha; #else - Sha sha[1]; + wc_Sha sha[1]; #endif #ifdef WOLFSSL_SMALL_STACK - sha = (Sha*)XMALLOC(sizeof(Sha), NULL, DYNAMIC_TYPE_TMP_BUFFER); + sha = (wc_Sha*)XMALLOC(sizeof(wc_Sha), NULL, DYNAMIC_TYPE_TMP_BUFFER); if (sha == NULL) return MEMORY_E; #endif @@ -456,13 +456,14 @@ int wc_Sha224Hash(const byte* data, word32 len, byte* hash) { int ret = 0; #ifdef WOLFSSL_SMALL_STACK - Sha224* sha224; + wc_Sha224* sha224; #else - Sha224 sha224[1]; + wc_Sha224 sha224[1]; #endif #ifdef WOLFSSL_SMALL_STACK - sha224 = (Sha224*)XMALLOC(sizeof(Sha224), NULL, DYNAMIC_TYPE_TMP_BUFFER); + sha224 = (wc_Sha224*)XMALLOC(sizeof(wc_Sha224), NULL, + DYNAMIC_TYPE_TMP_BUFFER); if (sha224 == NULL) return MEMORY_E; #endif @@ -490,13 +491,14 @@ int wc_Sha224Hash(const byte* data, word32 len, byte* hash) { int ret = 0; #ifdef WOLFSSL_SMALL_STACK - Sha256* sha256; + wc_Sha256* sha256; #else - Sha256 sha256[1]; + wc_Sha256 sha256[1]; #endif #ifdef WOLFSSL_SMALL_STACK - sha256 = (Sha256*)XMALLOC(sizeof(Sha256), NULL, DYNAMIC_TYPE_TMP_BUFFER); + sha256 = (wc_Sha256*)XMALLOC(sizeof(wc_Sha256), NULL, + DYNAMIC_TYPE_TMP_BUFFER); if (sha256 == NULL) return MEMORY_E; #endif @@ -527,13 +529,14 @@ int wc_Sha224Hash(const byte* data, word32 len, byte* hash) { int ret = 0; #ifdef WOLFSSL_SMALL_STACK - Sha512* sha512; + wc_Sha512* sha512; #else - Sha512 sha512[1]; + wc_Sha512 sha512[1]; #endif #ifdef WOLFSSL_SMALL_STACK - sha512 = (Sha512*)XMALLOC(sizeof(Sha512), NULL, DYNAMIC_TYPE_TMP_BUFFER); + sha512 = (wc_Sha512*)XMALLOC(sizeof(wc_Sha512), NULL, + DYNAMIC_TYPE_TMP_BUFFER); if (sha512 == NULL) return MEMORY_E; #endif @@ -560,13 +563,14 @@ int wc_Sha224Hash(const byte* data, word32 len, byte* hash) { int ret = 0; #ifdef WOLFSSL_SMALL_STACK - Sha384* sha384; + wc_Sha384* sha384; #else - Sha384 sha384[1]; + wc_Sha384 sha384[1]; #endif #ifdef WOLFSSL_SMALL_STACK - sha384 = (Sha384*)XMALLOC(sizeof(Sha384), NULL, DYNAMIC_TYPE_TMP_BUFFER); + sha384 = (wc_Sha384*)XMALLOC(sizeof(wc_Sha384), NULL, + DYNAMIC_TYPE_TMP_BUFFER); if (sha384 == NULL) return MEMORY_E; #endif diff --git a/wolfcrypt/src/hmac.c b/wolfcrypt/src/hmac.c index 8985a25bd..560c33981 100755 --- a/wolfcrypt/src/hmac.c +++ b/wolfcrypt/src/hmac.c @@ -45,8 +45,9 @@ int wc_HmacSetKey(Hmac* hmac, int type, const byte* key, word32 keySz) { if (hmac == NULL || (key == NULL && keySz != 0) || - !(type == MD5 || type == SHA || type == SHA256 || type == SHA384 - || type == SHA512 || type == BLAKE2B_ID)) { + !(type == WC_MD5 || type == WC_SHA || type == WC_SHA224 || + type == WC_SHA256 || type == WC_SHA384 || type == WC_SHA512 || + type == BLAKE2B_ID)) { return BAD_FUNC_ARG; } @@ -110,45 +111,45 @@ int wc_HmacSizeByType(int type) { int ret; - if (!(type == MD5 || type == SHA || type == SHA256 || type == SHA384 - || type == SHA512 || type == BLAKE2B_ID - || type == SHA224)) { + if (!(type == WC_MD5 || type == WC_SHA || type == WC_SHA224 || + type == WC_SHA256 || type == WC_SHA384 || type == WC_SHA512 || + type == BLAKE2B_ID)) { return BAD_FUNC_ARG; } switch (type) { #ifndef NO_MD5 - case MD5: - ret = MD5_DIGEST_SIZE; + case WC_MD5: + ret = WC_MD5_DIGEST_SIZE; break; #endif /* !NO_MD5 */ #ifndef NO_SHA - case SHA: - ret = SHA_DIGEST_SIZE; + case WC_SHA: + ret = WC_SHA_DIGEST_SIZE; break; #endif /* !NO_SHA */ #ifdef WOLFSSL_SHA224 - case SHA224: - ret = SHA224_DIGEST_SIZE; + case WC_SHA224: + ret = WC_SHA224_DIGEST_SIZE; break; #endif /* WOLFSSL_SHA224 */ #ifndef NO_SHA256 - case SHA256: - ret = SHA256_DIGEST_SIZE; + case WC_SHA256: + ret = WC_SHA256_DIGEST_SIZE; break; #endif /* !NO_SHA256 */ #ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA384 - case SHA384: - ret = SHA384_DIGEST_SIZE; + case WC_SHA384: + ret = WC_SHA384_DIGEST_SIZE; break; #endif /* WOLFSSL_SHA384 */ - case SHA512: - ret = SHA512_DIGEST_SIZE; + case WC_SHA512: + ret = WC_SHA512_DIGEST_SIZE; break; #endif /* WOLFSSL_SHA512 */ @@ -172,36 +173,36 @@ static int _InitHmac(Hmac* hmac, int type, void* heap) switch (type) { #ifndef NO_MD5 - case MD5: + case WC_MD5: ret = wc_InitMd5(&hmac->hash.md5); break; #endif /* !NO_MD5 */ #ifndef NO_SHA - case SHA: + case WC_SHA: ret = wc_InitSha(&hmac->hash.sha); break; #endif /* !NO_SHA */ #ifdef WOLFSSL_SHA224 - case SHA224: + case WC_SHA224: ret = wc_InitSha224(&hmac->hash.sha224); break; #endif /* WOLFSSL_SHA224 */ #ifndef NO_SHA256 - case SHA256: + case WC_SHA256: ret = wc_InitSha256(&hmac->hash.sha256); break; #endif /* !NO_SHA256 */ #ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA384 - case SHA384: + case WC_SHA384: ret = wc_InitSha384(&hmac->hash.sha384); break; #endif /* WOLFSSL_SHA384 */ - case SHA512: + case WC_SHA512: ret = wc_InitSha512(&hmac->hash.sha512); break; #endif /* WOLFSSL_SHA512 */ @@ -237,9 +238,9 @@ int wc_HmacSetKey(Hmac* hmac, int type, const byte* key, word32 length) void* heap = NULL; if (hmac == NULL || (key == NULL && length != 0) || - !(type == MD5 || type == SHA || type == SHA256 || type == SHA384 - || type == SHA512 || type == BLAKE2B_ID - || type == SHA224)) { + !(type == WC_MD5 || type == WC_SHA || type == WC_SHA224 || + type == WC_SHA256 || type == WC_SHA384 || type == WC_SHA512 || + type == BLAKE2B_ID)) { return BAD_FUNC_ARG; } @@ -277,9 +278,9 @@ int wc_HmacSetKey(Hmac* hmac, int type, const byte* key, word32 length) switch (hmac->macType) { #ifndef NO_MD5 - case MD5: - hmac_block_size = MD5_BLOCK_SIZE; - if (length <= MD5_BLOCK_SIZE) { + case WC_MD5: + hmac_block_size = WC_MD5_BLOCK_SIZE; + if (length <= WC_MD5_BLOCK_SIZE) { if (key != NULL) { XMEMCPY(ip, key, length); } @@ -291,15 +292,15 @@ int wc_HmacSetKey(Hmac* hmac, int type, const byte* key, word32 length) ret = wc_Md5Final(&hmac->hash.md5, ip); if (ret != 0) break; - length = MD5_DIGEST_SIZE; + length = WC_MD5_DIGEST_SIZE; } break; #endif /* !NO_MD5 */ #ifndef NO_SHA - case SHA: - hmac_block_size = SHA_BLOCK_SIZE; - if (length <= SHA_BLOCK_SIZE) { + case WC_SHA: + hmac_block_size = WC_SHA_BLOCK_SIZE; + if (length <= WC_SHA_BLOCK_SIZE) { if (key != NULL) { XMEMCPY(ip, key, length); } @@ -312,16 +313,16 @@ int wc_HmacSetKey(Hmac* hmac, int type, const byte* key, word32 length) if (ret != 0) break; - length = SHA_DIGEST_SIZE; + length = WC_SHA_DIGEST_SIZE; } break; #endif /* !NO_SHA */ #ifdef WOLFSSL_SHA224 - case SHA224: + case WC_SHA224: { - hmac_block_size = SHA224_BLOCK_SIZE; - if (length <= SHA224_BLOCK_SIZE) { + hmac_block_size = WC_SHA224_BLOCK_SIZE; + if (length <= WC_SHA224_BLOCK_SIZE) { if (key != NULL) { XMEMCPY(ip, key, length); } @@ -334,16 +335,16 @@ int wc_HmacSetKey(Hmac* hmac, int type, const byte* key, word32 length) if (ret != 0) break; - length = SHA224_DIGEST_SIZE; + length = WC_SHA224_DIGEST_SIZE; } } break; #endif /* WOLFSSL_SHA224 */ #ifndef NO_SHA256 - case SHA256: - hmac_block_size = SHA256_BLOCK_SIZE; - if (length <= SHA256_BLOCK_SIZE) { + case WC_SHA256: + hmac_block_size = WC_SHA256_BLOCK_SIZE; + if (length <= WC_SHA256_BLOCK_SIZE) { if (key != NULL) { XMEMCPY(ip, key, length); } @@ -356,16 +357,16 @@ int wc_HmacSetKey(Hmac* hmac, int type, const byte* key, word32 length) if (ret != 0) break; - length = SHA256_DIGEST_SIZE; + length = WC_SHA256_DIGEST_SIZE; } break; #endif /* !NO_SHA256 */ #ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA384 - case SHA384: - hmac_block_size = SHA384_BLOCK_SIZE; - if (length <= SHA384_BLOCK_SIZE) { + case WC_SHA384: + hmac_block_size = WC_SHA384_BLOCK_SIZE; + if (length <= WC_SHA384_BLOCK_SIZE) { if (key != NULL) { XMEMCPY(ip, key, length); } @@ -378,13 +379,13 @@ int wc_HmacSetKey(Hmac* hmac, int type, const byte* key, word32 length) if (ret != 0) break; - length = SHA384_DIGEST_SIZE; + length = WC_SHA384_DIGEST_SIZE; } break; #endif /* WOLFSSL_SHA384 */ - case SHA512: - hmac_block_size = SHA512_BLOCK_SIZE; - if (length <= SHA512_BLOCK_SIZE) { + case WC_SHA512: + hmac_block_size = WC_SHA512_BLOCK_SIZE; + if (length <= WC_SHA512_BLOCK_SIZE) { if (key != NULL) { XMEMCPY(ip, key, length); } @@ -397,7 +398,7 @@ int wc_HmacSetKey(Hmac* hmac, int type, const byte* key, word32 length) if (ret != 0) break; - length = SHA512_DIGEST_SIZE; + length = WC_SHA512_DIGEST_SIZE; } break; #endif /* WOLFSSL_SHA512 */ @@ -461,43 +462,43 @@ static int HmacKeyInnerHash(Hmac* hmac) switch (hmac->macType) { #ifndef NO_MD5 - case MD5: + case WC_MD5: ret = wc_Md5Update(&hmac->hash.md5, (byte*)hmac->ipad, - MD5_BLOCK_SIZE); + WC_MD5_BLOCK_SIZE); break; #endif /* !NO_MD5 */ #ifndef NO_SHA - case SHA: + case WC_SHA: ret = wc_ShaUpdate(&hmac->hash.sha, (byte*)hmac->ipad, - SHA_BLOCK_SIZE); + WC_SHA_BLOCK_SIZE); break; #endif /* !NO_SHA */ #ifdef WOLFSSL_SHA224 - case SHA224: + case WC_SHA224: ret = wc_Sha224Update(&hmac->hash.sha224, (byte*)hmac->ipad, - SHA224_BLOCK_SIZE); + WC_SHA224_BLOCK_SIZE); break; #endif /* WOLFSSL_SHA224 */ #ifndef NO_SHA256 - case SHA256: + case WC_SHA256: ret = wc_Sha256Update(&hmac->hash.sha256, (byte*)hmac->ipad, - SHA256_BLOCK_SIZE); + WC_SHA256_BLOCK_SIZE); break; #endif /* !NO_SHA256 */ #ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA384 - case SHA384: + case WC_SHA384: ret = wc_Sha384Update(&hmac->hash.sha384, (byte*)hmac->ipad, - SHA384_BLOCK_SIZE); + WC_SHA384_BLOCK_SIZE); break; #endif /* WOLFSSL_SHA384 */ - case SHA512: + case WC_SHA512: ret = wc_Sha512Update(&hmac->hash.sha512, (byte*)hmac->ipad, - SHA512_BLOCK_SIZE); + WC_SHA512_BLOCK_SIZE); break; #endif /* WOLFSSL_SHA512 */ @@ -546,36 +547,36 @@ int wc_HmacUpdate(Hmac* hmac, const byte* msg, word32 length) switch (hmac->macType) { #ifndef NO_MD5 - case MD5: + case WC_MD5: ret = wc_Md5Update(&hmac->hash.md5, msg, length); break; #endif /* !NO_MD5 */ #ifndef NO_SHA - case SHA: + case WC_SHA: ret = wc_ShaUpdate(&hmac->hash.sha, msg, length); break; #endif /* !NO_SHA */ #ifdef WOLFSSL_SHA224 - case SHA224: + case WC_SHA224: ret = wc_Sha224Update(&hmac->hash.sha224, msg, length); break; #endif /* WOLFSSL_SHA224 */ #ifndef NO_SHA256 - case SHA256: + case WC_SHA256: ret = wc_Sha256Update(&hmac->hash.sha256, msg, length); break; #endif /* !NO_SHA256 */ #ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA384 - case SHA384: + case WC_SHA384: ret = wc_Sha384Update(&hmac->hash.sha384, msg, length); break; #endif /* WOLFSSL_SHA384 */ - case SHA512: + case WC_SHA512: ret = wc_Sha512Update(&hmac->hash.sha512, msg, length); break; #endif /* WOLFSSL_SHA512 */ @@ -625,16 +626,16 @@ int wc_HmacFinal(Hmac* hmac, byte* hash) switch (hmac->macType) { #ifndef NO_MD5 - case MD5: + case WC_MD5: ret = wc_Md5Final(&hmac->hash.md5, (byte*)hmac->innerHash); if (ret != 0) break; ret = wc_Md5Update(&hmac->hash.md5, (byte*)hmac->opad, - MD5_BLOCK_SIZE); + WC_MD5_BLOCK_SIZE); if (ret != 0) break; ret = wc_Md5Update(&hmac->hash.md5, (byte*)hmac->innerHash, - MD5_DIGEST_SIZE); + WC_MD5_DIGEST_SIZE); if (ret != 0) break; ret = wc_Md5Final(&hmac->hash.md5, hash); @@ -642,16 +643,16 @@ int wc_HmacFinal(Hmac* hmac, byte* hash) #endif /* !NO_MD5 */ #ifndef NO_SHA - case SHA: + case WC_SHA: ret = wc_ShaFinal(&hmac->hash.sha, (byte*)hmac->innerHash); if (ret != 0) break; ret = wc_ShaUpdate(&hmac->hash.sha, (byte*)hmac->opad, - SHA_BLOCK_SIZE); + WC_SHA_BLOCK_SIZE); if (ret != 0) break; ret = wc_ShaUpdate(&hmac->hash.sha, (byte*)hmac->innerHash, - SHA_DIGEST_SIZE); + WC_SHA_DIGEST_SIZE); if (ret != 0) break; ret = wc_ShaFinal(&hmac->hash.sha, hash); @@ -659,17 +660,17 @@ int wc_HmacFinal(Hmac* hmac, byte* hash) #endif /* !NO_SHA */ #ifdef WOLFSSL_SHA224 - case SHA224: + case WC_SHA224: { ret = wc_Sha224Final(&hmac->hash.sha224, (byte*)hmac->innerHash); if (ret != 0) break; ret = wc_Sha224Update(&hmac->hash.sha224, (byte*)hmac->opad, - SHA224_BLOCK_SIZE); + WC_SHA224_BLOCK_SIZE); if (ret != 0) break; ret = wc_Sha224Update(&hmac->hash.sha224, (byte*)hmac->innerHash, - SHA224_DIGEST_SIZE); + WC_SHA224_DIGEST_SIZE); if (ret != 0) break; ret = wc_Sha224Final(&hmac->hash.sha224, hash); @@ -680,16 +681,16 @@ int wc_HmacFinal(Hmac* hmac, byte* hash) #endif /* WOLFSSL_SHA224 */ #ifndef NO_SHA256 - case SHA256: + case WC_SHA256: ret = wc_Sha256Final(&hmac->hash.sha256, (byte*)hmac->innerHash); if (ret != 0) break; ret = wc_Sha256Update(&hmac->hash.sha256, (byte*)hmac->opad, - SHA256_BLOCK_SIZE); + WC_SHA256_BLOCK_SIZE); if (ret != 0) break; ret = wc_Sha256Update(&hmac->hash.sha256, (byte*)hmac->innerHash, - SHA256_DIGEST_SIZE); + WC_SHA256_DIGEST_SIZE); if (ret != 0) break; ret = wc_Sha256Final(&hmac->hash.sha256, hash); @@ -698,31 +699,31 @@ int wc_HmacFinal(Hmac* hmac, byte* hash) #ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA384 - case SHA384: + case WC_SHA384: ret = wc_Sha384Final(&hmac->hash.sha384, (byte*)hmac->innerHash); if (ret != 0) break; ret = wc_Sha384Update(&hmac->hash.sha384, (byte*)hmac->opad, - SHA384_BLOCK_SIZE); + WC_SHA384_BLOCK_SIZE); if (ret != 0) break; ret = wc_Sha384Update(&hmac->hash.sha384, (byte*)hmac->innerHash, - SHA384_DIGEST_SIZE); + WC_SHA384_DIGEST_SIZE); if (ret != 0) break; ret = wc_Sha384Final(&hmac->hash.sha384, hash); break; #endif /* WOLFSSL_SHA384 */ - case SHA512: + case WC_SHA512: ret = wc_Sha512Final(&hmac->hash.sha512, (byte*)hmac->innerHash); if (ret != 0) break; ret = wc_Sha512Update(&hmac->hash.sha512, (byte*)hmac->opad, - SHA512_BLOCK_SIZE); + WC_SHA512_BLOCK_SIZE); if (ret != 0) break; ret = wc_Sha512Update(&hmac->hash.sha512, (byte*)hmac->innerHash, - SHA512_DIGEST_SIZE); + WC_SHA512_DIGEST_SIZE); if (ret != 0) break; ret = wc_Sha512Final(&hmac->hash.sha512, hash); diff --git a/wolfcrypt/src/md5.c b/wolfcrypt/src/md5.c index 70d9da82d..b19f0bf4d 100755 --- a/wolfcrypt/src/md5.c +++ b/wolfcrypt/src/md5.c @@ -46,7 +46,7 @@ #endif -static INLINE void AddLength(Md5* md5, word32 len); +static INLINE void AddLength(wc_Md5* md5, word32 len); /* Hardware Acceleration */ #if defined(STM32_HASH) @@ -60,7 +60,7 @@ static INLINE void AddLength(Md5* md5, word32 len); /* STM32 register size, bytes */ #ifdef WOLFSSL_STM32_CUBEMX - #define MD5_REG_SIZE MD5_BLOCK_SIZE + #define MD5_REG_SIZE WC_MD5_BLOCK_SIZE #else #define MD5_REG_SIZE 4 /* STM32 struct notes: @@ -71,7 +71,7 @@ static INLINE void AddLength(Md5* md5, word32 len); #endif #define MD5_HW_TIMEOUT 0xFF - int wc_InitMd5_ex(Md5* md5, void* heap, int devId) + int wc_InitMd5_ex(wc_Md5* md5, void* heap, int devId) { if (md5 == NULL) return BAD_FUNC_ARG; @@ -112,7 +112,7 @@ static INLINE void AddLength(Md5* md5, word32 len); return 0; } - int wc_Md5Update(Md5* md5, const byte* data, word32 len) + int wc_Md5Update(wc_Md5* md5, const byte* data, word32 len) { int ret = 0; byte* local; @@ -153,7 +153,7 @@ static INLINE void AddLength(Md5* md5, word32 len); return ret; } - int wc_Md5Final(Md5* md5, byte* hash) + int wc_Md5Final(wc_Md5* md5, byte* hash) { int ret = 0; @@ -193,10 +193,10 @@ static INLINE void AddLength(Md5* md5, word32 len); md5->digest[2] = HASH->HR[2]; md5->digest[3] = HASH->HR[3]; - ByteReverseWords(md5->digest, md5->digest, MD5_DIGEST_SIZE); + ByteReverseWords(md5->digest, md5->digest, WC_MD5_DIGEST_SIZE); #endif /* WOLFSSL_STM32_CUBEMX */ - XMEMCPY(hash, md5->digest, MD5_DIGEST_SIZE); + XMEMCPY(hash, md5->digest, WC_MD5_DIGEST_SIZE); (void)wc_InitMd5(md5); /* reset state */ @@ -207,7 +207,7 @@ static INLINE void AddLength(Md5* md5, word32 len); #include "cau_api.h" #define XTRANSFORM(S,B) Transform((S), (B)) - static int Transform(Md5* md5, byte* data) + static int Transform(wc_Md5* md5, byte* data) { int ret = wolfSSL_CryptHwMutexLock(); if(ret == 0) { @@ -243,7 +243,7 @@ static INLINE void AddLength(Md5* md5, word32 len); #define MD5STEP(f, w, x, y, z, data, s) \ w = rotlFixed(w + f(x, y, z) + data, s) + x - static int Transform(Md5* md5) + static int Transform(wc_Md5* md5) { /* Copy context->state[] to working vars */ word32 a = md5->digest[0]; @@ -330,7 +330,7 @@ static INLINE void AddLength(Md5* md5, word32 len); #endif /* NEED_SOFT_MD5 */ #if !defined(HAVE_MD5_CUST_API) || defined(STM32_HASH) -static INLINE void AddLength(Md5* md5, word32 len) +static INLINE void AddLength(wc_Md5* md5, word32 len) { word32 tmp = md5->loLen; if ((md5->loLen += len) < tmp) { @@ -340,7 +340,7 @@ static INLINE void AddLength(Md5* md5, word32 len) #endif #ifndef HAVE_MD5_CUST_API -static int _InitMd5(Md5* md5) +static int _InitMd5(wc_Md5* md5) { int ret = 0; @@ -356,7 +356,7 @@ static int _InitMd5(Md5* md5) return ret; } -int wc_InitMd5_ex(Md5* md5, void* heap, int devId) +int wc_InitMd5_ex(wc_Md5* md5, void* heap, int devId) { int ret = 0; @@ -378,7 +378,7 @@ int wc_InitMd5_ex(Md5* md5, void* heap, int devId) return ret; } -int wc_Md5Update(Md5* md5, const byte* data, word32 len) +int wc_Md5Update(wc_Md5* md5, const byte* data, word32 len) { int ret = 0; byte* local; @@ -399,30 +399,30 @@ int wc_Md5Update(Md5* md5, const byte* data, word32 len) local = (byte*)md5->buffer; /* check that internal buffLen is valid */ - if (md5->buffLen >= MD5_BLOCK_SIZE) + if (md5->buffLen >= WC_MD5_BLOCK_SIZE) return BUFFER_E; while (len) { - word32 add = min(len, MD5_BLOCK_SIZE - md5->buffLen); + word32 add = min(len, WC_MD5_BLOCK_SIZE - md5->buffLen); XMEMCPY(&local[md5->buffLen], data, add); md5->buffLen += add; data += add; len -= add; - if (md5->buffLen == MD5_BLOCK_SIZE) { + if (md5->buffLen == WC_MD5_BLOCK_SIZE) { #if defined(BIG_ENDIAN_ORDER) && !defined(FREESCALE_MMCAU_SHA) - ByteReverseWords(md5->buffer, md5->buffer, MD5_BLOCK_SIZE); + ByteReverseWords(md5->buffer, md5->buffer, WC_MD5_BLOCK_SIZE); #endif XTRANSFORM(md5, local); - AddLength(md5, MD5_BLOCK_SIZE); + AddLength(md5, WC_MD5_BLOCK_SIZE); md5->buffLen = 0; } } return ret; } -int wc_Md5Final(Md5* md5, byte* hash) +int wc_Md5Final(wc_Md5* md5, byte* hash) { byte* local; @@ -433,7 +433,7 @@ int wc_Md5Final(Md5* md5, byte* hash) #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_MD5) if (md5->asyncDev.marker == WOLFSSL_ASYNC_MARKER_MD5) { #if defined(HAVE_INTEL_QA) - return IntelQaSymMd5(&md5->asyncDev, hash, NULL, MD5_DIGEST_SIZE); + return IntelQaSymMd5(&md5->asyncDev, hash, NULL, WC_MD5_DIGEST_SIZE); #endif } #endif /* WOLFSSL_ASYNC_CRYPT */ @@ -444,20 +444,20 @@ int wc_Md5Final(Md5* md5, byte* hash) local[md5->buffLen++] = 0x80; /* add 1 */ /* pad with zeros */ - if (md5->buffLen > MD5_PAD_SIZE) { - XMEMSET(&local[md5->buffLen], 0, MD5_BLOCK_SIZE - md5->buffLen); - md5->buffLen += MD5_BLOCK_SIZE - md5->buffLen; + if (md5->buffLen > WC_MD5_PAD_SIZE) { + XMEMSET(&local[md5->buffLen], 0, WC_MD5_BLOCK_SIZE - md5->buffLen); + md5->buffLen += WC_MD5_BLOCK_SIZE - md5->buffLen; #if defined(BIG_ENDIAN_ORDER) && !defined(FREESCALE_MMCAU_SHA) - ByteReverseWords(md5->buffer, md5->buffer, MD5_BLOCK_SIZE); + ByteReverseWords(md5->buffer, md5->buffer, WC_MD5_BLOCK_SIZE); #endif XTRANSFORM(md5, local); md5->buffLen = 0; } - XMEMSET(&local[md5->buffLen], 0, MD5_PAD_SIZE - md5->buffLen); + XMEMSET(&local[md5->buffLen], 0, WC_MD5_PAD_SIZE - md5->buffLen); #if defined(BIG_ENDIAN_ORDER) && !defined(FREESCALE_MMCAU_SHA) - ByteReverseWords(md5->buffer, md5->buffer, MD5_BLOCK_SIZE); + ByteReverseWords(md5->buffer, md5->buffer, WC_MD5_BLOCK_SIZE); #endif /* put lengths in bits */ @@ -467,22 +467,22 @@ int wc_Md5Final(Md5* md5, byte* hash) /* store lengths */ /* ! length ordering dependent on digest endian type ! */ - XMEMCPY(&local[MD5_PAD_SIZE], &md5->loLen, sizeof(word32)); - XMEMCPY(&local[MD5_PAD_SIZE + sizeof(word32)], &md5->hiLen, sizeof(word32)); + XMEMCPY(&local[WC_MD5_PAD_SIZE], &md5->loLen, sizeof(word32)); + XMEMCPY(&local[WC_MD5_PAD_SIZE + sizeof(word32)], &md5->hiLen, sizeof(word32)); /* final transform and result to hash */ XTRANSFORM(md5, local); #ifdef BIG_ENDIAN_ORDER - ByteReverseWords(md5->digest, md5->digest, MD5_DIGEST_SIZE); + ByteReverseWords(md5->digest, md5->digest, WC_MD5_DIGEST_SIZE); #endif - XMEMCPY(hash, md5->digest, MD5_DIGEST_SIZE); + XMEMCPY(hash, md5->digest, WC_MD5_DIGEST_SIZE); return _InitMd5(md5); /* reset state */ } #endif /* !HAVE_MD5_CUST_API */ -int wc_InitMd5(Md5* md5) +int wc_InitMd5(wc_Md5* md5) { if (md5 == NULL) { return BAD_FUNC_ARG; @@ -490,7 +490,7 @@ int wc_InitMd5(Md5* md5) return wc_InitMd5_ex(md5, NULL, INVALID_DEVID); } -void wc_Md5Free(Md5* md5) +void wc_Md5Free(wc_Md5* md5) { if (md5 == NULL) return; @@ -499,10 +499,10 @@ void wc_Md5Free(Md5* md5) #endif /* WOLFSSL_ASYNC_CRYPT */ } -int wc_Md5GetHash(Md5* md5, byte* hash) +int wc_Md5GetHash(wc_Md5* md5, byte* hash) { int ret; - Md5 tmpMd5; + wc_Md5 tmpMd5; if (md5 == NULL || hash == NULL) return BAD_FUNC_ARG; @@ -515,14 +515,14 @@ int wc_Md5GetHash(Md5* md5, byte* hash) return ret; } -int wc_Md5Copy(Md5* src, Md5* dst) +int wc_Md5Copy(wc_Md5* src, wc_Md5* dst) { int ret = 0; if (src == NULL || dst == NULL) return BAD_FUNC_ARG; - XMEMCPY(dst, src, sizeof(Md5)); + XMEMCPY(dst, src, sizeof(wc_Md5)); #ifdef WOLFSSL_ASYNC_CRYPT ret = wolfAsync_DevCopy(&src->asyncDev, &dst->asyncDev); diff --git a/wolfcrypt/src/pkcs12.c b/wolfcrypt/src/pkcs12.c index ccdcd5de6..45409ae66 100644 --- a/wolfcrypt/src/pkcs12.c +++ b/wolfcrypt/src/pkcs12.c @@ -499,26 +499,26 @@ static int wc_PKCS12_verify(WC_PKCS12* pkcs12, byte* data, word32 dataSz, switch (mac->oid) { #ifndef NO_SHA case SHAh: /* 88 */ - typeH = SHA; - kLen = SHA_DIGEST_SIZE; + typeH = WC_SHA; + kLen = WC_SHA_DIGEST_SIZE; break; #endif #ifndef NO_SHA256 case SHA256h: /* 414 */ - typeH = SHA256; - kLen = SHA256_DIGEST_SIZE; + typeH = WC_SHA256; + kLen = WC_SHA256_DIGEST_SIZE; break; #endif #ifdef WOLFSSL_SHA384 case SHA384h: /* 415 */ - typeH = SHA384; - kLen = SHA384_DIGEST_SIZE; + typeH = WC_SHA384; + kLen = WC_SHA384_DIGEST_SIZE; break; #endif #ifdef WOLFSSL_SHA512 case SHA512h: /* 416 */ - typeH = SHA512; - kLen = SHA512_DIGEST_SIZE; + typeH = WC_SHA512; + kLen = WC_SHA512_DIGEST_SIZE; break; #endif default: /* May be SHA224 or was just not built in */ diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c index 22bac70f6..91bbde6c7 100755 --- a/wolfcrypt/src/pkcs7.c +++ b/wolfcrypt/src/pkcs7.c @@ -3217,7 +3217,7 @@ static int wc_PKCS7_DecodeKtri(PKCS7* pkcs7, byte* pkiMsg, word32 pkiMsgSz, int keySz; word32 encOID; word32 keyIdx; - byte issuerHash[SHA_DIGEST_SIZE]; + byte issuerHash[WC_SHA_DIGEST_SIZE]; byte* outKey = NULL; #ifdef WC_RSA_BLINDING @@ -3245,7 +3245,7 @@ static int wc_PKCS7_DecodeKtri(PKCS7* pkcs7, byte* pkiMsg, word32 pkiMsgSz, return ASN_PARSE_E; /* if we found correct recipient, issuer hashes will match */ - if (XMEMCMP(issuerHash, pkcs7->issuerHash, SHA_DIGEST_SIZE) == 0) { + if (XMEMCMP(issuerHash, pkcs7->issuerHash, WC_SHA_DIGEST_SIZE) == 0) { *recipFound = 1; } diff --git a/wolfcrypt/src/port/arm/armv8-sha256.c b/wolfcrypt/src/port/arm/armv8-sha256.c index bb01692d2..2115ddcb9 100644 --- a/wolfcrypt/src/port/arm/armv8-sha256.c +++ b/wolfcrypt/src/port/arm/armv8-sha256.c @@ -58,7 +58,7 @@ static const ALIGN32 word32 K[64] = { }; -static int InitSha256(Sha256* sha256) +static int InitSha256(wc_Sha256* sha256) { int ret = 0; @@ -82,7 +82,7 @@ static int InitSha256(Sha256* sha256) return ret; } -static INLINE void AddLength(Sha256* sha256, word32 len) +static INLINE void AddLength(wc_Sha256* sha256, word32 len) { word32 tmp = sha256->loLen; if ((sha256->loLen += len) < tmp) @@ -93,7 +93,7 @@ static INLINE void AddLength(Sha256* sha256, word32 len) #ifdef __aarch64__ /* ARMv8 hardware accleration */ -static INLINE int Sha256Update(Sha256* sha256, const byte* data, word32 len) +static INLINE int Sha256Update(wc_Sha256* sha256, const byte* data, word32 len) { word32 add; word32 numBlocks; @@ -101,20 +101,20 @@ static INLINE int Sha256Update(Sha256* sha256, const byte* data, word32 len) /* only perform actions if a buffer is passed in */ if (len > 0) { /* fill leftover buffer with data */ - add = min(len, SHA256_BLOCK_SIZE - sha256->buffLen); + add = min(len, WC_SHA256_BLOCK_SIZE - sha256->buffLen); XMEMCPY((byte*)(sha256->buffer) + sha256->buffLen, data, add); sha256->buffLen += add; data += add; len -= add; /* number of blocks in a row to complete */ - numBlocks = (len + sha256->buffLen)/SHA256_BLOCK_SIZE; + numBlocks = (len + sha256->buffLen)/WC_SHA256_BLOCK_SIZE; if (numBlocks > 0) { word32* k = (word32*)K; /* get leftover amount after blocks */ - add = (len + sha256->buffLen) - numBlocks * SHA256_BLOCK_SIZE; + add = (len + sha256->buffLen) - numBlocks * WC_SHA256_BLOCK_SIZE; __asm__ volatile ( "#load leftover data\n" "LD1 {v0.2d-v3.2d}, %[buffer] \n" @@ -290,7 +290,7 @@ static INLINE int Sha256Update(Sha256* sha256, const byte* data, word32 len) "v29", "v30", "v31", "w8" ); - AddLength(sha256, SHA256_BLOCK_SIZE * numBlocks); + AddLength(sha256, WC_SHA256_BLOCK_SIZE * numBlocks); /* copy over any remaining data leftover */ XMEMCPY(sha256->buffer, data, add); @@ -306,7 +306,7 @@ static INLINE int Sha256Update(Sha256* sha256, const byte* data, word32 len) } -static INLINE int Sha256Final(Sha256* sha256, byte* hash) +static INLINE int Sha256Final(wc_Sha256* sha256, byte* hash) { byte* local; @@ -316,10 +316,10 @@ static INLINE int Sha256Final(Sha256* sha256, byte* hash) local[sha256->buffLen++] = 0x80; /* add 1 */ /* pad with zeros */ - if (sha256->buffLen > SHA256_PAD_SIZE) { + if (sha256->buffLen > WC_SHA256_PAD_SIZE) { - XMEMSET(&local[sha256->buffLen], 0, SHA256_BLOCK_SIZE - sha256->buffLen); - sha256->buffLen += SHA256_BLOCK_SIZE - sha256->buffLen; + XMEMSET(&local[sha256->buffLen], 0, WC_SHA256_BLOCK_SIZE - sha256->buffLen); + sha256->buffLen += WC_SHA256_BLOCK_SIZE - sha256->buffLen; __asm__ volatile ( "LD1 {v4.2d-v7.2d}, %[buffer] \n" "MOV v0.16b, v4.16b \n" @@ -471,7 +471,7 @@ static INLINE int Sha256Final(Sha256* sha256, byte* hash) sha256->buffLen = 0; } - XMEMSET(&local[sha256->buffLen], 0, SHA256_PAD_SIZE - sha256->buffLen); + XMEMSET(&local[sha256->buffLen], 0, WC_SHA256_PAD_SIZE - sha256->buffLen); /* put lengths in bits */ sha256->hiLen = (sha256->loLen >> (8*sizeof(sha256->loLen) - 3)) + @@ -493,8 +493,8 @@ static INLINE int Sha256Final(Sha256* sha256, byte* hash) ); #endif /* ! length ordering dependent on digest endian type ! */ - XMEMCPY(&local[SHA256_PAD_SIZE], &sha256->hiLen, sizeof(word32)); - XMEMCPY(&local[SHA256_PAD_SIZE + sizeof(word32)], &sha256->loLen, + XMEMCPY(&local[WC_SHA256_PAD_SIZE], &sha256->hiLen, sizeof(word32)); + XMEMCPY(&local[WC_SHA256_PAD_SIZE + sizeof(word32)], &sha256->loLen, sizeof(word32)); __asm__ volatile ( @@ -655,7 +655,7 @@ static INLINE int Sha256Final(Sha256* sha256, byte* hash) #else /* not using 64 bit */ /* ARMv8 hardware accleration Aarch32 */ -static INLINE int Sha256Update(Sha256* sha256, const byte* data, word32 len) +static INLINE int Sha256Update(wc_Sha256* sha256, const byte* data, word32 len) { word32 add; word32 numBlocks; @@ -663,20 +663,20 @@ static INLINE int Sha256Update(Sha256* sha256, const byte* data, word32 len) /* only perform actions if a buffer is passed in */ if (len > 0) { /* fill leftover buffer with data */ - add = min(len, SHA256_BLOCK_SIZE - sha256->buffLen); + add = min(len, WC_SHA256_BLOCK_SIZE - sha256->buffLen); XMEMCPY((byte*)(sha256->buffer) + sha256->buffLen, data, add); sha256->buffLen += add; data += add; len -= add; /* number of blocks in a row to complete */ - numBlocks = (len + sha256->buffLen)/SHA256_BLOCK_SIZE; + numBlocks = (len + sha256->buffLen)/WC_SHA256_BLOCK_SIZE; if (numBlocks > 0) { word32* bufPt = sha256->buffer; word32* digPt = sha256->digest; /* get leftover amount after blocks */ - add = (len + sha256->buffLen) - numBlocks * SHA256_BLOCK_SIZE; + add = (len + sha256->buffLen) - numBlocks * WC_SHA256_BLOCK_SIZE; __asm__ volatile ( "#load leftover data\n" "VLDM %[buffer]!, {q0-q3} \n" @@ -866,7 +866,7 @@ static INLINE int Sha256Update(Sha256* sha256, const byte* data, word32 len) "q15", "r8" ); - AddLength(sha256, SHA256_BLOCK_SIZE * numBlocks); + AddLength(sha256, WC_SHA256_BLOCK_SIZE * numBlocks); /* copy over any remaining data leftover */ XMEMCPY(sha256->buffer, data, add); @@ -882,7 +882,7 @@ static INLINE int Sha256Update(Sha256* sha256, const byte* data, word32 len) } -static INLINE int Sha256Final(Sha256* sha256, byte* hash) +static INLINE int Sha256Final(wc_Sha256* sha256, byte* hash) { byte* local; @@ -896,11 +896,11 @@ static INLINE int Sha256Final(Sha256* sha256, byte* hash) local[sha256->buffLen++] = 0x80; /* add 1 */ /* pad with zeros */ - if (sha256->buffLen > SHA256_PAD_SIZE) { + if (sha256->buffLen > WC_SHA256_PAD_SIZE) { word32* bufPt = sha256->buffer; word32* digPt = sha256->digest; - XMEMSET(&local[sha256->buffLen], 0, SHA256_BLOCK_SIZE - sha256->buffLen); - sha256->buffLen += SHA256_BLOCK_SIZE - sha256->buffLen; + XMEMSET(&local[sha256->buffLen], 0, WC_SHA256_BLOCK_SIZE - sha256->buffLen); + sha256->buffLen += WC_SHA256_BLOCK_SIZE - sha256->buffLen; __asm__ volatile ( "#load leftover data\n" "VLDM %[buffer]!, {q0-q3} \n" @@ -1071,7 +1071,7 @@ static INLINE int Sha256Final(Sha256* sha256, byte* hash) sha256->buffLen = 0; } - XMEMSET(&local[sha256->buffLen], 0, SHA256_PAD_SIZE - sha256->buffLen); + XMEMSET(&local[sha256->buffLen], 0, WC_SHA256_PAD_SIZE - sha256->buffLen); /* put lengths in bits */ sha256->hiLen = (sha256->loLen >> (8*sizeof(sha256->loLen) - 3)) + @@ -1100,8 +1100,8 @@ static INLINE int Sha256Final(Sha256* sha256, byte* hash) ); #endif /* ! length ordering dependent on digest endian type ! */ - XMEMCPY(&local[SHA256_PAD_SIZE], &sha256->hiLen, sizeof(word32)); - XMEMCPY(&local[SHA256_PAD_SIZE + sizeof(word32)], &sha256->loLen, + XMEMCPY(&local[WC_SHA256_PAD_SIZE], &sha256->hiLen, sizeof(word32)); + XMEMCPY(&local[WC_SHA256_PAD_SIZE + sizeof(word32)], &sha256->loLen, sizeof(word32)); bufPt = sha256->buffer; @@ -1285,7 +1285,7 @@ static INLINE int Sha256Final(Sha256* sha256, byte* hash) #ifndef NO_SHA256 -int wc_InitSha256_ex(Sha256* sha256, void* heap, int devId) +int wc_InitSha256_ex(wc_Sha256* sha256, void* heap, int devId) { if (sha256 == NULL) return BAD_FUNC_ARG; @@ -1296,17 +1296,17 @@ int wc_InitSha256_ex(Sha256* sha256, void* heap, int devId) return InitSha256(sha256); } -int wc_InitSha256(Sha256* sha256) +int wc_InitSha256(wc_Sha256* sha256) { return wc_InitSha256_ex(sha256, NULL, INVALID_DEVID); } -void wc_Sha256Free(Sha256* sha256) +void wc_Sha256Free(wc_Sha256* sha256) { (void)sha256; } -int wc_Sha256Update(Sha256* sha256, const byte* data, word32 len) +int wc_Sha256Update(wc_Sha256* sha256, const byte* data, word32 len) { if (sha256 == NULL || (data == NULL && len != 0)) { return BAD_FUNC_ARG; @@ -1315,7 +1315,7 @@ int wc_Sha256Update(Sha256* sha256, const byte* data, word32 len) return Sha256Update(sha256, data, len); } -int wc_Sha256Final(Sha256* sha256, byte* hash) +int wc_Sha256Final(wc_Sha256* sha256, byte* hash) { int ret; @@ -1330,10 +1330,10 @@ int wc_Sha256Final(Sha256* sha256, byte* hash) return InitSha256(sha256); /* reset state */ } -int wc_Sha256GetHash(Sha256* sha256, byte* hash) +int wc_Sha256GetHash(wc_Sha256* sha256, byte* hash) { int ret; - Sha256 tmpSha256; + wc_Sha256 tmpSha256; if (sha256 == NULL || hash == NULL) return BAD_FUNC_ARG; @@ -1345,14 +1345,14 @@ int wc_Sha256GetHash(Sha256* sha256, byte* hash) return ret; } -int wc_Sha256Copy(Sha256* src, Sha256* dst) +int wc_Sha256Copy(wc_Sha256* src, wc_Sha256* dst) { int ret = 0; if (src == NULL || dst == NULL) return BAD_FUNC_ARG; - XMEMCPY(dst, src, sizeof(Sha256)); + XMEMCPY(dst, src, sizeof(wc_Sha256)); return ret; } @@ -1361,7 +1361,7 @@ int wc_Sha256Copy(Sha256* src, Sha256* dst) #ifdef WOLFSSL_SHA224 - static int InitSha224(Sha224* sha224) + static int InitSha224(wc_Sha224* sha224) { int ret = 0; @@ -1386,7 +1386,7 @@ int wc_Sha256Copy(Sha256* src, Sha256* dst) return ret; } - int wc_InitSha224_ex(Sha224* sha224, void* heap, int devId) + int wc_InitSha224_ex(wc_Sha224* sha224, void* heap, int devId) { if (sha224 == NULL) return BAD_FUNC_ARG; @@ -1397,12 +1397,12 @@ int wc_Sha256Copy(Sha256* src, Sha256* dst) return InitSha224(sha224); } - int wc_InitSha224(Sha224* sha224) + int wc_InitSha224(wc_Sha224* sha224) { return wc_InitSha224_ex(sha224, NULL, INVALID_DEVID); } - int wc_Sha224Update(Sha224* sha224, const byte* data, word32 len) + int wc_Sha224Update(wc_Sha224* sha224, const byte* data, word32 len) { int ret; @@ -1410,39 +1410,39 @@ int wc_Sha256Copy(Sha256* src, Sha256* dst) return BAD_FUNC_ARG; } - ret = Sha256Update((Sha256 *)sha224, data, len); + ret = Sha256Update((wc_Sha256 *)sha224, data, len); return ret; } - int wc_Sha224Final(Sha224* sha224, byte* hash) + int wc_Sha224Final(wc_Sha224* sha224, byte* hash) { int ret; - word32 hashTmp[SHA256_DIGEST_SIZE/sizeof(word32)]; + word32 hashTmp[WC_SHA256_DIGEST_SIZE/sizeof(word32)]; if (sha224 == NULL || hash == NULL) { return BAD_FUNC_ARG; } - ret = Sha256Final((Sha256*)sha224, (byte*)hashTmp); + ret = Sha256Final((wc_Sha256*)sha224, (byte*)hashTmp); if (ret != 0) return ret; - XMEMCPY(hash, hashTmp, SHA224_DIGEST_SIZE); + XMEMCPY(hash, hashTmp, WC_SHA224_DIGEST_SIZE); return InitSha224(sha224); /* reset state */ } - void wc_Sha224Free(Sha224* sha224) + void wc_Sha224Free(wc_Sha224* sha224) { if (sha224 == NULL) return; } - int wc_Sha224GetHash(Sha224* sha224, byte* hash) + int wc_Sha224GetHash(wc_Sha224* sha224, byte* hash) { int ret; - Sha224 tmpSha224; + wc_Sha224 tmpSha224; if (sha224 == NULL || hash == NULL) return BAD_FUNC_ARG; @@ -1453,14 +1453,14 @@ int wc_Sha256Copy(Sha256* src, Sha256* dst) } return ret; } - int wc_Sha224Copy(Sha224* src, Sha224* dst) + int wc_Sha224Copy(wc_Sha224* src, wc_Sha224* dst) { int ret = 0; if (src == NULL || dst == NULL) return BAD_FUNC_ARG; - XMEMCPY(dst, src, sizeof(Sha224)); + XMEMCPY(dst, src, sizeof(wc_Sha224)); return ret; } diff --git a/wolfcrypt/src/pwdbased.c b/wolfcrypt/src/pwdbased.c index 738977305..3af55439d 100644 --- a/wolfcrypt/src/pwdbased.c +++ b/wolfcrypt/src/pwdbased.c @@ -49,20 +49,20 @@ int wc_PBKDF1(byte* output, const byte* passwd, int pLen, const byte* salt, int sLen, int iterations, int kLen, int hashType) { - Sha sha; + wc_Sha sha; #ifndef NO_MD5 - Md5 md5; + wc_Md5 md5; #endif - int hLen = (int)SHA_DIGEST_SIZE; + int hLen = (int)WC_SHA_DIGEST_SIZE; int i, ret = 0; - byte buffer[SHA_DIGEST_SIZE]; /* max size */ + byte buffer[WC_SHA_DIGEST_SIZE]; /* max size */ - if (hashType != MD5 && hashType != SHA) + if (hashType != WC_MD5 && hashType != WC_SHA) return BAD_FUNC_ARG; #ifndef NO_MD5 - if (hashType == MD5) - hLen = (int)MD5_DIGEST_SIZE; + if (hashType == WC_MD5) + hLen = (int)WC_MD5_DIGEST_SIZE; #endif if ((kLen > hLen) || (kLen < 0)) @@ -73,7 +73,7 @@ int wc_PBKDF1(byte* output, const byte* passwd, int pLen, const byte* salt, switch (hashType) { #ifndef NO_MD5 - case MD5: + case WC_MD5: ret = wc_InitMd5(&md5); if (ret != 0) { return ret; @@ -92,7 +92,7 @@ int wc_PBKDF1(byte* output, const byte* passwd, int pLen, const byte* salt, } break; #endif /* NO_MD5 */ - case SHA: + case WC_SHA: default: ret = wc_InitSha(&sha); if (ret != 0) @@ -104,7 +104,7 @@ int wc_PBKDF1(byte* output, const byte* passwd, int pLen, const byte* salt, } for (i = 1; i < iterations; i++) { - if (hashType == SHA) { + if (hashType == WC_SHA) { wc_ShaUpdate(&sha, buffer, hLen); wc_ShaFinal(&sha, buffer); } @@ -134,23 +134,23 @@ int GetDigestSize(int hashType) switch (hashType) { #ifndef NO_MD5 - case MD5: - hLen = MD5_DIGEST_SIZE; + case WC_MD5: + hLen = WC_MD5_DIGEST_SIZE; break; #endif #ifndef NO_SHA - case SHA: - hLen = SHA_DIGEST_SIZE; + case WC_SHA: + hLen = WC_SHA_DIGEST_SIZE; break; #endif #ifndef NO_SHA256 - case SHA256: - hLen = SHA256_DIGEST_SIZE; + case WC_SHA256: + hLen = WC_SHA256_DIGEST_SIZE; break; #endif #ifdef WOLFSSL_SHA512 - case SHA512: - hLen = SHA512_DIGEST_SIZE; + case WC_SHA512: + hLen = WC_SHA512_DIGEST_SIZE; break; #endif default: @@ -244,11 +244,11 @@ int wc_PBKDF2(byte* output, const byte* passwd, int pLen, const byte* salt, } #ifdef WOLFSSL_SHA512 - #define PBKDF_DIGEST_SIZE SHA512_BLOCK_SIZE + #define PBKDF_DIGEST_SIZE WC_SHA512_BLOCK_SIZE #elif !defined(NO_SHA256) - #define PBKDF_DIGEST_SIZE SHA256_BLOCK_SIZE + #define PBKDF_DIGEST_SIZE WC_SHA256_BLOCK_SIZE #else - #define PBKDF_DIGEST_SIZE SHA_DIGEST_SIZE + #define PBKDF_DIGEST_SIZE WC_SHA_DIGEST_SIZE #endif /* helper for wc_PKCS12_PBKDF(), sets block and digest sizes */ @@ -259,27 +259,27 @@ int GetPKCS12HashSizes(int hashType, word32* v, word32* u) switch (hashType) { #ifndef NO_MD5 - case MD5: - *v = MD5_BLOCK_SIZE; - *u = MD5_DIGEST_SIZE; + case WC_MD5: + *v = WC_MD5_BLOCK_SIZE; + *u = WC_MD5_DIGEST_SIZE; break; #endif #ifndef NO_SHA - case SHA: - *v = SHA_BLOCK_SIZE; - *u = SHA_DIGEST_SIZE; + case WC_SHA: + *v = WC_SHA_BLOCK_SIZE; + *u = WC_SHA_DIGEST_SIZE; break; #endif #ifndef NO_SHA256 - case SHA256: - *v = SHA256_BLOCK_SIZE; - *u = SHA256_DIGEST_SIZE; + case WC_SHA256: + *v = WC_SHA256_BLOCK_SIZE; + *u = WC_SHA256_DIGEST_SIZE; break; #endif #ifdef WOLFSSL_SHA512 - case SHA512: - *v = SHA512_BLOCK_SIZE; - *u = SHA512_DIGEST_SIZE; + case WC_SHA512: + *v = WC_SHA512_BLOCK_SIZE; + *u = WC_SHA512_DIGEST_SIZE; break; #endif default: @@ -301,9 +301,9 @@ int DoPKCS12Hash(int hashType, byte* buffer, word32 totalLen, switch (hashType) { #ifndef NO_MD5 - case MD5: + case WC_MD5: { - Md5 md5; + wc_Md5 md5; ret = wc_InitMd5(&md5); if (ret != 0) { break; @@ -331,9 +331,9 @@ int DoPKCS12Hash(int hashType, byte* buffer, word32 totalLen, break; #endif /* NO_MD5 */ #ifndef NO_SHA - case SHA: + case WC_SHA: { - Sha sha; + wc_Sha sha; ret = wc_InitSha(&sha); if (ret != 0) break; @@ -360,9 +360,9 @@ int DoPKCS12Hash(int hashType, byte* buffer, word32 totalLen, break; #endif /* NO_SHA */ #ifndef NO_SHA256 - case SHA256: + case WC_SHA256: { - Sha256 sha256; + wc_Sha256 sha256; ret = wc_InitSha256(&sha256); if (ret != 0) break; @@ -388,9 +388,9 @@ int DoPKCS12Hash(int hashType, byte* buffer, word32 totalLen, break; #endif /* NO_SHA256 */ #ifdef WOLFSSL_SHA512 - case SHA512: + case WC_SHA512: { - Sha512 sha512; + wc_Sha512 sha512; ret = wc_InitSha512(&sha512); if (ret != 0) break; @@ -804,7 +804,7 @@ int wc_scrypt(byte* output, const byte* passwd, int passLen, /* Step 1. */ ret = wc_PBKDF2(blocks, passwd, passLen, salt, saltLen, 1, blocksSz, - SHA256); + WC_SHA256); if (ret != 0) goto end; @@ -814,7 +814,7 @@ int wc_scrypt(byte* output, const byte* passwd, int passLen, /* Step 3. */ ret = wc_PBKDF2(output, passwd, passLen, blocks, blocksSz, 1, dkLen, - SHA256); + WC_SHA256); end: if (blocks != NULL) XFREE(blocks, NULL, DYNAMIC_TYPE_TMP_BUFFER); diff --git a/wolfcrypt/src/random.c b/wolfcrypt/src/random.c index 02cc53e97..46f617b6a 100644 --- a/wolfcrypt/src/random.c +++ b/wolfcrypt/src/random.c @@ -152,7 +152,7 @@ int wc_RNG_GenerateByte(WC_RNG* rng, byte* b) /* Start NIST DRBG code */ #ifdef HAVE_HASHDRBG -#define OUTPUT_BLOCK_LEN (SHA256_DIGEST_SIZE) +#define OUTPUT_BLOCK_LEN (WC_SHA256_DIGEST_SIZE) #define MAX_REQUEST_LEN (0x10000) #define RESEED_INTERVAL WC_RESEED_INTERVAL #define SECURITY_STRENGTH (256) @@ -173,7 +173,7 @@ int wc_RNG_GenerateByte(WC_RNG* rng, byte* b) #define DRBG_FAILED 2 #define DRBG_CONT_FAILED 3 -#define RNG_HEALTH_TEST_CHECK_SIZE (SHA256_DIGEST_SIZE * 4) +#define RNG_HEALTH_TEST_CHECK_SIZE (WC_SHA256_DIGEST_SIZE * 4) /* Verify max gen block len */ #if RNG_MAX_BLOCK_LEN > MAX_REQUEST_LEN @@ -215,8 +215,8 @@ static int Hash_df(DRBG* drbg, byte* out, word32 outSz, byte type, int i; int len; word32 bits = (outSz * 8); /* reverse byte order */ - Sha256 sha; - DECLARE_VAR(digest, byte, SHA256_DIGEST_SIZE, drbg->heap); + wc_Sha256 sha; + DECLARE_VAR(digest, byte, WC_SHA256_DIGEST_SIZE, drbg->heap); (void)drbg; #ifdef WOLFSSL_ASYNC_CRYPT @@ -271,7 +271,7 @@ static int Hash_df(DRBG* drbg, byte* out, word32 outSz, byte type, } } - ForceZero(digest, SHA256_DIGEST_SIZE); + ForceZero(digest, WC_SHA256_DIGEST_SIZE); FREE_VAR(digest, drbg->heap); @@ -321,8 +321,8 @@ static int Hash_gen(DRBG* drbg, byte* out, word32 outSz, const byte* V) int i; int len; word32 checkBlock; - Sha256 sha; - DECLARE_VAR(digest, byte, SHA256_DIGEST_SIZE, drbg->heap); + wc_Sha256 sha; + DECLARE_VAR(digest, byte, WC_SHA256_DIGEST_SIZE, drbg->heap); /* Special case: outSz is 0 and out is NULL. wc_Generate a block to save for * the continuous test. */ @@ -409,14 +409,14 @@ static INLINE void array_add(byte* d, word32 dLen, const byte* s, word32 sLen) static int Hash_DRBG_Generate(DRBG* drbg, byte* out, word32 outSz) { int ret; - Sha256 sha; + wc_Sha256 sha; byte type; word32 reseedCtr; if (drbg->reseedCtr == RESEED_INTERVAL) { return DRBG_NEED_RESEED; } else { - DECLARE_VAR(digest, byte, SHA256_DIGEST_SIZE, drbg->heap); + DECLARE_VAR(digest, byte, WC_SHA256_DIGEST_SIZE, drbg->heap); type = drbgGenerateH; reseedCtr = drbg->reseedCtr; @@ -437,7 +437,7 @@ static int Hash_DRBG_Generate(DRBG* drbg, byte* out, word32 outSz) wc_Sha256Free(&sha); if (ret == 0) { - array_add(drbg->V, sizeof(drbg->V), digest, SHA256_DIGEST_SIZE); + array_add(drbg->V, sizeof(drbg->V), digest, WC_SHA256_DIGEST_SIZE); array_add(drbg->V, sizeof(drbg->V), drbg->C, sizeof(drbg->C)); #ifdef LITTLE_ENDIAN_ORDER reseedCtr = ByteReverseWord32(reseedCtr); @@ -448,7 +448,7 @@ static int Hash_DRBG_Generate(DRBG* drbg, byte* out, word32 outSz) } drbg->reseedCtr++; } - ForceZero(digest, SHA256_DIGEST_SIZE); + ForceZero(digest, WC_SHA256_DIGEST_SIZE); FREE_VAR(digest, drbg->heap); } diff --git a/wolfcrypt/src/sha.c b/wolfcrypt/src/sha.c index 209b2372a..2e6c0abbf 100755 --- a/wolfcrypt/src/sha.c +++ b/wolfcrypt/src/sha.c @@ -33,14 +33,14 @@ /* fips wrapper calls, user can call direct */ #ifdef HAVE_FIPS - int wc_InitSha(Sha* sha) + int wc_InitSha(wc_Sha* sha) { if (sha == NULL) { return BAD_FUNC_ARG; } return InitSha_fips(sha); } - int wc_InitSha_ex(Sha* sha, void* heap, int devId) + int wc_InitSha_ex(wc_Sha* sha, void* heap, int devId) { (void)heap; (void)devId; @@ -50,7 +50,7 @@ return InitSha_fips(sha); } - int wc_ShaUpdate(Sha* sha, const byte* data, word32 len) + int wc_ShaUpdate(wc_Sha* sha, const byte* data, word32 len) { if (sha == NULL || (data == NULL && len > 0)) { return BAD_FUNC_ARG; @@ -58,14 +58,14 @@ return ShaUpdate_fips(sha, data, len); } - int wc_ShaFinal(Sha* sha, byte* out) + int wc_ShaFinal(wc_Sha* sha, byte* out) { if (sha == NULL || out == NULL) { return BAD_FUNC_ARG; } return ShaFinal_fips(sha,out); } - void wc_ShaFree(Sha* sha) + void wc_ShaFree(wc_Sha* sha) { (void)sha; /* Not supported in FIPS */ @@ -87,7 +87,7 @@ #include #endif -static INLINE void AddLength(Sha* sha, word32 len); +static INLINE void AddLength(wc_Sha* sha, word32 len); /* Hardware Acceleration */ @@ -103,7 +103,7 @@ static INLINE void AddLength(Sha* sha, word32 len); /* STM32 register size, bytes */ #ifdef WOLFSSL_STM32_CUBEMX - #define SHA_REG_SIZE SHA_BLOCK_SIZE + #define SHA_REG_SIZE WC_SHA_BLOCK_SIZE #else #define SHA_REG_SIZE 4 /* STM32 struct notes: @@ -114,7 +114,7 @@ static INLINE void AddLength(Sha* sha, word32 len); #endif #define SHA_HW_TIMEOUT 0xFF - int wc_InitSha_ex(Sha* sha, void* heap, int devId) + int wc_InitSha_ex(wc_Sha* sha, void* heap, int devId) { if (sha == NULL) return BAD_FUNC_ARG; @@ -153,7 +153,7 @@ static INLINE void AddLength(Sha* sha, word32 len); return 0; } - int wc_ShaUpdate(Sha* sha, const byte* data, word32 len) + int wc_ShaUpdate(wc_Sha* sha, const byte* data, word32 len) { int ret = 0; byte* local; @@ -194,7 +194,7 @@ static INLINE void AddLength(Sha* sha, word32 len); return ret; } - int wc_ShaFinal(Sha* sha, byte* hash) + int wc_ShaFinal(wc_Sha* sha, byte* hash) { int ret = 0; @@ -236,10 +236,10 @@ static INLINE void AddLength(Sha* sha, word32 len); sha->digest[3] = HASH->HR[3]; sha->digest[4] = HASH->HR[4]; - ByteReverseWords(sha->digest, sha->digest, SHA_DIGEST_SIZE); + ByteReverseWords(sha->digest, sha->digest, WC_SHA_DIGEST_SIZE); #endif /* WOLFSSL_STM32_CUBEMX */ - XMEMCPY(hash, sha->digest, SHA_DIGEST_SIZE); + XMEMCPY(hash, sha->digest, WC_SHA_DIGEST_SIZE); (void)wc_InitSha_ex(sha, sha->heap, INVALID_DEVID); /* reset state */ @@ -250,21 +250,21 @@ static INLINE void AddLength(Sha* sha, word32 len); #elif defined(FREESCALE_LTC_SHA) #include "fsl_ltc.h" - static int InitSha(Sha* sha) + static int InitSha(wc_Sha* sha) { LTC_HASH_Init(LTC_BASE, &sha->ctx, kLTC_Sha1, NULL, 0); return 0; } - int wc_ShaUpdate(Sha* sha, const byte* data, word32 len) + int wc_ShaUpdate(wc_Sha* sha, const byte* data, word32 len) { LTC_HASH_Update(&sha->ctx, data, len); return 0; } - int wc_ShaFinal(Sha* sha, byte* hash) + int wc_ShaFinal(wc_Sha* sha, byte* hash) { - uint32_t hashlen = SHA_DIGEST_SIZE; + uint32_t hashlen = WC_SHA_DIGEST_SIZE; LTC_HASH_Finish(&sha->ctx, hash, &hashlen); return wc_InitSha(sha); /* reset state */ } @@ -281,7 +281,7 @@ static INLINE void AddLength(Sha* sha, word32 len); #define USE_SHA_SOFTWARE_IMPL /* Only for API's, actual transform is here */ #define XTRANSFORM(S,B) Transform((S),(B)) - static int InitSha(Sha* sha) + static int InitSha(wc_Sha* sha) { int ret = 0; ret = wolfSSL_CryptHwMutexLock(); @@ -302,7 +302,7 @@ static INLINE void AddLength(Sha* sha, word32 len); return ret; } - static int Transform(Sha* sha, byte* data) + static int Transform(wc_Sha* sha, byte* data) { int ret = wolfSSL_CryptHwMutexLock(); if(ret == 0) { @@ -321,7 +321,7 @@ static INLINE void AddLength(Sha* sha, word32 len); /* Software implementation */ #define USE_SHA_SOFTWARE_IMPL - static int InitSha(Sha* sha) + static int InitSha(wc_Sha* sha) { int ret = 0; @@ -342,7 +342,7 @@ static INLINE void AddLength(Sha* sha, word32 len); #if defined(USE_SHA_SOFTWARE_IMPL) || defined(STM32_HASH) -static INLINE void AddLength(Sha* sha, word32 len) +static INLINE void AddLength(wc_Sha* sha, word32 len) { word32 tmp = sha->loLen; if ((sha->loLen += len) < tmp) @@ -354,7 +354,7 @@ static INLINE void AddLength(Sha* sha, word32 len) /* Software implementation */ #ifdef USE_SHA_SOFTWARE_IMPL -/* Check if custom Sha transform is used */ +/* Check if custom wc_Sha transform is used */ #ifndef XTRANSFORM #define XTRANSFORM(S,B) Transform((S),(B)) @@ -379,9 +379,9 @@ static INLINE void AddLength(Sha* sha, word32 len) #define R4(v,w,x,y,z,i) (z)+= f4((w),(x),(y)) + blk1((i)) + 0xCA62C1D6+ \ rotlFixed((v),5); (w) = rotlFixed((w),30); - static void Transform(Sha* sha, byte* data) + static void Transform(wc_Sha* sha, byte* data) { - word32 W[SHA_BLOCK_SIZE / sizeof(word32)]; + word32 W[WC_SHA_BLOCK_SIZE / sizeof(word32)]; /* Copy context->state[] to working vars */ word32 a = sha->digest[0]; @@ -458,7 +458,7 @@ static INLINE void AddLength(Sha* sha, word32 len) #endif /* !USE_CUSTOM_SHA_TRANSFORM */ -int wc_InitSha_ex(Sha* sha, void* heap, int devId) +int wc_InitSha_ex(wc_Sha* sha, void* heap, int devId) { int ret = 0; @@ -481,7 +481,7 @@ int wc_InitSha_ex(Sha* sha, void* heap, int devId) return ret; } -int wc_ShaUpdate(Sha* sha, const byte* data, word32 len) +int wc_ShaUpdate(wc_Sha* sha, const byte* data, word32 len) { byte* local; @@ -501,23 +501,23 @@ int wc_ShaUpdate(Sha* sha, const byte* data, word32 len) #endif /* WOLFSSL_ASYNC_CRYPT */ /* check that internal buffLen is valid */ - if (sha->buffLen >= SHA_BLOCK_SIZE) + if (sha->buffLen >= WC_SHA_BLOCK_SIZE) return BUFFER_E; while (len) { - word32 add = min(len, SHA_BLOCK_SIZE - sha->buffLen); + word32 add = min(len, WC_SHA_BLOCK_SIZE - sha->buffLen); XMEMCPY(&local[sha->buffLen], data, add); sha->buffLen += add; data += add; len -= add; - if (sha->buffLen == SHA_BLOCK_SIZE) { + if (sha->buffLen == WC_SHA_BLOCK_SIZE) { #if defined(LITTLE_ENDIAN_ORDER) && !defined(FREESCALE_MMCAU_SHA) - ByteReverseWords(sha->buffer, sha->buffer, SHA_BLOCK_SIZE); + ByteReverseWords(sha->buffer, sha->buffer, WC_SHA_BLOCK_SIZE); #endif XTRANSFORM(sha, local); - AddLength(sha, SHA_BLOCK_SIZE); + AddLength(sha, WC_SHA_BLOCK_SIZE); sha->buffLen = 0; } } @@ -525,7 +525,7 @@ int wc_ShaUpdate(Sha* sha, const byte* data, word32 len) return 0; } -int wc_ShaFinal(Sha* sha, byte* hash) +int wc_ShaFinal(wc_Sha* sha, byte* hash) { byte* local; @@ -538,7 +538,7 @@ int wc_ShaFinal(Sha* sha, byte* hash) #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_SHA) if (sha->asyncDev.marker == WOLFSSL_ASYNC_MARKER_SHA) { #if defined(HAVE_INTEL_QA) - return IntelQaSymSha(&sha->asyncDev, hash, NULL, SHA_DIGEST_SIZE); + return IntelQaSymSha(&sha->asyncDev, hash, NULL, WC_SHA_DIGEST_SIZE); #endif } #endif /* WOLFSSL_ASYNC_CRYPT */ @@ -548,20 +548,20 @@ int wc_ShaFinal(Sha* sha, byte* hash) local[sha->buffLen++] = 0x80; /* add 1 */ /* pad with zeros */ - if (sha->buffLen > SHA_PAD_SIZE) { - XMEMSET(&local[sha->buffLen], 0, SHA_BLOCK_SIZE - sha->buffLen); - sha->buffLen += SHA_BLOCK_SIZE - sha->buffLen; + if (sha->buffLen > WC_SHA_PAD_SIZE) { + XMEMSET(&local[sha->buffLen], 0, WC_SHA_BLOCK_SIZE - sha->buffLen); + sha->buffLen += WC_SHA_BLOCK_SIZE - sha->buffLen; #if defined(LITTLE_ENDIAN_ORDER) && !defined(FREESCALE_MMCAU_SHA) - ByteReverseWords(sha->buffer, sha->buffer, SHA_BLOCK_SIZE); + ByteReverseWords(sha->buffer, sha->buffer, WC_SHA_BLOCK_SIZE); #endif XTRANSFORM(sha, local); sha->buffLen = 0; } - XMEMSET(&local[sha->buffLen], 0, SHA_PAD_SIZE - sha->buffLen); + XMEMSET(&local[sha->buffLen], 0, WC_SHA_PAD_SIZE - sha->buffLen); #if defined(LITTLE_ENDIAN_ORDER) && !defined(FREESCALE_MMCAU_SHA) - ByteReverseWords(sha->buffer, sha->buffer, SHA_BLOCK_SIZE); + ByteReverseWords(sha->buffer, sha->buffer, WC_SHA_BLOCK_SIZE); #endif /* store lengths */ @@ -570,21 +570,21 @@ int wc_ShaFinal(Sha* sha, byte* hash) sha->loLen = sha->loLen << 3; /* ! length ordering dependent on digest endian type ! */ - XMEMCPY(&local[SHA_PAD_SIZE], &sha->hiLen, sizeof(word32)); - XMEMCPY(&local[SHA_PAD_SIZE + sizeof(word32)], &sha->loLen, sizeof(word32)); + XMEMCPY(&local[WC_SHA_PAD_SIZE], &sha->hiLen, sizeof(word32)); + XMEMCPY(&local[WC_SHA_PAD_SIZE + sizeof(word32)], &sha->loLen, sizeof(word32)); #if defined(FREESCALE_MMCAU_SHA) /* Kinetis requires only these bytes reversed */ - ByteReverseWords(&sha->buffer[SHA_PAD_SIZE/sizeof(word32)], - &sha->buffer[SHA_PAD_SIZE/sizeof(word32)], + ByteReverseWords(&sha->buffer[WC_SHA_PAD_SIZE/sizeof(word32)], + &sha->buffer[WC_SHA_PAD_SIZE/sizeof(word32)], 2 * sizeof(word32)); #endif XTRANSFORM(sha, local); #ifdef LITTLE_ENDIAN_ORDER - ByteReverseWords(sha->digest, sha->digest, SHA_DIGEST_SIZE); + ByteReverseWords(sha->digest, sha->digest, WC_SHA_DIGEST_SIZE); #endif - XMEMCPY(hash, sha->digest, SHA_DIGEST_SIZE); + XMEMCPY(hash, sha->digest, WC_SHA_DIGEST_SIZE); return InitSha(sha); /* reset state */ } @@ -592,12 +592,12 @@ int wc_ShaFinal(Sha* sha, byte* hash) #endif /* USE_SHA_SOFTWARE_IMPL */ -int wc_InitSha(Sha* sha) +int wc_InitSha(wc_Sha* sha) { return wc_InitSha_ex(sha, NULL, INVALID_DEVID); } -void wc_ShaFree(Sha* sha) +void wc_ShaFree(wc_Sha* sha) { if (sha == NULL) return; @@ -611,10 +611,10 @@ void wc_ShaFree(Sha* sha) #endif /* HAVE_FIPS */ #ifndef WOLFSSL_TI_HASH -int wc_ShaGetHash(Sha* sha, byte* hash) +int wc_ShaGetHash(wc_Sha* sha, byte* hash) { int ret; - Sha tmpSha; + wc_Sha tmpSha; if (sha == NULL || hash == NULL) return BAD_FUNC_ARG; @@ -626,14 +626,14 @@ int wc_ShaGetHash(Sha* sha, byte* hash) return ret; } -int wc_ShaCopy(Sha* src, Sha* dst) +int wc_ShaCopy(wc_Sha* src, wc_Sha* dst) { int ret = 0; if (src == NULL || dst == NULL) return BAD_FUNC_ARG; - XMEMCPY(dst, src, sizeof(Sha)); + XMEMCPY(dst, src, sizeof(wc_Sha)); #ifdef WOLFSSL_ASYNC_CRYPT ret = wolfAsync_DevCopy(&src->asyncDev, &dst->asyncDev); diff --git a/wolfcrypt/src/sha256.c b/wolfcrypt/src/sha256.c index d00782d65..5b3660c4a 100755 --- a/wolfcrypt/src/sha256.c +++ b/wolfcrypt/src/sha256.c @@ -37,14 +37,14 @@ /* fips wrapper calls, user can call direct */ #ifdef HAVE_FIPS - int wc_InitSha256(Sha256* sha) + int wc_InitSha256(wc_Sha256* sha) { if (sha == NULL) { return BAD_FUNC_ARG; } return InitSha256_fips(sha); } - int wc_InitSha256_ex(Sha256* sha, void* heap, int devId) + int wc_InitSha256_ex(wc_Sha256* sha, void* heap, int devId) { (void)heap; (void)devId; @@ -53,21 +53,21 @@ } return InitSha256_fips(sha); } - int wc_Sha256Update(Sha256* sha, const byte* data, word32 len) + int wc_Sha256Update(wc_Sha256* sha, const byte* data, word32 len) { if (sha == NULL || (data == NULL && len > 0)) { return BAD_FUNC_ARG; } return Sha256Update_fips(sha, data, len); } - int wc_Sha256Final(Sha256* sha, byte* out) + int wc_Sha256Final(wc_Sha256* sha, byte* out) { if (sha == NULL || out == NULL) { return BAD_FUNC_ARG; } return Sha256Final_fips(sha, out); } - void wc_Sha256Free(Sha256* sha) + void wc_Sha256Free(wc_Sha256* sha) { (void)sha; /* Not supported in FIPS */ @@ -100,10 +100,10 @@ #endif -static INLINE void AddLength(Sha256* sha256, word32 len); +static INLINE void AddLength(wc_Sha256* sha256, word32 len); #if !defined(WOLFSSL_PIC32MZ_HASH) && !defined(STM32_HASH) -static int InitSha256(Sha256* sha256) +static int InitSha256(wc_Sha256* sha256) { int ret = 0; @@ -144,7 +144,7 @@ static int InitSha256(Sha256* sha256) #define HAVE_INTEL_RORX - int InitSha256(Sha256* sha256) { + int InitSha256(wc_Sha256* sha256) { Save/Recover XMM, YMM ... } @@ -192,15 +192,15 @@ static int InitSha256(Sha256* sha256) */ /* #if defined(HAVE_INTEL_AVX1/2) at the tail of sha256 */ - static int Transform(Sha256* sha256); + static int Transform(wc_Sha256* sha256); #if defined(HAVE_INTEL_AVX1) - static int Transform_AVX1(Sha256 *sha256); + static int Transform_AVX1(wc_Sha256 *sha256); #endif #if defined(HAVE_INTEL_AVX2) - static int Transform_AVX2(Sha256 *sha256); - static int Transform_AVX1_RORX(Sha256 *sha256); + static int Transform_AVX2(wc_Sha256 *sha256); + static int Transform_AVX1_RORX(wc_Sha256 *sha256); #endif - static int (*Transform_p)(Sha256* sha256) /* = _Transform */; + static int (*Transform_p)(wc_Sha256* sha256) /* = _Transform */; static int transform_check = 0; static word32 intel_flags; #define XTRANSFORM(S, B) (*Transform_p)((S)) @@ -244,7 +244,7 @@ static int InitSha256(Sha256* sha256) "xmm11","xmm12","xmm13","xmm14","xmm15") #endif - int wc_InitSha256_ex(Sha256* sha256, void* heap, int devId) + int wc_InitSha256_ex(wc_Sha256* sha256, void* heap, int devId) { int ret = 0; if (sha256 == NULL) @@ -270,7 +270,7 @@ static int InitSha256(Sha256* sha256) } #elif defined(FREESCALE_LTC_SHA) - int wc_InitSha256_ex(Sha256* sha256, void* heap, int devId) + int wc_InitSha256_ex(wc_Sha256* sha256, void* heap, int devId) { (void)heap; (void)devId; @@ -290,7 +290,7 @@ static int InitSha256(Sha256* sha256) #define XTRANSFORM(S, B) Transform((S), (B)) - int wc_InitSha256_ex(Sha256* sha256, void* heap, int devId) + int wc_InitSha256_ex(wc_Sha256* sha256, void* heap, int devId) { int ret = 0; @@ -315,7 +315,7 @@ static int InitSha256(Sha256* sha256) return ret; } - static int Transform(Sha256* sha256, byte* buf) + static int Transform(wc_Sha256* sha256, byte* buf) { int ret = wolfSSL_CryptHwMutexLock(); if (ret == 0) { @@ -352,7 +352,7 @@ static int InitSha256(Sha256* sha256) #endif #define SHA256_HW_TIMEOUT 0xFF - int wc_InitSha256_ex(Sha256* sha256, void* heap, int devId) + int wc_InitSha256_ex(wc_Sha256* sha256, void* heap, int devId) { if (sha256 == NULL) return BAD_FUNC_ARG; @@ -390,7 +390,7 @@ static int InitSha256(Sha256* sha256) return 0; } - int wc_Sha256Update(Sha256* sha256, const byte* data, word32 len) + int wc_Sha256Update(wc_Sha256* sha256, const byte* data, word32 len) { int ret = 0; byte* local; @@ -431,7 +431,7 @@ static int InitSha256(Sha256* sha256) return ret; } - int wc_Sha256Final(Sha256* sha256, byte* hash) + int wc_Sha256Final(wc_Sha256* sha256, byte* hash) { int ret = 0; @@ -488,7 +488,7 @@ static int InitSha256(Sha256* sha256) #else #define NEED_SOFT_SHA256 - int wc_InitSha256_ex(Sha256* sha256, void* heap, int devId) + int wc_InitSha256_ex(wc_Sha256* sha256, void* heap, int devId) { int ret = 0; if (sha256 == NULL) @@ -553,7 +553,7 @@ static int InitSha256(Sha256* sha256) #define XTRANSFORM(S, B) Transform((S)) #endif - static int Transform(Sha256* sha256) + static int Transform(wc_Sha256* sha256) { word32 S[8], t0, t1; int i; @@ -561,12 +561,12 @@ static int InitSha256(Sha256* sha256) #ifdef WOLFSSL_SMALL_STACK word32* W; - W = (word32*)XMALLOC(sizeof(word32) * SHA256_BLOCK_SIZE, NULL, + W = (word32*)XMALLOC(sizeof(word32) * WC_SHA256_BLOCK_SIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER); if (W == NULL) return MEMORY_E; #else - word32 W[SHA256_BLOCK_SIZE]; + word32 W[WC_SHA256_BLOCK_SIZE]; #endif /* Copy context->state[] to working vars */ @@ -576,10 +576,10 @@ static int InitSha256(Sha256* sha256) for (i = 0; i < 16; i++) W[i] = sha256->buffer[i]; - for (i = 16; i < SHA256_BLOCK_SIZE; i++) + for (i = 16; i < WC_SHA256_BLOCK_SIZE; i++) W[i] = Gamma1(W[i-2]) + W[i-7] + Gamma0(W[i-15]) + W[i-16]; - for (i = 0; i < SHA256_BLOCK_SIZE; i += 8) { + for (i = 0; i < WC_SHA256_BLOCK_SIZE; i += 8) { RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],i+0); RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],i+1); RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],i+2); @@ -606,7 +606,7 @@ static int InitSha256(Sha256* sha256) #if defined(XTRANSFORM) || defined(STM32_HASH) -static INLINE void AddLength(Sha256* sha256, word32 len) +static INLINE void AddLength(wc_Sha256* sha256, word32 len) { word32 tmp = sha256->loLen; if ( (sha256->loLen += len) < tmp) @@ -617,7 +617,7 @@ static INLINE void AddLength(Sha256* sha256, word32 len) #ifdef XTRANSFORM - static INLINE int Sha256Update(Sha256* sha256, const byte* data, word32 len) + static INLINE int Sha256Update(wc_Sha256* sha256, const byte* data, word32 len) { int ret = 0; byte* local; @@ -638,27 +638,27 @@ static INLINE void AddLength(Sha256* sha256, word32 len) local = (byte*)sha256->buffer; /* check that internal buffLen is valid */ - if (sha256->buffLen >= SHA256_BLOCK_SIZE) + if (sha256->buffLen >= WC_SHA256_BLOCK_SIZE) return BUFFER_E; SAVE_XMM_YMM; /* for Intel AVX */ while (len) { - word32 add = min(len, SHA256_BLOCK_SIZE - sha256->buffLen); + word32 add = min(len, WC_SHA256_BLOCK_SIZE - sha256->buffLen); XMEMCPY(&local[sha256->buffLen], data, add); sha256->buffLen += add; data += add; len -= add; - if (sha256->buffLen == SHA256_BLOCK_SIZE) { + if (sha256->buffLen == WC_SHA256_BLOCK_SIZE) { #if defined(LITTLE_ENDIAN_ORDER) && !defined(FREESCALE_MMCAU_SHA) #if defined(HAVE_INTEL_AVX1) || defined(HAVE_INTEL_AVX2) if (!IS_INTEL_AVX1(intel_flags) && !IS_INTEL_AVX2(intel_flags)) #endif { ByteReverseWords(sha256->buffer, sha256->buffer, - SHA256_BLOCK_SIZE); + WC_SHA256_BLOCK_SIZE); } #endif ret = XTRANSFORM(sha256, local); @@ -666,7 +666,7 @@ static INLINE void AddLength(Sha256* sha256, word32 len) break; } - AddLength(sha256, SHA256_BLOCK_SIZE); + AddLength(sha256, WC_SHA256_BLOCK_SIZE); sha256->buffLen = 0; } } @@ -674,12 +674,12 @@ static INLINE void AddLength(Sha256* sha256, word32 len) return ret; } - int wc_Sha256Update(Sha256* sha256, const byte* data, word32 len) + int wc_Sha256Update(wc_Sha256* sha256, const byte* data, word32 len) { return Sha256Update(sha256, data, len); } - static INLINE int Sha256Final(Sha256* sha256) + static INLINE int Sha256Final(wc_Sha256* sha256) { int ret; @@ -695,10 +695,10 @@ static INLINE void AddLength(Sha256* sha256, word32 len) local[sha256->buffLen++] = 0x80; /* add 1 */ /* pad with zeros */ - if (sha256->buffLen > SHA256_PAD_SIZE) { + if (sha256->buffLen > WC_SHA256_PAD_SIZE) { XMEMSET(&local[sha256->buffLen], 0, - SHA256_BLOCK_SIZE - sha256->buffLen); - sha256->buffLen += SHA256_BLOCK_SIZE - sha256->buffLen; + WC_SHA256_BLOCK_SIZE - sha256->buffLen); + sha256->buffLen += WC_SHA256_BLOCK_SIZE - sha256->buffLen; { #if defined(LITTLE_ENDIAN_ORDER) && !defined(FREESCALE_MMCAU_SHA) @@ -707,7 +707,7 @@ static INLINE void AddLength(Sha256* sha256, word32 len) #endif { ByteReverseWords(sha256->buffer, sha256->buffer, - SHA256_BLOCK_SIZE); + WC_SHA256_BLOCK_SIZE); } #endif } @@ -718,7 +718,7 @@ static INLINE void AddLength(Sha256* sha256, word32 len) sha256->buffLen = 0; } - XMEMSET(&local[sha256->buffLen], 0, SHA256_PAD_SIZE - sha256->buffLen); + XMEMSET(&local[sha256->buffLen], 0, WC_SHA256_PAD_SIZE - sha256->buffLen); /* put lengths in bits */ sha256->hiLen = (sha256->loLen >> (8 * sizeof(sha256->loLen) - 3)) + @@ -732,12 +732,12 @@ static INLINE void AddLength(Sha256* sha256, word32 len) #endif { ByteReverseWords(sha256->buffer, sha256->buffer, - SHA256_BLOCK_SIZE); + WC_SHA256_BLOCK_SIZE); } #endif /* ! length ordering dependent on digest endian type ! */ - XMEMCPY(&local[SHA256_PAD_SIZE], &sha256->hiLen, sizeof(word32)); - XMEMCPY(&local[SHA256_PAD_SIZE + sizeof(word32)], &sha256->loLen, + XMEMCPY(&local[WC_SHA256_PAD_SIZE], &sha256->hiLen, sizeof(word32)); + XMEMCPY(&local[WC_SHA256_PAD_SIZE + sizeof(word32)], &sha256->loLen, sizeof(word32)); #if defined(FREESCALE_MMCAU_SHA) || defined(HAVE_INTEL_AVX1) || \ @@ -748,8 +748,8 @@ static INLINE void AddLength(Sha256* sha256, word32 len) #endif { ByteReverseWords( - &sha256->buffer[SHA256_PAD_SIZE / sizeof(word32)], - &sha256->buffer[SHA256_PAD_SIZE / sizeof(word32)], + &sha256->buffer[WC_SHA256_PAD_SIZE / sizeof(word32)], + &sha256->buffer[WC_SHA256_PAD_SIZE / sizeof(word32)], 2 * sizeof(word32)); } #endif @@ -757,7 +757,7 @@ static INLINE void AddLength(Sha256* sha256, word32 len) return XTRANSFORM(sha256, local); } - int wc_Sha256Final(Sha256* sha256, byte* hash) + int wc_Sha256Final(wc_Sha256* sha256, byte* hash) { int ret; @@ -769,7 +769,7 @@ static INLINE void AddLength(Sha256* sha256, word32 len) if (sha256->asyncDev.marker == WOLFSSL_ASYNC_MARKER_SHA256) { #if defined(HAVE_INTEL_QA) return IntelQaSymSha256(&sha256->asyncDev, hash, NULL, - SHA256_DIGEST_SIZE); + WC_SHA256_DIGEST_SIZE); #endif } #endif /* WOLFSSL_ASYNC_CRYPT */ @@ -779,9 +779,9 @@ static INLINE void AddLength(Sha256* sha256, word32 len) return ret; #if defined(LITTLE_ENDIAN_ORDER) - ByteReverseWords(sha256->digest, sha256->digest, SHA256_DIGEST_SIZE); + ByteReverseWords(sha256->digest, sha256->digest, WC_SHA256_DIGEST_SIZE); #endif - XMEMCPY(hash, sha256->digest, SHA256_DIGEST_SIZE); + XMEMCPY(hash, sha256->digest, WC_SHA256_DIGEST_SIZE); return InitSha256(sha256); /* reset state */ } @@ -1216,7 +1216,7 @@ __asm__ volatile("vmovdqu %0, %"#mask3 ::"m"(mSHUF_DC00[0])); #define BYTE_FLIP_MASK %xmm13 -static int Transform_AVX1(Sha256* sha256) +static int Transform_AVX1(wc_Sha256* sha256) { ALIGN32 word32 W_K[64]; /* temp for W+K */ @@ -1294,7 +1294,7 @@ static int Transform_AVX1(Sha256* sha256) } #if defined(HAVE_INTEL_RORX) -static int Transform_AVX1_RORX(Sha256* sha256) +static int Transform_AVX1_RORX(wc_Sha256* sha256) { ALIGN32 word32 W_K[64]; /* temp for W+K */ @@ -1561,7 +1561,7 @@ static int Transform_AVX1_RORX(Sha256* sha256) static const unsigned long mMAP3toW_I_2[] = { 0x8080808080808080, 0x8080808080808080, 0x8080808080808080, 0x0706050403020100 }; -static int Transform_AVX2(Sha256* sha256) +static int Transform_AVX2(wc_Sha256* sha256) { #ifdef WOLFSSL_SMALL_STACK word32* W_K; @@ -1942,7 +1942,7 @@ static int Transform_AVX2(Sha256* sha256) /* STM32 register size, bytes */ #ifdef WOLFSSL_STM32_CUBEMX - #define SHA224_REG_SIZE SHA224_BLOCK_SIZE + #define SHA224_REG_SIZE WC_SHA224_BLOCK_SIZE #else #define SHA224_REG_SIZE 4 /* STM32 struct notes: @@ -1953,7 +1953,7 @@ static int Transform_AVX2(Sha256* sha256) #endif #define SHA224_HW_TIMEOUT 0xFF - static int InitSha224(Sha224* sha224) + static int InitSha224(wc_Sha224* sha224) { if (sha224 == NULL) return BAD_FUNC_ARG; @@ -1990,7 +1990,7 @@ static int Transform_AVX2(Sha256* sha256) return 0; } - static int Sha224Update(Sha256* sha224, const byte* data, word32 len) + static int Sha224Update(wc_Sha256* sha224, const byte* data, word32 len) { int ret = 0; byte* local; @@ -2027,7 +2027,7 @@ static int Transform_AVX2(Sha256* sha256) return ret; } - static int Sha224Final(Sha256* sha224) + static int Sha224Final(wc_Sha256* sha224) { int ret = 0; @@ -2075,9 +2075,8 @@ static int Transform_AVX2(Sha256* sha256) #else - static int InitSha224(Sha224* sha224) + static int InitSha224(wc_Sha224* sha224) { - int ret = 0; if (sha224 == NULL) { @@ -2107,7 +2106,7 @@ static int Transform_AVX2(Sha256* sha256) #endif /* STM32_HASH */ - int wc_InitSha224_ex(Sha224* sha224, void* heap, int devId) + int wc_InitSha224_ex(wc_Sha224* sha224, void* heap, int devId) { int ret = 0; @@ -2130,12 +2129,12 @@ static int Transform_AVX2(Sha256* sha256) return ret; } - int wc_InitSha224(Sha224* sha224) + int wc_InitSha224(wc_Sha224* sha224) { return wc_InitSha224_ex(sha224, NULL, INVALID_DEVID); } - int wc_Sha224Update(Sha224* sha224, const byte* data, word32 len) + int wc_Sha224Update(wc_Sha224* sha224, const byte* data, word32 len) { int ret; @@ -2151,12 +2150,12 @@ static int Transform_AVX2(Sha256* sha256) } #endif /* WOLFSSL_ASYNC_CRYPT */ - ret = Sha256Update((Sha256*)sha224, data, len); + ret = Sha256Update((wc_Sha256*)sha224, data, len); return ret; } - int wc_Sha224Final(Sha224* sha224, byte* hash) + int wc_Sha224Final(wc_Sha224* sha224, byte* hash) { int ret; @@ -2168,24 +2167,24 @@ static int Transform_AVX2(Sha256* sha256) if (sha224->asyncDev.marker == WOLFSSL_ASYNC_MARKER_SHA224) { #if defined(HAVE_INTEL_QA) return IntelQaSymSha224(&sha224->asyncDev, hash, NULL, - SHA224_DIGEST_SIZE); + WC_SHA224_DIGEST_SIZE); #endif } #endif /* WOLFSSL_ASYNC_CRYPT */ - ret = Sha256Final((Sha256*)sha224); + ret = Sha256Final((wc_Sha256*)sha224); if (ret != 0) return ret; #if defined(LITTLE_ENDIAN_ORDER) && !defined(STM32_HASH) - ByteReverseWords(sha224->digest, sha224->digest, SHA224_DIGEST_SIZE); + ByteReverseWords(sha224->digest, sha224->digest, WC_SHA224_DIGEST_SIZE); #endif - XMEMCPY(hash, sha224->digest, SHA224_DIGEST_SIZE); + XMEMCPY(hash, sha224->digest, WC_SHA224_DIGEST_SIZE); return InitSha224(sha224); /* reset state */ } - void wc_Sha224Free(Sha224* sha224) + void wc_Sha224Free(wc_Sha224* sha224) { if (sha224 == NULL) return; @@ -2198,12 +2197,12 @@ static int Transform_AVX2(Sha256* sha256) #endif /* WOLFSSL_SHA224 */ -int wc_InitSha256(Sha256* sha256) +int wc_InitSha256(wc_Sha256* sha256) { return wc_InitSha256_ex(sha256, NULL, INVALID_DEVID); } -void wc_Sha256Free(Sha256* sha256) +void wc_Sha256Free(wc_Sha256* sha256) { if (sha256 == NULL) return; @@ -2219,10 +2218,10 @@ void wc_Sha256Free(Sha256* sha256) #ifndef WOLFSSL_TI_HASH #ifdef WOLFSSL_SHA224 - int wc_Sha224GetHash(Sha224* sha224, byte* hash) + int wc_Sha224GetHash(wc_Sha224* sha224, byte* hash) { int ret; - Sha224 tmpSha224; + wc_Sha224 tmpSha224; if (sha224 == NULL || hash == NULL) return BAD_FUNC_ARG; @@ -2233,14 +2232,14 @@ void wc_Sha256Free(Sha256* sha256) } return ret; } - int wc_Sha224Copy(Sha224* src, Sha224* dst) + int wc_Sha224Copy(wc_Sha224* src, wc_Sha224* dst) { int ret = 0; if (src == NULL || dst == NULL) return BAD_FUNC_ARG; - XMEMCPY(dst, src, sizeof(Sha224)); + XMEMCPY(dst, src, sizeof(wc_Sha224)); #ifdef WOLFSSL_ASYNC_CRYPT ret = wolfAsync_DevCopy(&src->asyncDev, &dst->asyncDev); @@ -2250,10 +2249,10 @@ void wc_Sha256Free(Sha256* sha256) } #endif /* WOLFSSL_SHA224 */ -int wc_Sha256GetHash(Sha256* sha256, byte* hash) +int wc_Sha256GetHash(wc_Sha256* sha256, byte* hash) { int ret; - Sha256 tmpSha256; + wc_Sha256 tmpSha256; if (sha256 == NULL || hash == NULL) return BAD_FUNC_ARG; @@ -2264,14 +2263,14 @@ int wc_Sha256GetHash(Sha256* sha256, byte* hash) } return ret; } -int wc_Sha256Copy(Sha256* src, Sha256* dst) +int wc_Sha256Copy(wc_Sha256* src, wc_Sha256* dst) { int ret = 0; if (src == NULL || dst == NULL) return BAD_FUNC_ARG; - XMEMCPY(dst, src, sizeof(Sha256)); + XMEMCPY(dst, src, sizeof(wc_Sha256)); #ifdef WOLFSSL_ASYNC_CRYPT ret = wolfAsync_DevCopy(&src->asyncDev, &dst->asyncDev); diff --git a/wolfcrypt/src/sha512.c b/wolfcrypt/src/sha512.c index f41eb9bb2..f8e82db1f 100755 --- a/wolfcrypt/src/sha512.c +++ b/wolfcrypt/src/sha512.c @@ -33,7 +33,7 @@ /* fips wrapper calls, user can call direct */ #ifdef HAVE_FIPS - int wc_InitSha512(Sha512* sha) + int wc_InitSha512(wc_Sha512* sha) { if (sha == NULL) { return BAD_FUNC_ARG; @@ -41,7 +41,7 @@ return InitSha512_fips(sha); } - int wc_InitSha512_ex(Sha512* sha, void* heap, int devId) + int wc_InitSha512_ex(wc_Sha512* sha, void* heap, int devId) { (void)heap; (void)devId; @@ -50,7 +50,7 @@ } return InitSha512_fips(sha); } - int wc_Sha512Update(Sha512* sha, const byte* data, word32 len) + int wc_Sha512Update(wc_Sha512* sha, const byte* data, word32 len) { if (sha == NULL || (data == NULL && len > 0)) { return BAD_FUNC_ARG; @@ -58,7 +58,7 @@ return Sha512Update_fips(sha, data, len); } - int wc_Sha512Final(Sha512* sha, byte* out) + int wc_Sha512Final(wc_Sha512* sha, byte* out) { if (sha == NULL || out == NULL) { return BAD_FUNC_ARG; @@ -66,21 +66,21 @@ return Sha512Final_fips(sha, out); } - void wc_Sha512Free(Sha512* sha) + void wc_Sha512Free(wc_Sha512* sha) { (void)sha; /* Not supported in FIPS */ } #if defined(WOLFSSL_SHA384) || defined(HAVE_AESGCM) - int wc_InitSha384(Sha384* sha) + int wc_InitSha384(wc_Sha384* sha) { if (sha == NULL) { return BAD_FUNC_ARG; } return InitSha384_fips(sha); } - int wc_InitSha384_ex(Sha384* sha, void* heap, int devId) + int wc_InitSha384_ex(wc_Sha384* sha, void* heap, int devId) { (void)heap; (void)devId; @@ -89,21 +89,21 @@ } return InitSha384_fips(sha); } - int wc_Sha384Update(Sha384* sha, const byte* data, word32 len) + int wc_Sha384Update(wc_Sha384* sha, const byte* data, word32 len) { if (sha == NULL || (data == NULL && len > 0)) { return BAD_FUNC_ARG; } return Sha384Update_fips(sha, data, len); } - int wc_Sha384Final(Sha384* sha, byte* out) + int wc_Sha384Final(wc_Sha384* sha, byte* out) { if (sha == NULL || out == NULL) { return BAD_FUNC_ARG; } return Sha384Final_fips(sha, out); } - void wc_Sha384Free(Sha384* sha) + void wc_Sha384Free(wc_Sha384* sha) { (void)sha; /* Not supported in FIPS */ @@ -166,7 +166,7 @@ } #endif -static int InitSha512(Sha512* sha512) +static int InitSha512(wc_Sha512* sha512) { if (sha512 == NULL) return BAD_FUNC_ARG; @@ -199,7 +199,7 @@ static int InitSha512(Sha512* sha512) #define HAVE_INTEL_AVX2 #endif - int InitSha512(Sha512* sha512) { + int InitSha512(wc_Sha512* sha512) { Save/Recover XMM, YMM ... @@ -261,16 +261,16 @@ static int InitSha512(Sha512* sha512) */ #if defined(HAVE_INTEL_AVX1) - static int Transform_AVX1(Sha512 *sha512); + static int Transform_AVX1(wc_Sha512 *sha512); #endif #if defined(HAVE_INTEL_AVX2) - static int Transform_AVX2(Sha512 *sha512); + static int Transform_AVX2(wc_Sha512 *sha512); #if defined(HAVE_INTEL_AVX1) && defined(HAVE_INTEL_AVX2) && defined(HAVE_INTEL_RORX) - static int Transform_AVX1_RORX(Sha512 *sha512); + static int Transform_AVX1_RORX(wc_Sha512 *sha512); #endif #endif - static int _Transform(Sha512 *sha512); - static int (*Transform_p)(Sha512* sha512) = _Transform; + static int _Transform(wc_Sha512 *sha512); + static int (*Transform_p)(wc_Sha512* sha512) = _Transform; static int transform_check = 0; static int intel_flags; #define Transform(sha512) (*Transform_p)(sha512) @@ -314,7 +314,7 @@ static int InitSha512(Sha512* sha512) transform_check = 1; } - int wc_InitSha512_ex(Sha512* sha512, void* heap, int devId) + int wc_InitSha512_ex(wc_Sha512* sha512, void* heap, int devId) { int ret = InitSha512(sha512); @@ -329,7 +329,7 @@ static int InitSha512(Sha512* sha512) #else #define Transform(sha512) _Transform(sha512) - int wc_InitSha512_ex(Sha512* sha512, void* heap, int devId) + int wc_InitSha512_ex(wc_Sha512* sha512, void* heap, int devId) { int ret = 0; @@ -427,7 +427,7 @@ static const word64 K512[80] = { #define R(i) h(i)+=S1(e(i))+Ch(e(i),f(i),g(i))+K[i+j]+(j?blk2(i):blk0(i));\ d(i)+=h(i);h(i)+=S0(a(i))+Maj(a(i),b(i),c(i)) -static int _Transform(Sha512* sha512) +static int _Transform(wc_Sha512* sha512) { const word64* K = K512; @@ -489,48 +489,48 @@ static int _Transform(Sha512* sha512) } -static INLINE void AddLength(Sha512* sha512, word32 len) +static INLINE void AddLength(wc_Sha512* sha512, word32 len) { word64 tmp = sha512->loLen; if ( (sha512->loLen += len) < tmp) sha512->hiLen++; /* carry low to high */ } -static INLINE int Sha512Update(Sha512* sha512, const byte* data, word32 len) +static INLINE int Sha512Update(wc_Sha512* sha512, const byte* data, word32 len) { int ret = 0; /* do block size increments */ byte* local = (byte*)sha512->buffer; /* check that internal buffLen is valid */ - if (sha512->buffLen >= SHA512_BLOCK_SIZE) + if (sha512->buffLen >= WC_SHA512_BLOCK_SIZE) return BUFFER_E; SAVE_XMM_YMM; /* for Intel AVX */ while (len) { - word32 add = min(len, SHA512_BLOCK_SIZE - sha512->buffLen); + word32 add = min(len, WC_SHA512_BLOCK_SIZE - sha512->buffLen); XMEMCPY(&local[sha512->buffLen], data, add); sha512->buffLen += add; data += add; len -= add; - if (sha512->buffLen == SHA512_BLOCK_SIZE) { + if (sha512->buffLen == WC_SHA512_BLOCK_SIZE) { #if defined(LITTLE_ENDIAN_ORDER) #if defined(HAVE_INTEL_AVX1) || defined(HAVE_INTEL_AVX2) if (!IS_INTEL_AVX1(intel_flags) && !IS_INTEL_AVX2(intel_flags)) #endif { ByteReverseWords64(sha512->buffer, sha512->buffer, - SHA512_BLOCK_SIZE); + WC_SHA512_BLOCK_SIZE); } #endif ret = Transform(sha512); if (ret != 0) break; - AddLength(sha512, SHA512_BLOCK_SIZE); + AddLength(sha512, WC_SHA512_BLOCK_SIZE); sha512->buffLen = 0; } } @@ -538,7 +538,7 @@ static INLINE int Sha512Update(Sha512* sha512, const byte* data, word32 len) return ret; } -int wc_Sha512Update(Sha512* sha512, const byte* data, word32 len) +int wc_Sha512Update(wc_Sha512* sha512, const byte* data, word32 len) { if (sha512 == NULL || (data == NULL && len > 0)) { return BAD_FUNC_ARG; @@ -556,7 +556,7 @@ int wc_Sha512Update(Sha512* sha512, const byte* data, word32 len) } -static INLINE int Sha512Final(Sha512* sha512) +static INLINE int Sha512Final(wc_Sha512* sha512) { byte* local = (byte*)sha512->buffer; int ret; @@ -571,16 +571,16 @@ static INLINE int Sha512Final(Sha512* sha512) local[sha512->buffLen++] = 0x80; /* add 1 */ /* pad with zeros */ - if (sha512->buffLen > SHA512_PAD_SIZE) { - XMEMSET(&local[sha512->buffLen], 0, SHA512_BLOCK_SIZE - sha512->buffLen); - sha512->buffLen += SHA512_BLOCK_SIZE - sha512->buffLen; + if (sha512->buffLen > WC_SHA512_PAD_SIZE) { + XMEMSET(&local[sha512->buffLen], 0, WC_SHA512_BLOCK_SIZE - sha512->buffLen); + sha512->buffLen += WC_SHA512_BLOCK_SIZE - sha512->buffLen; #if defined(LITTLE_ENDIAN_ORDER) #if defined(HAVE_INTEL_AVX1) || defined(HAVE_INTEL_AVX2) if (!IS_INTEL_AVX1(intel_flags) && !IS_INTEL_AVX2(intel_flags)) #endif { ByteReverseWords64(sha512->buffer,sha512->buffer, - SHA512_BLOCK_SIZE); + WC_SHA512_BLOCK_SIZE); } #endif /* LITTLE_ENDIAN_ORDER */ ret = Transform(sha512); @@ -589,7 +589,7 @@ static INLINE int Sha512Final(Sha512* sha512) sha512->buffLen = 0; } - XMEMSET(&local[sha512->buffLen], 0, SHA512_PAD_SIZE - sha512->buffLen); + XMEMSET(&local[sha512->buffLen], 0, WC_SHA512_PAD_SIZE - sha512->buffLen); /* put lengths in bits */ sha512->hiLen = (sha512->loLen >> (8 * sizeof(sha512->loLen) - 3)) + @@ -601,30 +601,30 @@ static INLINE int Sha512Final(Sha512* sha512) #if defined(HAVE_INTEL_AVX1) || defined(HAVE_INTEL_AVX2) if (!IS_INTEL_AVX1(intel_flags) && !IS_INTEL_AVX2(intel_flags)) #endif - ByteReverseWords64(sha512->buffer, sha512->buffer, SHA512_PAD_SIZE); + ByteReverseWords64(sha512->buffer, sha512->buffer, WC_SHA512_PAD_SIZE); #endif /* ! length ordering dependent on digest endian type ! */ - sha512->buffer[SHA512_BLOCK_SIZE / sizeof(word64) - 2] = sha512->hiLen; - sha512->buffer[SHA512_BLOCK_SIZE / sizeof(word64) - 1] = sha512->loLen; + sha512->buffer[WC_SHA512_BLOCK_SIZE / sizeof(word64) - 2] = sha512->hiLen; + sha512->buffer[WC_SHA512_BLOCK_SIZE / sizeof(word64) - 1] = sha512->loLen; #if defined(HAVE_INTEL_AVX1) || defined(HAVE_INTEL_AVX2) if (IS_INTEL_AVX1(intel_flags) || IS_INTEL_AVX2(intel_flags)) - ByteReverseWords64(&(sha512->buffer[SHA512_BLOCK_SIZE / sizeof(word64) - 2]), - &(sha512->buffer[SHA512_BLOCK_SIZE / sizeof(word64) - 2]), - SHA512_BLOCK_SIZE - SHA512_PAD_SIZE); + ByteReverseWords64(&(sha512->buffer[WC_SHA512_BLOCK_SIZE / sizeof(word64) - 2]), + &(sha512->buffer[WC_SHA512_BLOCK_SIZE / sizeof(word64) - 2]), + WC_SHA512_BLOCK_SIZE - WC_SHA512_PAD_SIZE); #endif ret = Transform(sha512); if (ret != 0) return ret; #ifdef LITTLE_ENDIAN_ORDER - ByteReverseWords64(sha512->digest, sha512->digest, SHA512_DIGEST_SIZE); + ByteReverseWords64(sha512->digest, sha512->digest, WC_SHA512_DIGEST_SIZE); #endif return 0; } -int wc_Sha512Final(Sha512* sha512, byte* hash) +int wc_Sha512Final(wc_Sha512* sha512, byte* hash) { int ret; @@ -636,7 +636,7 @@ int wc_Sha512Final(Sha512* sha512, byte* hash) if (sha512->asyncDev.marker == WOLFSSL_ASYNC_MARKER_SHA512) { #if defined(HAVE_INTEL_QA) return IntelQaSymSha512(&sha512->asyncDev, hash, NULL, - SHA512_DIGEST_SIZE); + WC_SHA512_DIGEST_SIZE); #endif } #endif /* WOLFSSL_ASYNC_CRYPT */ @@ -645,18 +645,18 @@ int wc_Sha512Final(Sha512* sha512, byte* hash) if (ret != 0) return ret; - XMEMCPY(hash, sha512->digest, SHA512_DIGEST_SIZE); + XMEMCPY(hash, sha512->digest, WC_SHA512_DIGEST_SIZE); return InitSha512(sha512); /* reset state */ } -int wc_InitSha512(Sha512* sha512) +int wc_InitSha512(wc_Sha512* sha512) { return wc_InitSha512_ex(sha512, NULL, INVALID_DEVID); } -void wc_Sha512Free(Sha512* sha512) +void wc_Sha512Free(wc_Sha512* sha512) { if (sha512 == NULL) return; @@ -1036,7 +1036,7 @@ static const unsigned long mBYTE_FLIP_MASK_Y[] = /*** Transform Body ***/ #if defined(HAVE_INTEL_AVX1) -static int Transform_AVX1(Sha512* sha512) +static int Transform_AVX1(wc_Sha512* sha512) { const word64* K = K512; word64 W_X[16+4] = {0}; @@ -1090,7 +1090,7 @@ static int Transform_AVX1(Sha512* sha512) #endif /* HAVE_INTEL_AVX1 */ #if defined(HAVE_INTEL_AVX2) && defined(HAVE_INTEL_AVX1) && defined(HAVE_INTEL_RORX) -static int Transform_AVX1_RORX(Sha512* sha512) +static int Transform_AVX1_RORX(wc_Sha512* sha512) { const word64* K = K512; word64 W_X[16+4] = {0}; @@ -1269,7 +1269,7 @@ static INLINE void Block_Y_12_11(void) { Block_Y_xx_11(12, W_12y, W_0y, W_4y, W_ static INLINE void Block_Y_12_12(word64 *w) { Block_Y_xx_12(12, W_12y, W_0y, W_4y, W_8y); } -static int Transform_AVX2(Sha512* sha512) +static int Transform_AVX2(wc_Sha512* sha512) { const word64* K = K512; word64 w[4]; @@ -1345,7 +1345,7 @@ static int Transform_AVX2(Sha512* sha512) /* SHA384 */ /* -------------------------------------------------------------------------- */ #ifdef WOLFSSL_SHA384 -static int InitSha384(Sha384* sha384) +static int InitSha384(wc_Sha384* sha384) { if (sha384 == NULL) { return BAD_FUNC_ARG; @@ -1367,7 +1367,7 @@ static int InitSha384(Sha384* sha384) return 0; } -int wc_Sha384Update(Sha384* sha384, const byte* data, word32 len) +int wc_Sha384Update(wc_Sha384* sha384, const byte* data, word32 len) { if (sha384 == NULL || (data == NULL && len > 0)) { return BAD_FUNC_ARG; @@ -1381,11 +1381,11 @@ int wc_Sha384Update(Sha384* sha384, const byte* data, word32 len) } #endif /* WOLFSSL_ASYNC_CRYPT */ - return Sha512Update((Sha512*)sha384, data, len); + return Sha512Update((wc_Sha512*)sha384, data, len); } -int wc_Sha384Final(Sha384* sha384, byte* hash) +int wc_Sha384Final(wc_Sha384* sha384, byte* hash) { int ret; @@ -1397,16 +1397,16 @@ int wc_Sha384Final(Sha384* sha384, byte* hash) if (sha384->asyncDev.marker == WOLFSSL_ASYNC_MARKER_SHA384) { #if defined(HAVE_INTEL_QA) return IntelQaSymSha384(&sha384->asyncDev, hash, NULL, - SHA384_DIGEST_SIZE); + WC_SHA384_DIGEST_SIZE); #endif } #endif /* WOLFSSL_ASYNC_CRYPT */ - ret = Sha512Final((Sha512*)sha384); + ret = Sha512Final((wc_Sha512*)sha384); if (ret != 0) return ret; - XMEMCPY(hash, sha384->digest, SHA384_DIGEST_SIZE); + XMEMCPY(hash, sha384->digest, WC_SHA384_DIGEST_SIZE); return InitSha384(sha384); /* reset state */ } @@ -1414,7 +1414,7 @@ int wc_Sha384Final(Sha384* sha384, byte* hash) /* Hardware Acceleration */ #if defined(HAVE_INTEL_AVX1) || defined(HAVE_INTEL_AVX2) - int wc_InitSha384_ex(Sha384* sha384, void* heap, int devId) + int wc_InitSha384_ex(wc_Sha384* sha384, void* heap, int devId) { int ret = InitSha384(sha384); @@ -1426,7 +1426,7 @@ int wc_Sha384Final(Sha384* sha384, byte* hash) return ret; } #else -int wc_InitSha384_ex(Sha384* sha384, void* heap, int devId) +int wc_InitSha384_ex(wc_Sha384* sha384, void* heap, int devId) { int ret; @@ -1450,12 +1450,12 @@ int wc_InitSha384_ex(Sha384* sha384, void* heap, int devId) } #endif -int wc_InitSha384(Sha384* sha384) +int wc_InitSha384(wc_Sha384* sha384) { return wc_InitSha384_ex(sha384, NULL, INVALID_DEVID); } -void wc_Sha384Free(Sha384* sha384) +void wc_Sha384Free(wc_Sha384* sha384) { if (sha384 == NULL) return; @@ -1470,10 +1470,10 @@ void wc_Sha384Free(Sha384* sha384) #endif /* HAVE_FIPS */ -int wc_Sha512GetHash(Sha512* sha512, byte* hash) +int wc_Sha512GetHash(wc_Sha512* sha512, byte* hash) { int ret; - Sha512 tmpSha512; + wc_Sha512 tmpSha512; if (sha512 == NULL || hash == NULL) return BAD_FUNC_ARG; @@ -1485,14 +1485,14 @@ int wc_Sha512GetHash(Sha512* sha512, byte* hash) return ret; } -int wc_Sha512Copy(Sha512* src, Sha512* dst) +int wc_Sha512Copy(wc_Sha512* src, wc_Sha512* dst) { int ret = 0; if (src == NULL || dst == NULL) return BAD_FUNC_ARG; - XMEMCPY(dst, src, sizeof(Sha512)); + XMEMCPY(dst, src, sizeof(wc_Sha512)); #ifdef WOLFSSL_ASYNC_CRYPT ret = wolfAsync_DevCopy(&src->asyncDev, &dst->asyncDev); @@ -1502,10 +1502,10 @@ int wc_Sha512Copy(Sha512* src, Sha512* dst) } #ifdef WOLFSSL_SHA384 -int wc_Sha384GetHash(Sha384* sha384, byte* hash) +int wc_Sha384GetHash(wc_Sha384* sha384, byte* hash) { int ret; - Sha384 tmpSha384; + wc_Sha384 tmpSha384; if (sha384 == NULL || hash == NULL) return BAD_FUNC_ARG; @@ -1516,14 +1516,14 @@ int wc_Sha384GetHash(Sha384* sha384, byte* hash) } return ret; } -int wc_Sha384Copy(Sha384* src, Sha384* dst) +int wc_Sha384Copy(wc_Sha384* src, wc_Sha384* dst) { int ret = 0; if (src == NULL || dst == NULL) return BAD_FUNC_ARG; - XMEMCPY(dst, src, sizeof(Sha384)); + XMEMCPY(dst, src, sizeof(wc_Sha384)); #ifdef WOLFSSL_ASYNC_CRYPT ret = wolfAsync_DevCopy(&src->asyncDev, &dst->asyncDev); diff --git a/wolfcrypt/src/srp.c b/wolfcrypt/src/srp.c index a889b0575..ab45a0f49 100644 --- a/wolfcrypt/src/srp.c +++ b/wolfcrypt/src/srp.c @@ -157,28 +157,28 @@ static word32 SrpHashSize(SrpType type) switch (type) { case SRP_TYPE_SHA: #ifndef NO_SHA - return SHA_DIGEST_SIZE; + return WC_SHA_DIGEST_SIZE; #else return 0; #endif case SRP_TYPE_SHA256: #ifndef NO_SHA256 - return SHA256_DIGEST_SIZE; + return WC_SHA256_DIGEST_SIZE; #else return 0; #endif case SRP_TYPE_SHA384: #ifdef WOLFSSL_SHA384 - return SHA384_DIGEST_SIZE; + return WC_SHA384_DIGEST_SIZE; #else return 0; #endif case SRP_TYPE_SHA512: #ifdef WOLFSSL_SHA512 - return SHA512_DIGEST_SIZE; + return WC_SHA512_DIGEST_SIZE; #else return 0; #endif diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index e46a2ee9c..f2e587c55 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -1185,9 +1185,9 @@ int md2_test(void) int md5_test(void) { int ret = 0; - Md5 md5; - byte hash[MD5_DIGEST_SIZE]; - byte hashcopy[MD5_DIGEST_SIZE]; + wc_Md5 md5; + byte hash[WC_MD5_DIGEST_SIZE]; + byte hashcopy[WC_MD5_DIGEST_SIZE]; testVector a, b, c, d, e, f; testVector test_md5[6]; int times = sizeof(test_md5) / sizeof(testVector), i; @@ -1196,39 +1196,39 @@ int md5_test(void) a.output = "\xd4\x1d\x8c\xd9\x8f\x00\xb2\x04\xe9\x80\x09\x98\xec\xf8\x42" "\x7e"; a.inLen = XSTRLEN(a.input); - a.outLen = MD5_DIGEST_SIZE; + a.outLen = WC_MD5_DIGEST_SIZE; b.input = "abc"; b.output = "\x90\x01\x50\x98\x3c\xd2\x4f\xb0\xd6\x96\x3f\x7d\x28\xe1\x7f" "\x72"; b.inLen = XSTRLEN(b.input); - b.outLen = MD5_DIGEST_SIZE; + b.outLen = WC_MD5_DIGEST_SIZE; c.input = "message digest"; c.output = "\xf9\x6b\x69\x7d\x7c\xb7\x93\x8d\x52\x5a\x2f\x31\xaa\xf1\x61" "\xd0"; c.inLen = XSTRLEN(c.input); - c.outLen = MD5_DIGEST_SIZE; + c.outLen = WC_MD5_DIGEST_SIZE; d.input = "abcdefghijklmnopqrstuvwxyz"; d.output = "\xc3\xfc\xd3\xd7\x61\x92\xe4\x00\x7d\xfb\x49\x6c\xca\x67\xe1" "\x3b"; d.inLen = XSTRLEN(d.input); - d.outLen = MD5_DIGEST_SIZE; + d.outLen = WC_MD5_DIGEST_SIZE; e.input = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz012345" "6789"; e.output = "\xd1\x74\xab\x98\xd2\x77\xd9\xf5\xa5\x61\x1c\x2c\x9f\x41\x9d" "\x9f"; e.inLen = XSTRLEN(e.input); - e.outLen = MD5_DIGEST_SIZE; + e.outLen = WC_MD5_DIGEST_SIZE; f.input = "1234567890123456789012345678901234567890123456789012345678" "9012345678901234567890"; f.output = "\x57\xed\xf4\xa2\x2b\xe3\xc9\x55\xac\x49\xda\x2e\x21\x07\xb6" "\x7a"; f.inLen = XSTRLEN(f.input); - f.outLen = MD5_DIGEST_SIZE; + f.outLen = WC_MD5_DIGEST_SIZE; test_md5[0] = a; test_md5[1] = b; @@ -1255,10 +1255,10 @@ int md5_test(void) if (ret != 0) ERROR_OUT(-1530 - i, exit); - if (XMEMCMP(hash, test_md5[i].output, MD5_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_md5[i].output, WC_MD5_DIGEST_SIZE) != 0) ERROR_OUT(-1540 - i, exit); - if (XMEMCMP(hash, hashcopy, MD5_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, hashcopy, WC_MD5_DIGEST_SIZE) != 0) ERROR_OUT(-1550 - i, exit); } @@ -1283,7 +1283,7 @@ int md5_test(void) ret = wc_Md5Final(&md5, hash); if (ret != 0) ERROR_OUT(-1561, exit); - if (XMEMCMP(hash, large_digest, MD5_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, large_digest, WC_MD5_DIGEST_SIZE) != 0) ERROR_OUT(-1562, exit); } /* END LARGE HASH TEST */ @@ -1379,9 +1379,9 @@ int md4_test(void) int sha_test(void) { int ret = 0; - Sha sha; - byte hash[SHA_DIGEST_SIZE]; - byte hashcopy[SHA_DIGEST_SIZE]; + wc_Sha sha; + byte hash[WC_SHA_DIGEST_SIZE]; + byte hashcopy[WC_SHA_DIGEST_SIZE]; testVector a, b, c, d, e; testVector test_sha[5]; int times = sizeof(test_sha) / sizeof(struct testVector), i; @@ -1390,26 +1390,26 @@ int sha_test(void) a.output = "\xda\x39\xa3\xee\x5e\x6b\x4b\x0d\x32\x55\xbf\xef\x95\x60\x18" "\x90\xaf\xd8\x07\x09"; a.inLen = XSTRLEN(a.input); - a.outLen = SHA_DIGEST_SIZE; + a.outLen = WC_SHA_DIGEST_SIZE; b.input = "abc"; b.output = "\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2" "\x6C\x9C\xD0\xD8\x9D"; b.inLen = XSTRLEN(b.input); - b.outLen = SHA_DIGEST_SIZE; + b.outLen = WC_SHA_DIGEST_SIZE; c.input = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"; c.output = "\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29" "\xE5\xE5\x46\x70\xF1"; c.inLen = XSTRLEN(c.input); - c.outLen = SHA_DIGEST_SIZE; + c.outLen = WC_SHA_DIGEST_SIZE; d.input = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaa"; d.output = "\x00\x98\xBA\x82\x4B\x5C\x16\x42\x7B\xD7\xA1\x12\x2A\x5A\x44" "\x2A\x25\xEC\x64\x4D"; d.inLen = XSTRLEN(d.input); - d.outLen = SHA_DIGEST_SIZE; + d.outLen = WC_SHA_DIGEST_SIZE; e.input = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" @@ -1417,7 +1417,7 @@ int sha_test(void) e.output = "\xAD\x5B\x3F\xDB\xCB\x52\x67\x78\xC2\x83\x9D\x2F\x15\x1E\xA7" "\x53\x99\x5E\x26\xA0"; e.inLen = XSTRLEN(e.input); - e.outLen = SHA_DIGEST_SIZE; + e.outLen = WC_SHA_DIGEST_SIZE; test_sha[0] = a; test_sha[1] = b; @@ -1441,9 +1441,9 @@ int sha_test(void) if (ret != 0) ERROR_OUT(-1730 - i, exit); - if (XMEMCMP(hash, test_sha[i].output, SHA_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_sha[i].output, WC_SHA_DIGEST_SIZE) != 0) ERROR_OUT(-1740 - i, exit); - if (XMEMCMP(hash, hashcopy, SHA_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, hashcopy, WC_SHA_DIGEST_SIZE) != 0) ERROR_OUT(-1750 - i, exit); } @@ -1469,7 +1469,7 @@ int sha_test(void) ret = wc_ShaFinal(&sha, hash); if (ret != 0) ERROR_OUT(-1761, exit); - if (XMEMCMP(hash, large_digest, SHA_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, large_digest, WC_SHA_DIGEST_SIZE) != 0) ERROR_OUT(-1762, exit); } /* END LARGE HASH TEST */ @@ -1626,32 +1626,32 @@ int blake2b_test(void) #ifdef WOLFSSL_SHA224 int sha224_test(void) { - Sha224 sha; - byte hash[SHA224_DIGEST_SIZE]; - byte hashcopy[SHA224_DIGEST_SIZE]; + wc_Sha224 sha; + byte hash[WC_SHA224_DIGEST_SIZE]; + byte hashcopy[WC_SHA224_DIGEST_SIZE]; + int ret = 0; testVector a, b, c; testVector test_sha[3]; - int ret = 0; int times = sizeof(test_sha) / sizeof(struct testVector), i; a.input = ""; a.output = "\xd1\x4a\x02\x8c\x2a\x3a\x2b\xc9\x47\x61\x02\xbb\x28\x82\x34" "\xc4\x15\xa2\xb0\x1f\x82\x8e\xa6\x2a\xc5\xb3\xe4\x2f"; a.inLen = XSTRLEN(a.input); - a.outLen = SHA224_DIGEST_SIZE; + a.outLen = WC_SHA224_DIGEST_SIZE; b.input = "abc"; b.output = "\x23\x09\x7d\x22\x34\x05\xd8\x22\x86\x42\xa4\x77\xbd\xa2\x55" "\xb3\x2a\xad\xbc\xe4\xbd\xa0\xb3\xf7\xe3\x6c\x9d\xa7"; b.inLen = XSTRLEN(b.input); - b.outLen = SHA224_DIGEST_SIZE; + b.outLen = WC_SHA224_DIGEST_SIZE; c.input = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"; c.output = "\x75\x38\x8b\x16\x51\x27\x76\xcc\x5d\xba\x5d\xa1\xfd\x89\x01" "\x50\xb0\xc6\x45\x5c\xb4\xf5\x8b\x19\x52\x52\x25\x25"; c.inLen = XSTRLEN(c.input); - c.outLen = SHA224_DIGEST_SIZE; + c.outLen = WC_SHA224_DIGEST_SIZE; test_sha[0] = a; test_sha[1] = b; @@ -1673,9 +1673,9 @@ int sha224_test(void) if (ret != 0) ERROR_OUT(-2030 - i, exit); - if (XMEMCMP(hash, test_sha[i].output, SHA224_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_sha[i].output, WC_SHA224_DIGEST_SIZE) != 0) ERROR_OUT(-2040 - i, exit); - if (XMEMCMP(hash, hashcopy, SHA224_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, hashcopy, WC_SHA224_DIGEST_SIZE) != 0) ERROR_OUT(-2050 - i, exit); } @@ -1690,10 +1690,11 @@ exit: #ifndef NO_SHA256 int sha256_test(void) { - int ret = 0; - Sha256 sha; - byte hash[SHA256_DIGEST_SIZE]; - byte hashcopy[SHA256_DIGEST_SIZE]; + wc_Sha256 sha; + byte hash[WC_SHA256_DIGEST_SIZE]; + byte hashcopy[WC_SHA256_DIGEST_SIZE]; + int ret = 0; + testVector a, b, c; testVector test_sha[3]; int times = sizeof(test_sha) / sizeof(struct testVector), i; @@ -1703,21 +1704,21 @@ int sha256_test(void) "\x24\x27\xae\x41\xe4\x64\x9b\x93\x4c\xa4\x95\x99\x1b\x78\x52" "\xb8\x55"; a.inLen = XSTRLEN(a.input); - a.outLen = SHA256_DIGEST_SIZE; + a.outLen = WC_SHA256_DIGEST_SIZE; b.input = "abc"; b.output = "\xBA\x78\x16\xBF\x8F\x01\xCF\xEA\x41\x41\x40\xDE\x5D\xAE\x22" "\x23\xB0\x03\x61\xA3\x96\x17\x7A\x9C\xB4\x10\xFF\x61\xF2\x00" "\x15\xAD"; b.inLen = XSTRLEN(b.input); - b.outLen = SHA256_DIGEST_SIZE; + b.outLen = WC_SHA256_DIGEST_SIZE; c.input = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"; c.output = "\x24\x8D\x6A\x61\xD2\x06\x38\xB8\xE5\xC0\x26\x93\x0C\x3E\x60" "\x39\xA3\x3C\xE4\x59\x64\xFF\x21\x67\xF6\xEC\xED\xD4\x19\xDB" "\x06\xC1"; c.inLen = XSTRLEN(c.input); - c.outLen = SHA256_DIGEST_SIZE; + c.outLen = WC_SHA256_DIGEST_SIZE; test_sha[0] = a; test_sha[1] = b; @@ -1739,9 +1740,9 @@ int sha256_test(void) if (ret != 0) ERROR_OUT(-2130 - i, exit); - if (XMEMCMP(hash, test_sha[i].output, SHA256_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_sha[i].output, WC_SHA256_DIGEST_SIZE) != 0) ERROR_OUT(-2140 - i, exit); - if (XMEMCMP(hash, hashcopy, SHA256_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, hashcopy, WC_SHA256_DIGEST_SIZE) != 0) ERROR_OUT(-2150 - i, exit); } @@ -1767,7 +1768,7 @@ int sha256_test(void) ret = wc_Sha256Final(&sha, hash); if (ret != 0) ERROR_OUT(-2161, exit); - if (XMEMCMP(hash, large_digest, SHA256_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, large_digest, WC_SHA256_DIGEST_SIZE) != 0) ERROR_OUT(-2162, exit); } /* END LARGE HASH TEST */ @@ -1783,10 +1784,10 @@ exit: #ifdef WOLFSSL_SHA512 int sha512_test(void) { - Sha512 sha; - byte hash[SHA512_DIGEST_SIZE]; - byte hashcopy[SHA512_DIGEST_SIZE]; - int ret = 0; + wc_Sha512 sha; + byte hash[WC_SHA512_DIGEST_SIZE]; + byte hashcopy[WC_SHA512_DIGEST_SIZE]; + int ret = 0; testVector a, b, c; testVector test_sha[3]; @@ -1799,7 +1800,7 @@ int sha512_test(void) "\x7e\xec\x2f\x63\xb9\x31\xbd\x47\x41\x7a\x81\xa5\x38\x32\x7a" "\xf9\x27\xda\x3e"; a.inLen = XSTRLEN(a.input); - a.outLen = SHA512_DIGEST_SIZE; + a.outLen = WC_SHA512_DIGEST_SIZE; b.input = "abc"; b.output = "\xdd\xaf\x35\xa1\x93\x61\x7a\xba\xcc\x41\x73\x49\xae\x20\x41" @@ -1808,7 +1809,7 @@ int sha512_test(void) "\xfe\xeb\xbd\x45\x4d\x44\x23\x64\x3c\xe8\x0e\x2a\x9a\xc9\x4f" "\xa5\x4c\xa4\x9f"; b.inLen = XSTRLEN(b.input); - b.outLen = SHA512_DIGEST_SIZE; + b.outLen = WC_SHA512_DIGEST_SIZE; c.input = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhi" "jklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"; @@ -1818,7 +1819,7 @@ int sha512_test(void) "\xb5\x43\x3a\xc7\xd3\x29\xee\xb6\xdd\x26\x54\x5e\x96\xe5\x5b" "\x87\x4b\xe9\x09"; c.inLen = XSTRLEN(c.input); - c.outLen = SHA512_DIGEST_SIZE; + c.outLen = WC_SHA512_DIGEST_SIZE; test_sha[0] = a; test_sha[1] = b; @@ -1840,9 +1841,9 @@ int sha512_test(void) if (ret != 0) ERROR_OUT(-2230 - i, exit); - if (XMEMCMP(hash, test_sha[i].output, SHA512_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_sha[i].output, WC_SHA512_DIGEST_SIZE) != 0) ERROR_OUT(-2240 - i, exit); - if (XMEMCMP(hash, hashcopy, SHA512_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, hashcopy, WC_SHA512_DIGEST_SIZE) != 0) ERROR_OUT(-2250 - i, exit); } @@ -1867,7 +1868,7 @@ int sha512_test(void) ret = wc_Sha512Final(&sha, hash); if (ret != 0) ERROR_OUT(-2261, exit); - if (XMEMCMP(hash, large_digest, SHA512_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, large_digest, WC_SHA512_DIGEST_SIZE) != 0) ERROR_OUT(-2262, exit); } /* END LARGE HASH TEST */ @@ -1882,10 +1883,10 @@ exit: #ifdef WOLFSSL_SHA384 int sha384_test(void) { - Sha384 sha; - byte hash[SHA384_DIGEST_SIZE]; - byte hashcopy[SHA384_DIGEST_SIZE]; - int ret = 0; + wc_Sha384 sha; + byte hash[WC_SHA384_DIGEST_SIZE]; + byte hashcopy[WC_SHA384_DIGEST_SIZE]; + int ret = 0; testVector a, b, c; testVector test_sha[3]; @@ -1898,7 +1899,7 @@ int sha384_test(void) "\xe1\xda\x27\x4e\xde\xbf\xe7\x6f\x65\xfb\xd5\x1a\xd2\xf1\x48" "\x98\xb9\x5b"; a.inLen = XSTRLEN(a.input); - a.outLen = SHA384_DIGEST_SIZE; + a.outLen = WC_SHA384_DIGEST_SIZE; b.input = "abc"; b.output = "\xcb\x00\x75\x3f\x45\xa3\x5e\x8b\xb5\xa0\x3d\x69\x9a\xc6\x50" @@ -1906,7 +1907,7 @@ int sha384_test(void) "\x5b\xed\x80\x86\x07\x2b\xa1\xe7\xcc\x23\x58\xba\xec\xa1\x34" "\xc8\x25\xa7"; b.inLen = XSTRLEN(b.input); - b.outLen = SHA384_DIGEST_SIZE; + b.outLen = WC_SHA384_DIGEST_SIZE; c.input = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhi" "jklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"; @@ -1915,7 +1916,7 @@ int sha384_test(void) "\xf7\x12\xfc\xc7\xc7\x1a\x55\x7e\x2d\xb9\x66\xc3\xe9\xfa\x91" "\x74\x60\x39"; c.inLen = XSTRLEN(c.input); - c.outLen = SHA384_DIGEST_SIZE; + c.outLen = WC_SHA384_DIGEST_SIZE; test_sha[0] = a; test_sha[1] = b; @@ -1937,9 +1938,9 @@ int sha384_test(void) if (ret != 0) ERROR_OUT(-2330 - i, exit); - if (XMEMCMP(hash, test_sha[i].output, SHA384_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_sha[i].output, WC_SHA384_DIGEST_SIZE) != 0) ERROR_OUT(-2340 - i, exit); - if (XMEMCMP(hash, hashcopy, SHA384_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, hashcopy, WC_SHA384_DIGEST_SIZE) != 0) ERROR_OUT(-2350 - i, exit); } @@ -1963,7 +1964,7 @@ int sha384_test(void) ret = wc_Sha384Final(&sha, hash); if (ret != 0) ERROR_OUT(-2361, exit); - if (XMEMCMP(hash, large_digest, SHA384_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, large_digest, WC_SHA384_DIGEST_SIZE) != 0) ERROR_OUT(-2362, exit); } /* END LARGE HASH TEST */ @@ -2496,32 +2497,32 @@ int hash_test(void) return -2483; #endif #ifndef NO_MD5 - ret = wc_GetCTC_HashOID(MD5); + ret = wc_GetCTC_HashOID(WC_MD5); if (ret == 0) return -2484; #endif #ifndef NO_SHA - ret = wc_GetCTC_HashOID(SHA); + ret = wc_GetCTC_HashOID(WC_SHA); if (ret == 0) return -2485; #endif #ifdef WOLFSSL_SHA224 - ret = wc_GetCTC_HashOID(SHA224); + ret = wc_GetCTC_HashOID(WC_SHA224); if (ret == 0) return -2486; #endif #ifndef NO_SHA256 - ret = wc_GetCTC_HashOID(SHA256); + ret = wc_GetCTC_HashOID(WC_SHA256); if (ret == 0) return -2487; #endif #ifdef WOLFSSL_SHA384 - ret = wc_GetCTC_HashOID(SHA384); + ret = wc_GetCTC_HashOID(WC_SHA384); if (ret == 0) return -2488; #endif #ifdef WOLFSSL_SHA512 - ret = wc_GetCTC_HashOID(SHA512); + ret = wc_GetCTC_HashOID(WC_SHA512); if (ret == 0) return -2489; #endif @@ -2537,7 +2538,7 @@ int hash_test(void) int hmac_md5_test(void) { Hmac hmac; - byte hash[MD5_DIGEST_SIZE]; + byte hash[WC_MD5_DIGEST_SIZE]; const char* keys[]= { @@ -2556,13 +2557,13 @@ int hmac_md5_test(void) a.output = "\x92\x94\x72\x7a\x36\x38\xbb\x1c\x13\xf4\x8e\xf8\x15\x8b\xfc" "\x9d"; a.inLen = XSTRLEN(a.input); - a.outLen = MD5_DIGEST_SIZE; + a.outLen = WC_MD5_DIGEST_SIZE; b.input = "what do ya want for nothing?"; b.output = "\x75\x0c\x78\x3e\x6a\xb0\xb5\x03\xea\xa8\x6e\x31\x0a\x5d\xb7" "\x38"; b.inLen = XSTRLEN(b.input); - b.outLen = MD5_DIGEST_SIZE; + b.outLen = WC_MD5_DIGEST_SIZE; c.input = "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" @@ -2571,7 +2572,7 @@ int hmac_md5_test(void) c.output = "\x56\xbe\x34\x52\x1d\x14\x4c\x88\xdb\xb8\xc7\x33\xf0\xe8\xb3" "\xf6"; c.inLen = XSTRLEN(c.input); - c.outLen = MD5_DIGEST_SIZE; + c.outLen = WC_MD5_DIGEST_SIZE; test_hmac[0] = a; test_hmac[1] = b; @@ -2588,7 +2589,7 @@ int hmac_md5_test(void) return -2500; } - ret = wc_HmacSetKey(&hmac, MD5, (byte*)keys[i], + ret = wc_HmacSetKey(&hmac, WC_MD5, (byte*)keys[i], (word32)XSTRLEN(keys[i])); if (ret != 0) return -2501; @@ -2600,14 +2601,14 @@ int hmac_md5_test(void) if (ret != 0) return -2503; - if (XMEMCMP(hash, test_hmac[i].output, MD5_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_hmac[i].output, WC_MD5_DIGEST_SIZE) != 0) return -2504 - i; wc_HmacFree(&hmac); } #ifndef HAVE_FIPS - if (wc_HmacSizeByType(MD5) != MD5_DIGEST_SIZE) + if (wc_HmacSizeByType(WC_MD5) != WC_MD5_DIGEST_SIZE) return -2514; #endif @@ -2619,7 +2620,7 @@ int hmac_md5_test(void) int hmac_sha_test(void) { Hmac hmac; - byte hash[SHA_DIGEST_SIZE]; + byte hash[WC_SHA_DIGEST_SIZE]; const char* keys[]= { @@ -2640,13 +2641,13 @@ int hmac_sha_test(void) a.output = "\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c" "\x8e\xf1\x46\xbe\x00"; a.inLen = XSTRLEN(a.input); - a.outLen = SHA_DIGEST_SIZE; + a.outLen = WC_SHA_DIGEST_SIZE; b.input = "what do ya want for nothing?"; b.output = "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf" "\x9c\x25\x9a\x7c\x79"; b.inLen = XSTRLEN(b.input); - b.outLen = SHA_DIGEST_SIZE; + b.outLen = WC_SHA_DIGEST_SIZE; c.input = "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" @@ -2655,7 +2656,7 @@ int hmac_sha_test(void) c.output = "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b" "\x4f\x63\xf1\x75\xd3"; c.inLen = XSTRLEN(c.input); - c.outLen = SHA_DIGEST_SIZE; + c.outLen = WC_SHA_DIGEST_SIZE; test_hmac[0] = a; test_hmac[1] = b; @@ -2670,7 +2671,7 @@ int hmac_sha_test(void) if (wc_HmacInit(&hmac, HEAP_HINT, devId) != 0) return -20010; - ret = wc_HmacSetKey(&hmac, SHA, (byte*)keys[i], + ret = wc_HmacSetKey(&hmac, WC_SHA, (byte*)keys[i], (word32)XSTRLEN(keys[i])); if (ret != 0) return -2601; @@ -2682,14 +2683,14 @@ int hmac_sha_test(void) if (ret != 0) return -2603; - if (XMEMCMP(hash, test_hmac[i].output, SHA_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_hmac[i].output, WC_SHA_DIGEST_SIZE) != 0) return -2604 - i; wc_HmacFree(&hmac); } #ifndef HAVE_FIPS - if (wc_HmacSizeByType(SHA) != SHA_DIGEST_SIZE) + if (wc_HmacSizeByType(WC_SHA) != WC_SHA_DIGEST_SIZE) return -2614; #endif @@ -2702,7 +2703,7 @@ int hmac_sha_test(void) int hmac_sha224_test(void) { Hmac hmac; - byte hash[SHA224_DIGEST_SIZE]; + byte hash[WC_SHA224_DIGEST_SIZE]; const char* keys[]= { @@ -2723,13 +2724,13 @@ int hmac_sha224_test(void) a.output = "\x89\x6f\xb1\x12\x8a\xbb\xdf\x19\x68\x32\x10\x7c\xd4\x9d\xf3" "\x3f\x47\xb4\xb1\x16\x99\x12\xba\x4f\x53\x68\x4b\x22"; a.inLen = XSTRLEN(a.input); - a.outLen = SHA224_DIGEST_SIZE; + a.outLen = WC_SHA224_DIGEST_SIZE; b.input = "what do ya want for nothing?"; b.output = "\xa3\x0e\x01\x09\x8b\xc6\xdb\xbf\x45\x69\x0f\x3a\x7e\x9e\x6d" "\x0f\x8b\xbe\xa2\xa3\x9e\x61\x48\x00\x8f\xd0\x5e\x44"; b.inLen = XSTRLEN(b.input); - b.outLen = SHA224_DIGEST_SIZE; + b.outLen = WC_SHA224_DIGEST_SIZE; c.input = "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" @@ -2738,7 +2739,7 @@ int hmac_sha224_test(void) c.output = "\x7f\xb3\xcb\x35\x88\xc6\xc1\xf6\xff\xa9\x69\x4d\x7d\x6a\xd2" "\x64\x93\x65\xb0\xc1\xf6\x5d\x69\xd1\xec\x83\x33\xea"; c.inLen = XSTRLEN(c.input); - c.outLen = SHA224_DIGEST_SIZE; + c.outLen = WC_SHA224_DIGEST_SIZE; test_hmac[0] = a; test_hmac[1] = b; @@ -2753,7 +2754,7 @@ int hmac_sha224_test(void) if (wc_HmacInit(&hmac, HEAP_HINT, devId) != 0) return -2700; - ret = wc_HmacSetKey(&hmac, SHA224, (byte*)keys[i], + ret = wc_HmacSetKey(&hmac, WC_SHA224, (byte*)keys[i], (word32)XSTRLEN(keys[i])); if (ret != 0) return -2701; @@ -2765,14 +2766,14 @@ int hmac_sha224_test(void) if (ret != 0) return -2703; - if (XMEMCMP(hash, test_hmac[i].output, SHA224_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_hmac[i].output, WC_SHA224_DIGEST_SIZE) != 0) return -2704 - i; wc_HmacFree(&hmac); } #ifndef HAVE_FIPS - if (wc_HmacSizeByType(SHA224) != SHA224_DIGEST_SIZE) + if (wc_HmacSizeByType(WC_SHA224) != WC_SHA224_DIGEST_SIZE) return -2714; #endif @@ -2785,7 +2786,7 @@ int hmac_sha224_test(void) int hmac_sha256_test(void) { Hmac hmac; - byte hash[SHA256_DIGEST_SIZE]; + byte hash[WC_SHA256_DIGEST_SIZE]; const char* keys[]= { @@ -2807,14 +2808,14 @@ int hmac_sha256_test(void) "\x2b\x88\x1d\xc2\x00\xc9\x83\x3d\xa7\x26\xe9\x37\x6c\x2e\x32" "\xcf\xf7"; a.inLen = XSTRLEN(a.input); - a.outLen = SHA256_DIGEST_SIZE; + a.outLen = WC_SHA256_DIGEST_SIZE; b.input = "what do ya want for nothing?"; b.output = "\x5b\xdc\xc1\x46\xbf\x60\x75\x4e\x6a\x04\x24\x26\x08\x95\x75" "\xc7\x5a\x00\x3f\x08\x9d\x27\x39\x83\x9d\xec\x58\xb9\x64\xec" "\x38\x43"; b.inLen = XSTRLEN(b.input); - b.outLen = SHA256_DIGEST_SIZE; + b.outLen = WC_SHA256_DIGEST_SIZE; c.input = "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" @@ -2824,7 +2825,7 @@ int hmac_sha256_test(void) "\xa7\x29\x59\x09\x8b\x3e\xf8\xc1\x22\xd9\x63\x55\x14\xce\xd5" "\x65\xfe"; c.inLen = XSTRLEN(c.input); - c.outLen = SHA256_DIGEST_SIZE; + c.outLen = WC_SHA256_DIGEST_SIZE; test_hmac[0] = a; test_hmac[1] = b; @@ -2839,7 +2840,7 @@ int hmac_sha256_test(void) if (wc_HmacInit(&hmac, HEAP_HINT, devId) != 0) return -2800; - ret = wc_HmacSetKey(&hmac, SHA256, (byte*)keys[i], + ret = wc_HmacSetKey(&hmac, WC_SHA256, (byte*)keys[i], (word32)XSTRLEN(keys[i])); if (ret != 0) return -2801; @@ -2851,14 +2852,14 @@ int hmac_sha256_test(void) if (ret != 0) return -2803; - if (XMEMCMP(hash, test_hmac[i].output, SHA256_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_hmac[i].output, WC_SHA256_DIGEST_SIZE) != 0) return -2804 - i; wc_HmacFree(&hmac); } #ifndef HAVE_FIPS - if (wc_HmacSizeByType(SHA256) != SHA256_DIGEST_SIZE) + if (wc_HmacSizeByType(WC_SHA256) != WC_SHA256_DIGEST_SIZE) return -2814; if (wc_HmacSizeByType(20) != BAD_FUNC_ARG) return -2815; @@ -2964,7 +2965,7 @@ int hmac_blake2b_test(void) int hmac_sha384_test(void) { Hmac hmac; - byte hash[SHA384_DIGEST_SIZE]; + byte hash[WC_SHA384_DIGEST_SIZE]; const char* keys[]= { @@ -2987,7 +2988,7 @@ int hmac_sha384_test(void) "\xc5\x9c\xfa\xea\x9e\xa9\x07\x6e\xde\x7f\x4a\xf1\x52\xe8\xb2" "\xfa\x9c\xb6"; a.inLen = XSTRLEN(a.input); - a.outLen = SHA384_DIGEST_SIZE; + a.outLen = WC_SHA384_DIGEST_SIZE; b.input = "what do ya want for nothing?"; b.output = "\xaf\x45\xd2\xe3\x76\x48\x40\x31\x61\x7f\x78\xd2\xb5\x8a\x6b" @@ -2995,7 +2996,7 @@ int hmac_sha384_test(void) "\x44\x5e\x8e\x22\x40\xca\x5e\x69\xe2\xc7\x8b\x32\x39\xec\xfa" "\xb2\x16\x49"; b.inLen = XSTRLEN(b.input); - b.outLen = SHA384_DIGEST_SIZE; + b.outLen = WC_SHA384_DIGEST_SIZE; c.input = "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" @@ -3006,7 +3007,7 @@ int hmac_sha384_test(void) "\x14\x4b\x2a\x5a\xb3\x9d\xc1\x38\x14\xb9\x4e\x3a\xb6\xe1\x01" "\xa3\x4f\x27"; c.inLen = XSTRLEN(c.input); - c.outLen = SHA384_DIGEST_SIZE; + c.outLen = WC_SHA384_DIGEST_SIZE; test_hmac[0] = a; test_hmac[1] = b; @@ -3021,7 +3022,7 @@ int hmac_sha384_test(void) if (wc_HmacInit(&hmac, HEAP_HINT, devId) != 0) return -3000; - ret = wc_HmacSetKey(&hmac, SHA384, (byte*)keys[i], + ret = wc_HmacSetKey(&hmac, WC_SHA384, (byte*)keys[i], (word32)XSTRLEN(keys[i])); if (ret != 0) return -3001; @@ -3033,14 +3034,14 @@ int hmac_sha384_test(void) if (ret != 0) return -3003; - if (XMEMCMP(hash, test_hmac[i].output, SHA384_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_hmac[i].output, WC_SHA384_DIGEST_SIZE) != 0) return -3004 - i; wc_HmacFree(&hmac); } #ifndef HAVE_FIPS - if (wc_HmacSizeByType(SHA384) != SHA384_DIGEST_SIZE) + if (wc_HmacSizeByType(WC_SHA384) != WC_SHA384_DIGEST_SIZE) return -3013; #endif @@ -3053,7 +3054,7 @@ int hmac_sha384_test(void) int hmac_sha512_test(void) { Hmac hmac; - byte hash[SHA512_DIGEST_SIZE]; + byte hash[WC_SHA512_DIGEST_SIZE]; const char* keys[]= { @@ -3077,7 +3078,7 @@ int hmac_sha512_test(void) "\xa3\xf4\xe4\xbe\x9d\x91\x4e\xeb\x61\xf1\x70\x2e\x69\x6c\x20" "\x3a\x12\x68\x54"; a.inLen = XSTRLEN(a.input); - a.outLen = SHA512_DIGEST_SIZE; + a.outLen = WC_SHA512_DIGEST_SIZE; b.input = "what do ya want for nothing?"; b.output = "\x16\x4b\x7a\x7b\xfc\xf8\x19\xe2\xe3\x95\xfb\xe7\x3b\x56\xe0" @@ -3086,7 +3087,7 @@ int hmac_sha512_test(void) "\xf0\xe6\xfd\xca\xea\xb1\xa3\x4d\x4a\x6b\x4b\x63\x6e\x07\x0a" "\x38\xbc\xe7\x37"; b.inLen = XSTRLEN(b.input); - b.outLen = SHA512_DIGEST_SIZE; + b.outLen = WC_SHA512_DIGEST_SIZE; c.input = "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" @@ -3098,7 +3099,7 @@ int hmac_sha512_test(void) "\x67\xc8\x07\xb9\x46\xa3\x37\xbe\xe8\x94\x26\x74\x27\x88\x59" "\xe1\x32\x92\xfb"; c.inLen = XSTRLEN(c.input); - c.outLen = SHA512_DIGEST_SIZE; + c.outLen = WC_SHA512_DIGEST_SIZE; test_hmac[0] = a; test_hmac[1] = b; @@ -3113,7 +3114,7 @@ int hmac_sha512_test(void) if (wc_HmacInit(&hmac, HEAP_HINT, devId) != 0) return -3100; - ret = wc_HmacSetKey(&hmac, SHA512, (byte*)keys[i], + ret = wc_HmacSetKey(&hmac, WC_SHA512, (byte*)keys[i], (word32)XSTRLEN(keys[i])); if (ret != 0) return -3101; @@ -3125,14 +3126,14 @@ int hmac_sha512_test(void) if (ret != 0) return -3103; - if (XMEMCMP(hash, test_hmac[i].output, SHA512_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, test_hmac[i].output, WC_SHA512_DIGEST_SIZE) != 0) return -3104 - i; wc_HmacFree(&hmac); } #ifndef HAVE_FIPS - if (wc_HmacSizeByType(SHA512) != SHA512_DIGEST_SIZE) + if (wc_HmacSizeByType(WC_SHA512) != WC_SHA512_DIGEST_SIZE) return -3113; #endif @@ -6555,7 +6556,7 @@ int random_test(void) 0xa1, 0x80, 0x18, 0x3a, 0x07, 0xdf, 0xae, 0x17 }; - byte output[SHA256_DIGEST_SIZE * 4]; + byte output[WC_SHA256_DIGEST_SIZE * 4]; int ret; ret = wc_RNG_HealthTest(0, test1Entropy, sizeof(test1Entropy), NULL, 0, @@ -7970,7 +7971,7 @@ int rsa_test(void) If key size is less than (hash length * 2) + 2 then is invalid use and test, since OAEP padding requires this. BAD_FUNC_ARG is returned when this case is not met */ - if (wc_RsaEncryptSize(&key) > ((int)SHA512_DIGEST_SIZE * 2) + 2) { + if (wc_RsaEncryptSize(&key) > ((int)WC_SHA512_DIGEST_SIZE * 2) + 2) { XMEMSET(plain, 0, plainSz); do { #if defined(WOLFSSL_ASYNC_CRYPT) @@ -9262,8 +9263,8 @@ int dsa_test(void) byte tmp[1024]; DsaKey key; WC_RNG rng; - Sha sha; - byte hash[SHA_DIGEST_SIZE]; + wc_Sha sha; + byte hash[WC_SHA_DIGEST_SIZE]; byte signature[40]; #ifdef USE_CERT_BUFFERS_1024 @@ -9555,7 +9556,7 @@ int openssl_test(void) { EVP_MD_CTX md_ctx; testVector a, b, c, d, e, f; - byte hash[SHA256_DIGEST_SIZE*2]; /* max size */ + byte hash[WC_SHA256_DIGEST_SIZE*2]; /* max size */ (void)a; (void)b; @@ -9581,7 +9582,7 @@ int openssl_test(void) a.output = "\x57\xed\xf4\xa2\x2b\xe3\xc9\x55\xac\x49\xda\x2e\x21\x07\xb6" "\x7a"; a.inLen = XSTRLEN(a.input); - a.outLen = MD5_DIGEST_SIZE; + a.outLen = WC_MD5_DIGEST_SIZE; EVP_MD_CTX_init(&md_ctx); EVP_DigestInit(&md_ctx, EVP_md5()); @@ -9589,7 +9590,7 @@ int openssl_test(void) EVP_DigestUpdate(&md_ctx, a.input, (unsigned long)a.inLen); EVP_DigestFinal(&md_ctx, hash, 0); - if (XMEMCMP(hash, a.output, MD5_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, a.output, WC_MD5_DIGEST_SIZE) != 0) return -5901; #endif /* NO_MD5 */ @@ -9602,7 +9603,7 @@ int openssl_test(void) b.output = "\xAD\x5B\x3F\xDB\xCB\x52\x67\x78\xC2\x83\x9D\x2F\x15\x1E\xA7" "\x53\x99\x5E\x26\xA0"; b.inLen = XSTRLEN(b.input); - b.outLen = SHA_DIGEST_SIZE; + b.outLen = WC_SHA_DIGEST_SIZE; EVP_MD_CTX_init(&md_ctx); EVP_DigestInit(&md_ctx, EVP_sha1()); @@ -9610,7 +9611,7 @@ int openssl_test(void) EVP_DigestUpdate(&md_ctx, b.input, (unsigned long)b.inLen); EVP_DigestFinal(&md_ctx, hash, 0); - if (XMEMCMP(hash, b.output, SHA_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, b.output, WC_SHA_DIGEST_SIZE) != 0) return -5902; #endif /* NO_SHA */ @@ -9622,7 +9623,7 @@ int openssl_test(void) e.output = "\xc9\x7c\xa9\xa5\x59\x85\x0c\xe9\x7a\x04\xa9\x6d\xef\x6d\x99" "\xa9\xe0\xe0\xe2\xab\x14\xe6\xb8\xdf\x26\x5f\xc0\xb3"; e.inLen = XSTRLEN(e.input); - e.outLen = SHA224_DIGEST_SIZE; + e.outLen = WC_SHA224_DIGEST_SIZE; EVP_MD_CTX_init(&md_ctx); EVP_DigestInit(&md_ctx, EVP_sha224()); @@ -9630,7 +9631,7 @@ int openssl_test(void) EVP_DigestUpdate(&md_ctx, e.input, (unsigned long)e.inLen); EVP_DigestFinal(&md_ctx, hash, 0); - if (XMEMCMP(hash, e.output, SHA224_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, e.output, WC_SHA224_DIGEST_SIZE) != 0) return -5903; #endif /* WOLFSSL_SHA224 */ @@ -9641,7 +9642,7 @@ int openssl_test(void) "\x39\xA3\x3C\xE4\x59\x64\xFF\x21\x67\xF6\xEC\xED\xD4\x19\xDB" "\x06\xC1"; d.inLen = XSTRLEN(d.input); - d.outLen = SHA256_DIGEST_SIZE; + d.outLen = WC_SHA256_DIGEST_SIZE; EVP_MD_CTX_init(&md_ctx); EVP_DigestInit(&md_ctx, EVP_sha256()); @@ -9649,7 +9650,7 @@ int openssl_test(void) EVP_DigestUpdate(&md_ctx, d.input, (unsigned long)d.inLen); EVP_DigestFinal(&md_ctx, hash, 0); - if (XMEMCMP(hash, d.output, SHA256_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, d.output, WC_SHA256_DIGEST_SIZE) != 0) return -5904; #ifdef WOLFSSL_SHA384 @@ -9661,7 +9662,7 @@ int openssl_test(void) "\xf7\x12\xfc\xc7\xc7\x1a\x55\x7e\x2d\xb9\x66\xc3\xe9\xfa\x91" "\x74\x60\x39"; e.inLen = XSTRLEN(e.input); - e.outLen = SHA384_DIGEST_SIZE; + e.outLen = WC_SHA384_DIGEST_SIZE; EVP_MD_CTX_init(&md_ctx); EVP_DigestInit(&md_ctx, EVP_sha384()); @@ -9669,7 +9670,7 @@ int openssl_test(void) EVP_DigestUpdate(&md_ctx, e.input, (unsigned long)e.inLen); EVP_DigestFinal(&md_ctx, hash, 0); - if (XMEMCMP(hash, e.output, SHA384_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, e.output, WC_SHA384_DIGEST_SIZE) != 0) return -5905; #endif /* WOLFSSL_SHA384 */ @@ -9685,7 +9686,7 @@ int openssl_test(void) "\xb5\x43\x3a\xc7\xd3\x29\xee\xb6\xdd\x26\x54\x5e\x96\xe5\x5b" "\x87\x4b\xe9\x09"; f.inLen = XSTRLEN(f.input); - f.outLen = SHA512_DIGEST_SIZE; + f.outLen = WC_SHA512_DIGEST_SIZE; EVP_MD_CTX_init(&md_ctx); EVP_DigestInit(&md_ctx, EVP_sha512()); @@ -9693,7 +9694,7 @@ int openssl_test(void) EVP_DigestUpdate(&md_ctx, f.input, (unsigned long)f.inLen); EVP_DigestFinal(&md_ctx, hash, 0); - if (XMEMCMP(hash, f.output, SHA512_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, f.output, WC_SHA512_DIGEST_SIZE) != 0) return -5906; #endif /* WOLFSSL_SHA512 */ @@ -9707,12 +9708,12 @@ int openssl_test(void) c.output = "\x55\x78\xe8\x48\x4b\xcc\x93\x80\x93\xec\x53\xaf\x22\xd6\x14" "\x76"; c.inLen = XSTRLEN(c.input); - c.outLen = MD5_DIGEST_SIZE; + c.outLen = WC_MD5_DIGEST_SIZE; HMAC(EVP_md5(), "JefeJefeJefeJefe", 16, (byte*)c.input, (int)c.inLen, hash, 0); - if (XMEMCMP(hash, c.output, MD5_DIGEST_SIZE) != 0) + if (XMEMCMP(hash, c.output, WC_MD5_DIGEST_SIZE) != 0) return -5908; #endif /* NO_MD5 */ @@ -10380,7 +10381,7 @@ int pkcs12_test(void) int kLen = 24; int iterations = 1; int ret = wc_PKCS12_PBKDF(derived, passwd, sizeof(passwd), salt, 8, - iterations, kLen, SHA256, id); + iterations, kLen, WC_SHA256, id); if (ret < 0) return -6100; @@ -10390,12 +10391,12 @@ int pkcs12_test(void) iterations = 1000; ret = wc_PKCS12_PBKDF(derived, passwd2, sizeof(passwd2), salt2, 8, - iterations, kLen, SHA256, id); + iterations, kLen, WC_SHA256, id); if (ret < 0) return -6102; ret = wc_PKCS12_PBKDF_ex(derived, passwd2, sizeof(passwd2), salt2, 8, - iterations, kLen, SHA256, id, HEAP_HINT); + iterations, kLen, WC_SHA256, id, HEAP_HINT); if (ret < 0) return -6103; @@ -10420,7 +10421,7 @@ int pbkdf2_test(void) }; int ret = wc_PBKDF2(derived, (byte*)passwd, (int)XSTRLEN(passwd), salt, 8, - iterations, kLen, SHA256); + iterations, kLen, WC_SHA256); if (ret != 0) return ret; @@ -10447,7 +10448,7 @@ int pbkdf1_test(void) }; wc_PBKDF1(derived, (byte*)passwd, (int)XSTRLEN(passwd), salt, 8, iterations, - kLen, SHA); + kLen, WC_SHA); if (XMEMCMP(derived, verify, sizeof(verify)) != 0) return -6300; @@ -10521,7 +10522,7 @@ int hkdf_test(void) (void)info1; #ifndef NO_SHA - ret = wc_HKDF(SHA, ikm1, 22, NULL, 0, NULL, 0, okm1, L); + ret = wc_HKDF(WC_SHA, ikm1, 22, NULL, 0, NULL, 0, okm1, L); if (ret != 0) return -6400; @@ -10530,7 +10531,7 @@ int hkdf_test(void) #ifndef HAVE_FIPS /* fips can't have key size under 14 bytes, salt is key too */ - ret = wc_HKDF(SHA, ikm1, 11, salt1, 13, info1, 10, okm1, L); + ret = wc_HKDF(WC_SHA, ikm1, 11, salt1, 13, info1, 10, okm1, L); if (ret != 0) return -6402; @@ -10540,7 +10541,7 @@ int hkdf_test(void) #endif /* NO_SHA */ #ifndef NO_SHA256 - ret = wc_HKDF(SHA256, ikm1, 22, NULL, 0, NULL, 0, okm1, L); + ret = wc_HKDF(WC_SHA256, ikm1, 22, NULL, 0, NULL, 0, okm1, L); if (ret != 0) return -6404; @@ -10549,7 +10550,7 @@ int hkdf_test(void) #ifndef HAVE_FIPS /* fips can't have key size under 14 bytes, salt is key too */ - ret = wc_HKDF(SHA256, ikm1, 22, salt1, 13, info1, 10, okm1, L); + ret = wc_HKDF(WC_SHA256, ikm1, 22, salt1, 13, info1, 10, okm1, L); if (ret != 0) return -6406; @@ -14416,7 +14417,7 @@ static int pkcs7signed_run_vectors(byte* rsaCert, word32 rsaCertSz, static byte senderNonceOid[] = { 0x06, 0x0a, 0x60, 0x86, 0x48, 0x01, 0x86, 0xF8, 0x45, 0x01, 0x09, 0x05 }; - static byte transId[(SHA_DIGEST_SIZE + 1) * 2 + 1]; + static byte transId[(WC_SHA_DIGEST_SIZE + 1) * 2 + 1]; static byte messageType[] = { 0x13, 2, '1', '9' }; static byte senderNonce[PKCS7_NONCE_SZ + 2]; @@ -14560,12 +14561,12 @@ static int pkcs7signed_run_vectors(byte* rsaCert, word32 rsaCertSz, /* generate trans ID */ { - Sha sha; - byte digest[SHA_DIGEST_SIZE]; + wc_Sha sha; + byte digest[WC_SHA_DIGEST_SIZE]; int j,k; transId[0] = 0x13; - transId[1] = SHA_DIGEST_SIZE * 2; + transId[1] = WC_SHA_DIGEST_SIZE * 2; ret = wc_InitSha_ex(&sha, HEAP_HINT, devId); if (ret != 0) { @@ -14577,7 +14578,7 @@ static int pkcs7signed_run_vectors(byte* rsaCert, word32 rsaCertSz, wc_ShaFinal(&sha, digest); wc_ShaFree(&sha); - for (j = 0, k = 2; j < SHA_DIGEST_SIZE; j++, k += 2) { + for (j = 0, k = 2; j < WC_SHA_DIGEST_SIZE; j++, k += 2) { XSNPRINTF((char*)&transId[k], 3, "%02x", digest[j]); } } diff --git a/wolfssl/internal.h b/wolfssl/internal.h index 9818ebda7..69ef29a16 100755 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -184,15 +184,15 @@ #endif #ifdef NO_SHA - #define SHA_DIGEST_SIZE 20 + #define WC_SHA_DIGEST_SIZE 20 #endif #ifdef NO_SHA256 - #define SHA256_DIGEST_SIZE 32 + #define WC_SHA256_DIGEST_SIZE 32 #endif #ifdef NO_MD5 - #define MD5_DIGEST_SIZE 16 + #define WC_MD5_DIGEST_SIZE 16 #endif @@ -967,7 +967,7 @@ enum Misc { ENCRYPT_LEN = 512, /* allow 4096 bit static buffer */ #endif SIZEOF_SENDER = 4, /* clnt or srvr */ - FINISHED_SZ = 36, /* MD5_DIGEST_SIZE + SHA_DIGEST_SIZE */ + FINISHED_SZ = 36, /* WC_MD5_DIGEST_SIZE + WC_SHA_DIGEST_SIZE */ MAX_RECORD_SIZE = 16384, /* 2^14, max size by standard */ MAX_MSG_EXTRA = 38 + MAX_DIGEST_SIZE, /* max added to msg, mac + pad from */ @@ -1565,9 +1565,9 @@ struct WOLFSSL_CIPHER { typedef struct OcspEntry OcspEntry; #ifdef NO_SHA - #define OCSP_DIGEST_SIZE SHA256_DIGEST_SIZE + #define OCSP_DIGEST_SIZE WC_SHA256_DIGEST_SIZE #else - #define OCSP_DIGEST_SIZE SHA_DIGEST_SIZE + #define OCSP_DIGEST_SIZE WC_SHA_DIGEST_SIZE #endif #ifdef NO_ASN @@ -1605,9 +1605,9 @@ struct WOLFSSL_OCSP { typedef struct CRL_Entry CRL_Entry; #ifdef NO_SHA - #define CRL_DIGEST_SIZE SHA256_DIGEST_SIZE + #define CRL_DIGEST_SIZE WC_SHA256_DIGEST_SIZE #else - #define CRL_DIGEST_SIZE SHA_DIGEST_SIZE + #define CRL_DIGEST_SIZE WC_SHA_DIGEST_SIZE #endif #ifdef NO_ASN @@ -2038,7 +2038,7 @@ typedef struct SecureRenegotiation { enum key_cache_state cache_status; /* track key cache state */ byte client_verify_data[TLS_FINISHED_SZ]; /* cached */ byte server_verify_data[TLS_FINISHED_SZ]; /* cached */ - byte subject_hash[SHA_DIGEST_SIZE]; /* peer cert hash */ + byte subject_hash[WC_SHA_DIGEST_SIZE]; /* peer cert hash */ Keys tmp_keys; /* can't overwrite real keys yet */ } SecureRenegotiation; @@ -2222,10 +2222,10 @@ struct WOLFSSL_CTX { DerBuffer* certChain; /* chain after self, in DER, with leading size for each cert */ #ifdef OPENSSL_EXTRA - STACK_OF(WOLFSSL_X509_NAME)* ca_names; + WOLF_STACK_OF(WOLFSSL_X509_NAME)* ca_names; #endif #if defined(WOLFSSL_NGINX) || defined (WOLFSSL_HAPROXY) - STACK_OF(WOLFSSL_X509)* x509Chain; + WOLF_STACK_OF(WOLFSSL_X509)* x509Chain; #endif #ifdef WOLFSSL_TLS13 int certChainCnt; @@ -2584,19 +2584,19 @@ WOLFSSL_LOCAL void FreeCiphers(WOLFSSL* ssl); /* hashes type */ typedef struct Hashes { #if !defined(NO_MD5) && !defined(NO_OLD_TLS) - byte md5[MD5_DIGEST_SIZE]; + byte md5[WC_MD5_DIGEST_SIZE]; #endif #if !defined(NO_SHA) - byte sha[SHA_DIGEST_SIZE]; + byte sha[WC_SHA_DIGEST_SIZE]; #endif #ifndef NO_SHA256 - byte sha256[SHA256_DIGEST_SIZE]; + byte sha256[WC_SHA256_DIGEST_SIZE]; #endif #ifdef WOLFSSL_SHA384 - byte sha384[SHA384_DIGEST_SIZE]; + byte sha384[WC_SHA384_DIGEST_SIZE]; #endif #ifdef WOLFSSL_SHA512 - byte sha512[SHA512_DIGEST_SIZE]; + byte sha512[WC_SHA512_DIGEST_SIZE]; #endif } Hashes; @@ -2605,13 +2605,13 @@ WOLFSSL_LOCAL int BuildCertHashes(WOLFSSL* ssl, Hashes* hashes); #ifdef WOLFSSL_TLS13 typedef union Digest { #ifndef NO_WOLFSSL_SHA256 - Sha256 sha256; + wc_Sha256 sha256; #endif #ifdef WOLFSSL_SHA384 - Sha384 sha384; + wc_Sha384 sha384; #endif #ifdef WOLFSSL_SHA512 - Sha512 sha512; + wc_Sha512 sha512; #endif } Digest; #endif @@ -3165,19 +3165,19 @@ typedef struct HS_Hashes { Hashes verifyHashes; Hashes certHashes; /* for cert verify */ #ifndef NO_SHA - Sha hashSha; /* sha hash of handshake msgs */ + wc_Sha hashSha; /* sha hash of handshake msgs */ #endif #if !defined(NO_MD5) && !defined(NO_OLD_TLS) - Md5 hashMd5; /* md5 hash of handshake msgs */ + wc_Md5 hashMd5; /* md5 hash of handshake msgs */ #endif #ifndef NO_SHA256 - Sha256 hashSha256; /* sha256 hash of handshake msgs */ + wc_Sha256 hashSha256; /* sha256 hash of handshake msgs */ #endif #ifdef WOLFSSL_SHA384 - Sha384 hashSha384; /* sha384 hash of handshake msgs */ + wc_Sha384 hashSha384; /* sha384 hash of handshake msgs */ #endif #ifdef WOLFSSL_SHA512 - Sha512 hashSha512; /* sha512 hash of handshake msgs */ + wc_Sha512 hashSha512; /* sha512 hash of handshake msgs */ #endif } HS_Hashes; diff --git a/wolfssl/ocsp.h b/wolfssl/ocsp.h index 844ce272e..7f5d7890f 100644 --- a/wolfssl/ocsp.h +++ b/wolfssl/ocsp.h @@ -71,7 +71,7 @@ WOLFSSL_API WOLFSSL_OCSP_CERTID* wolfSSL_OCSP_cert_to_id( WOLFSSL_API void wolfSSL_OCSP_BASICRESP_free(WOLFSSL_OCSP_BASICRESP* basicResponse); WOLFSSL_API int wolfSSL_OCSP_basic_verify(WOLFSSL_OCSP_BASICRESP *bs, - STACK_OF(WOLFSSL_X509) *certs, WOLFSSL_X509_STORE *st, unsigned long flags); + WOLF_STACK_OF(WOLFSSL_X509) *certs, WOLFSSL_X509_STORE *st, unsigned long flags); WOLFSSL_API void wolfSSL_OCSP_RESPONSE_free(OcspResponse* response); WOLFSSL_API OcspResponse* wolfSSL_d2i_OCSP_RESPONSE_bio(WOLFSSL_BIO* bio, diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index 5f5bf56ce..56b2d8d81 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -59,11 +59,44 @@ #undef OCSP_RESPONSE #endif -#ifdef OPENSSL_EXTRA +#ifdef OPENSSL_COEXIST + /* mode to allow wolfSSL and OpenSSL to exist together */ + #ifdef TEST_OPENSSL_COEXIST + /* + ./configure --enable-opensslcoexist \ + CFLAGS="-I/usr/local/opt/openssl/include -DTEST_OPENSSL_COEXIST" \ + LDFLAGS="-L/usr/local/opt/openssl/lib -lcrypto" + */ + #include + #include + #include + #include + #include + #include + #endif + + /* make sure old names are disabled */ + #ifndef NO_OLD_SSL_NAMES + #define NO_OLD_SSL_NAMES + #endif + #ifndef NO_OLD_WC_NAMES + #define NO_OLD_WC_NAMES + #endif + +#elif defined(OPENSSL_EXTRA) #include #include + + /* We need the old SSL names */ + #ifdef NO_OLD_SSL_NAMES + #undef NO_OLD_SSL_NAMES + #endif + #ifdef NO_OLD_WC_NAMES + #undef NO_OLD_WC_NAMES + #endif #endif + #ifdef __cplusplus extern "C" { #endif @@ -537,19 +570,18 @@ WOLFSSL_API void wolfSSL_ERR_error_string_n(unsigned long e, char* buf, WOLFSSL_API const char* wolfSSL_ERR_reason_error_string(unsigned long); /* extras */ - -#define STACK_OF(x) WOLFSSL_STACK -WOLFSSL_API int wolfSSL_sk_X509_push(STACK_OF(WOLFSSL_X509_NAME)* sk, +#define WOLF_STACK_OF(x) WOLFSSL_STACK +WOLFSSL_API int wolfSSL_sk_X509_push(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk, WOLFSSL_X509* x509); -WOLFSSL_API WOLFSSL_X509* wolfSSL_sk_X509_pop(STACK_OF(WOLFSSL_X509_NAME)* sk); -WOLFSSL_API void wolfSSL_sk_X509_free(STACK_OF(WOLFSSL_X509_NAME)* sk); +WOLFSSL_API WOLFSSL_X509* wolfSSL_sk_X509_pop(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk); +WOLFSSL_API void wolfSSL_sk_X509_free(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk); WOLFSSL_API WOLFSSL_ASN1_OBJECT* wolfSSL_ASN1_OBJECT_new(void); WOLFSSL_API void wolfSSL_ASN1_OBJECT_free(WOLFSSL_ASN1_OBJECT* obj); -WOLFSSL_API int wolfSSL_sk_ASN1_OBJECT_push(STACK_OF(WOLFSSL_ASN1_OBJEXT)* sk, +WOLFSSL_API int wolfSSL_sk_ASN1_OBJECT_push(WOLF_STACK_OF(WOLFSSL_ASN1_OBJEXT)* sk, WOLFSSL_ASN1_OBJECT* obj); WOLFSSL_API WOLFSSL_ASN1_OBJECT* wolfSSL_sk_ASN1_OBJCET_pop( - STACK_OF(WOLFSSL_ASN1_OBJECT)* sk); -WOLFSSL_API void wolfSSL_sk_ASN1_OBJECT_free(STACK_OF(WOLFSSL_ASN1_OBJECT)* sk); + WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)* sk); +WOLFSSL_API void wolfSSL_sk_ASN1_OBJECT_free(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)* sk); WOLFSSL_API int wolfSSL_ASN1_STRING_to_UTF8(unsigned char **out, WOLFSSL_ASN1_STRING *in); WOLFSSL_API int wolfSSL_set_ex_data(WOLFSSL*, int, void*); @@ -719,7 +751,7 @@ WOLFSSL_API int wolfSSL_X509_STORE_get_by_subject(WOLFSSL_X509_STORE_CT int, WOLFSSL_X509_NAME*, WOLFSSL_X509_OBJECT*); WOLFSSL_API WOLFSSL_X509_STORE_CTX* wolfSSL_X509_STORE_CTX_new(void); WOLFSSL_API int wolfSSL_X509_STORE_CTX_init(WOLFSSL_X509_STORE_CTX*, - WOLFSSL_X509_STORE*, WOLFSSL_X509*, STACK_OF(WOLFSSL_X509)*); + WOLFSSL_X509_STORE*, WOLFSSL_X509*, WOLF_STACK_OF(WOLFSSL_X509)*); WOLFSSL_API void wolfSSL_X509_STORE_CTX_free(WOLFSSL_X509_STORE_CTX*); WOLFSSL_API void wolfSSL_X509_STORE_CTX_cleanup(WOLFSSL_X509_STORE_CTX*); @@ -752,13 +784,13 @@ WOLFSSL_API long wolfSSL_ASN1_INTEGER_get(const WOLFSSL_ASN1_INTEGER*); #ifdef OPENSSL_EXTRA WOLFSSL_API WOLFSSL_BIGNUM *wolfSSL_ASN1_INTEGER_to_BN(const WOLFSSL_ASN1_INTEGER *ai, WOLFSSL_BIGNUM *bn); -WOLFSSL_API STACK_OF(WOLFSSL_X509_NAME)* wolfSSL_load_client_CA_file(const char*); +WOLFSSL_API WOLF_STACK_OF(WOLFSSL_X509_NAME)* wolfSSL_load_client_CA_file(const char*); #endif -WOLFSSL_API STACK_OF(WOLFSSL_X509_NAME)* wolfSSL_SSL_CTX_get_client_CA_list( +WOLFSSL_API WOLF_STACK_OF(WOLFSSL_X509_NAME)* wolfSSL_SSL_CTX_get_client_CA_list( const WOLFSSL_CTX *s); WOLFSSL_API void wolfSSL_CTX_set_client_CA_list(WOLFSSL_CTX*, - STACK_OF(WOLFSSL_X509_NAME)*); + WOLF_STACK_OF(WOLFSSL_X509_NAME)*); WOLFSSL_API void* wolfSSL_X509_STORE_CTX_get_ex_data(WOLFSSL_X509_STORE_CTX*, int); WOLFSSL_API int wolfSSL_get_ex_data_X509_STORE_CTX_idx(void); WOLFSSL_API void* wolfSSL_get_ex_data(const WOLFSSL*, int); @@ -830,6 +862,16 @@ WOLFSSL_API long wolfSSL_get_verify_result(const WOLFSSL *ssl); #define WOLFSSL_DEFAULT_CIPHER_LIST "" /* default all */ #define WOLFSSL_RSA_F4 0x10001L +enum { + WOLFSSL_OCSP_URL_OVERRIDE = 1, + WOLFSSL_OCSP_NO_NONCE = 2, + WOLFSSL_OCSP_CHECKALL = 4, + + WOLFSSL_CRL_CHECKALL = 1, + WOLFSSL_CRL_CHECK = 27, +}; + +#ifdef OPENSSL_EXTRA /* seperated out from other enums because of size */ enum { SSL_OP_MICROSOFT_SESS_ID_BUG = 0x00000001, @@ -864,8 +906,9 @@ enum { SSL_OP_NO_TLSv1_3 = 0x20000000, }; - enum { +#ifdef HAVE_OCSP + /* OCSP Flags */ OCSP_NOCERTS = 1, OCSP_NOINTERN = 2, OCSP_NOSIGS = 4, @@ -879,17 +922,12 @@ enum { OCSP_RESPID_KEY = 1024, OCSP_NOTIME = 2048, + /* OCSP Types */ OCSP_CERTID = 2, OCSP_REQUEST = 4, OCSP_RESPONSE = 8, OCSP_BASICRESP = 16, - - WOLFSSL_OCSP_URL_OVERRIDE = 1, - WOLFSSL_OCSP_NO_NONCE = 2, - WOLFSSL_OCSP_CHECKALL = 4, - - WOLFSSL_CRL_CHECKALL = 1, - WOLFSSL_CRL_CHECK = 27, +#endif ASN1_GENERALIZEDTIME = 4, SSL_MAX_SSL_SESSION_ID_LENGTH = 32, @@ -981,6 +1019,7 @@ enum { ASN1_STRFLGS_ESC_MSB = 4 }; +#endif /* extras end */ @@ -994,65 +1033,123 @@ WOLFSSL_API void wolfSSL_ERR_dump_errors_fp(FILE* fp); #endif #endif + +#ifndef NO_OLD_SSL_NAMES + #define SSL_ERROR_NONE WOLF_SSL_ERROR_NONE + #define SSL_FAILURE WOLF_SSL_FAILURE + #define SSL_SUCCESS WOLF_SSL_SUCCESS + #define SSL_SHUTDOWN_NOT_DONE WOLF_WOLF_SSL_SHUTDOWN_NOT_DONE + + #define SSL_ALPN_NOT_FOUND WOLF_SSL_ALPN_NOT_FOUND + #define SSL_BAD_CERTTYPE WOLF_SSL_BAD_CERTTYPE + #define SSL_BAD_STAT WOLF_SSL_BAD_STAT + #define SSL_BAD_PATH WOLF_SSL_BAD_PATH + #define SSL_BAD_FILETYPE WOLF_SSL_BAD_FILETYPE + #define SSL_BAD_FILE WOLF_SSL_BAD_FILE + #define SSL_NOT_IMPLEMENTED WOLF_SSL_NOT_IMPLEMENTED + #define SSL_UNKNOWN WOLF_SSL_UNKNOWN + #define SSL_FATAL_ERROR WOLF_SSL_FATAL_ERROR + + #define SSL_FILETYPE_ASN1 WOLF_SSL_FILETYPE_ASN1 + #define SSL_FILETYPE_PEM WOLF_SSL_FILETYPE_PEM + #define SSL_FILETYPE_DEFAULT WOLF_SSL_FILETYPE_DEFAULT + #define SSL_FILETYPE_RAW WOLF_SSL_FILETYPE_RAW + + #define SSL_VERIFY_NONE WOLF_SSL_VERIFY_NONE + #define SSL_VERIFY_PEER WOLF_SSL_VERIFY_PEER + #define SSL_VERIFY_FAIL_IF_NO_PEER_CERT WOLF_SSL_VERIFY_FAIL_IF_NO_PEER_CERT + #define SSL_VERIFY_CLIENT_ONCE WOLF_SSL_VERIFY_CLIENT_ONCE + #define SSL_VERIFY_FAIL_EXCEPT_PSK WOLF_SSL_VERIFY_FAIL_EXCEPT_PSK + + #define SSL_SESS_CACHE_OFF WOLF_SSL_SESS_CACHE_OFF + #define SSL_SESS_CACHE_CLIENT WOLF_SSL_SESS_CACHE_CLIENT + #define SSL_SESS_CACHE_SERVER WOLF_SSL_SESS_CACHE_SERVER + #define SSL_SESS_CACHE_BOTH WOLF_SSL_SESS_CACHE_BOTH + #define SSL_SESS_CACHE_NO_AUTO_CLEAR WOLF_SSL_SESS_CACHE_NO_AUTO_CLEAR + #define SSL_SESS_CACHE_NO_INTERNAL_LOOKUP WOLF_SSL_SESS_CACHE_NO_INTERNAL_LOOKUP + #define SSL_SESS_CACHE_NO_INTERNAL_STORE WOLF_SSL_SESS_CACHE_NO_INTERNAL_STORE + #define SSL_SESS_CACHE_NO_INTERNAL WOLF_SSL_SESS_CACHE_NO_INTERNAL + + #define SSL_ERROR_WANT_READ WOLF_SSL_ERROR_WANT_READ + #define SSL_ERROR_WANT_WRITE WOLF_SSL_ERROR_WANT_WRITE + #define SSL_ERROR_WANT_CONNECT WOLF_SSL_ERROR_WANT_CONNECT + #define SSL_ERROR_WANT_ACCEPT WOLF_SSL_ERROR_WANT_ACCEPT + #define SSL_ERROR_SYSCALL WOLF_SSL_ERROR_SYSCALL + #define SSL_ERROR_WANT_X509_LOOKUP WOLF_SSL_ERROR_WANT_X509_LOOKUP + #define SSL_ERROR_ZERO_RETURN WOLF_SSL_ERROR_ZERO_RETURN + #define SSL_ERROR_SSL WOLF_SSL_ERROR_SSL + + #define SSL_SENT_SHUTDOWN WOLF_SSL_SENT_SHUTDOWN + #define SSL_RECEIVED_SHUTDOWN WOLF_SSL_RECEIVED_SHUTDOWN + #define SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER WOLF_SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER + #define SSL_OP_NO_SSLv2 WOLF_SSL_OP_NO_SSLv2 + + #define SSL_R_SSL_HANDSHAKE_FAILURE WOLF_SSL_R_SSL_HANDSHAKE_FAILURE + #define SSL_R_TLSV1_ALERT_UNKNOWN_CA WOLF_SSL_R_TLSV1_ALERT_UNKNOWN_CA + #define SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN WOLF_SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN + #define SSL_R_SSLV3_ALERT_BAD_CERTIFICATE WOLF_SSL_R_SSLV3_ALERT_BAD_CERTIFICATE + + #define PEM_BUFSIZE WOLF_PEM_BUFSIZE +#endif + enum { /* ssl Constants */ - SSL_ERROR_NONE = 0, /* for most functions */ - SSL_FAILURE = 0, /* for some functions */ - SSL_SUCCESS = 1, - SSL_SHUTDOWN_NOT_DONE = 2, /* call wolfSSL_shutdown again to complete */ + WOLF_SSL_ERROR_NONE = 0, /* for most functions */ + WOLF_SSL_FAILURE = 0, /* for some functions */ + WOLF_SSL_SUCCESS = 1, + WOLF_SSL_SHUTDOWN_NOT_DONE = 2, /* call wolfSSL_shutdown again to complete */ - SSL_ALPN_NOT_FOUND = -9, - SSL_BAD_CERTTYPE = -8, - SSL_BAD_STAT = -7, - SSL_BAD_PATH = -6, - SSL_BAD_FILETYPE = -5, - SSL_BAD_FILE = -4, - SSL_NOT_IMPLEMENTED = -3, - SSL_UNKNOWN = -2, - SSL_FATAL_ERROR = -1, + WOLF_SSL_ALPN_NOT_FOUND = -9, + WOLF_SSL_BAD_CERTTYPE = -8, + WOLF_SSL_BAD_STAT = -7, + WOLF_SSL_BAD_PATH = -6, + WOLF_SSL_BAD_FILETYPE = -5, + WOLF_SSL_BAD_FILE = -4, + WOLF_SSL_NOT_IMPLEMENTED = -3, + WOLF_SSL_UNKNOWN = -2, + WOLF_SSL_FATAL_ERROR = -1, - SSL_FILETYPE_ASN1 = 2, - SSL_FILETYPE_PEM = 1, - SSL_FILETYPE_DEFAULT = 2, /* ASN1 */ - SSL_FILETYPE_RAW = 3, /* NTRU raw key blob */ + WOLF_SSL_FILETYPE_ASN1 = 2, + WOLF_SSL_FILETYPE_PEM = 1, + WOLF_SSL_FILETYPE_DEFAULT = 2, /* ASN1 */ + WOLF_SSL_FILETYPE_RAW = 3, /* NTRU raw key blob */ - SSL_VERIFY_NONE = 0, - SSL_VERIFY_PEER = 1, - SSL_VERIFY_FAIL_IF_NO_PEER_CERT = 2, - SSL_VERIFY_CLIENT_ONCE = 4, - SSL_VERIFY_FAIL_EXCEPT_PSK = 8, + WOLF_SSL_VERIFY_NONE = 0, + WOLF_SSL_VERIFY_PEER = 1, + WOLF_SSL_VERIFY_FAIL_IF_NO_PEER_CERT = 2, + WOLF_SSL_VERIFY_CLIENT_ONCE = 4, + WOLF_SSL_VERIFY_FAIL_EXCEPT_PSK = 8, - SSL_SESS_CACHE_OFF = 0x0000, - SSL_SESS_CACHE_CLIENT = 0x0001, - SSL_SESS_CACHE_SERVER = 0x0002, - SSL_SESS_CACHE_BOTH = 0x0003, - SSL_SESS_CACHE_NO_AUTO_CLEAR = 0x0008, - SSL_SESS_CACHE_NO_INTERNAL_LOOKUP = 0x0100, - SSL_SESS_CACHE_NO_INTERNAL_STORE = 0x0200, - SSL_SESS_CACHE_NO_INTERNAL = 0x0300, + WOLF_SSL_SESS_CACHE_OFF = 0x0000, + WOLF_SSL_SESS_CACHE_CLIENT = 0x0001, + WOLF_SSL_SESS_CACHE_SERVER = 0x0002, + WOLF_SSL_SESS_CACHE_BOTH = 0x0003, + WOLF_SSL_SESS_CACHE_NO_AUTO_CLEAR = 0x0008, + WOLF_SSL_SESS_CACHE_NO_INTERNAL_LOOKUP = 0x0100, + WOLF_SSL_SESS_CACHE_NO_INTERNAL_STORE = 0x0200, + WOLF_SSL_SESS_CACHE_NO_INTERNAL = 0x0300, - SSL_ERROR_WANT_READ = 2, - SSL_ERROR_WANT_WRITE = 3, - SSL_ERROR_WANT_CONNECT = 7, - SSL_ERROR_WANT_ACCEPT = 8, - SSL_ERROR_SYSCALL = 5, - SSL_ERROR_WANT_X509_LOOKUP = 83, - SSL_ERROR_ZERO_RETURN = 6, - SSL_ERROR_SSL = 85, + WOLF_SSL_ERROR_WANT_READ = 2, + WOLF_SSL_ERROR_WANT_WRITE = 3, + WOLF_SSL_ERROR_WANT_CONNECT = 7, + WOLF_SSL_ERROR_WANT_ACCEPT = 8, + WOLF_SSL_ERROR_SYSCALL = 5, + WOLF_SSL_ERROR_WANT_X509_LOOKUP = 83, + WOLF_SSL_ERROR_ZERO_RETURN = 6, + WOLF_SSL_ERROR_SSL = 85, - SSL_SENT_SHUTDOWN = 1, - SSL_RECEIVED_SHUTDOWN = 2, - SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER = 4, - SSL_OP_NO_SSLv2 = 8, + WOLF_SSL_SENT_SHUTDOWN = 1, + WOLF_SSL_RECEIVED_SHUTDOWN = 2, + WOLF_SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER = 4, + WOLF_SSL_OP_NO_SSLv2 = 8, - SSL_R_SSL_HANDSHAKE_FAILURE = 101, - SSL_R_TLSV1_ALERT_UNKNOWN_CA = 102, - SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN = 103, - SSL_R_SSLV3_ALERT_BAD_CERTIFICATE = 104, + WOLF_SSL_R_SSL_HANDSHAKE_FAILURE = 101, + WOLF_SSL_R_TLSV1_ALERT_UNKNOWN_CA = 102, + WOLF_SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN = 103, + WOLF_SSL_R_SSLV3_ALERT_BAD_CERTIFICATE = 104, - PEM_BUFSIZE = 1024 + WOLF_PEM_BUFSIZE = 1024 }; - #ifndef NO_PSK typedef unsigned int (*wc_psk_client_callback)(WOLFSSL*, const char*, char*, unsigned int, unsigned char*, unsigned int); @@ -1084,7 +1181,7 @@ enum { /* ssl Constants */ /* extra begins */ - +#ifdef OPENSSL_EXTRA enum { /* ERR Constants */ ERR_TXT_STRING = 1 }; @@ -1096,6 +1193,7 @@ enum { WOLFSSL_BIO_SIZE = 17000 /* default BIO write size if not set */ }; +#endif WOLFSSL_API unsigned long wolfSSL_ERR_get_error_line_data(const char**, int*, const char**, int *); @@ -1250,7 +1348,7 @@ typedef struct WC_PKCS12 WC_PKCS12; WOLFSSL_API WC_PKCS12* wolfSSL_d2i_PKCS12_bio(WOLFSSL_BIO* bio, WC_PKCS12** pkcs12); WOLFSSL_API int wolfSSL_PKCS12_parse(WC_PKCS12* pkcs12, const char* psw, - WOLFSSL_EVP_PKEY** pkey, WOLFSSL_X509** cert, STACK_OF(WOLFSSL_X509)** ca); + WOLFSSL_EVP_PKEY** pkey, WOLFSSL_X509** cert, WOLF_STACK_OF(WOLFSSL_X509)** ca); WOLFSSL_API void wolfSSL_PKCS12_PBE_add(void); @@ -1410,7 +1508,7 @@ WOLFSSL_API WC_RNG* wolfSSL_GetRNG(WOLFSSL*); WOLFSSL_API int wolfSSL_CTX_SetMinVersion(WOLFSSL_CTX* ctx, int version); WOLFSSL_API int wolfSSL_SetMinVersion(WOLFSSL* ssl, int version); WOLFSSL_API int wolfSSL_GetObjectSize(void); /* object size based on build */ -WOLFSSL_API int wolfSSL_CTX_GetObjectSize(void); +WOLFSSL_API int wolfSSL_CTX_GetObjectSize(void); WOLFSSL_API int wolfSSL_METHOD_GetObjectSize(void); WOLFSSL_API int wolfSSL_GetOutputSize(WOLFSSL*, int); WOLFSSL_API int wolfSSL_GetMaxOutputSize(WOLFSSL*); @@ -2191,10 +2289,10 @@ WOLFSSL_API void* wolfSSL_get_app_data( const WOLFSSL *ssl); WOLFSSL_API int wolfSSL_set_app_data(WOLFSSL *ssl, void *arg); WOLFSSL_API WOLFSSL_ASN1_OBJECT * wolfSSL_X509_NAME_ENTRY_get_object(WOLFSSL_X509_NAME_ENTRY *ne); WOLFSSL_API WOLFSSL_X509_NAME_ENTRY *wolfSSL_X509_NAME_get_entry(WOLFSSL_X509_NAME *name, int loc); -WOLFSSL_API void wolfSSL_sk_X509_NAME_pop_free(STACK_OF(WOLFSSL_X509_NAME)* sk, void f (WOLFSSL_X509_NAME*)); +WOLFSSL_API void wolfSSL_sk_X509_NAME_pop_free(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk, void f (WOLFSSL_X509_NAME*)); WOLFSSL_API unsigned char *wolfSSL_SHA1(const unsigned char *d, size_t n, unsigned char *md); WOLFSSL_API int wolfSSL_X509_check_private_key(WOLFSSL_X509*, WOLFSSL_EVP_PKEY*); -WOLFSSL_API STACK_OF(WOLFSSL_X509_NAME) *wolfSSL_dup_CA_list( STACK_OF(WOLFSSL_X509_NAME) *sk ); +WOLFSSL_API WOLF_STACK_OF(WOLFSSL_X509_NAME) *wolfSSL_dup_CA_list( WOLF_STACK_OF(WOLFSSL_X509_NAME) *sk ); /* end lighttpd*/ #endif @@ -2249,9 +2347,9 @@ WOLFSSL_API int wolfSSL_RAND_set_rand_method(const void *meth); WOLFSSL_API int wolfSSL_CIPHER_get_bits(const WOLFSSL_CIPHER *c, int *alg_bits); -WOLFSSL_API int wolfSSL_sk_X509_NAME_num(const STACK_OF(WOLFSSL_X509_NAME) *s); +WOLFSSL_API int wolfSSL_sk_X509_NAME_num(const WOLF_STACK_OF(WOLFSSL_X509_NAME) *s); -WOLFSSL_API int wolfSSL_sk_X509_num(const STACK_OF(WOLFSSL_X509) *s); +WOLFSSL_API int wolfSSL_sk_X509_num(const WOLF_STACK_OF(WOLFSSL_X509) *s); WOLFSSL_API int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO*,WOLFSSL_X509_NAME*,int, unsigned long); @@ -2267,11 +2365,11 @@ WOLFSSL_API int wolfSSL_version(WOLFSSL*); WOLFSSL_API int wolfSSL_get_state(const WOLFSSL*); -WOLFSSL_API void* wolfSSL_sk_X509_NAME_value(const STACK_OF(WOLFSSL_X509_NAME)*, int); +WOLFSSL_API void* wolfSSL_sk_X509_NAME_value(const WOLF_STACK_OF(WOLFSSL_X509_NAME)*, int); -WOLFSSL_API void* wolfSSL_sk_X509_value(STACK_OF(WOLFSSL_X509)*, int); +WOLFSSL_API void* wolfSSL_sk_X509_value(WOLF_STACK_OF(WOLFSSL_X509)*, int); -WOLFSSL_API STACK_OF(WOLFSSL_X509)* wolfSSL_get_peer_cert_chain(const WOLFSSL*); +WOLFSSL_API WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_get_peer_cert_chain(const WOLFSSL*); WOLFSSL_API void* wolfSSL_SESSION_get_ex_data(const WOLFSSL_SESSION*, int); @@ -2313,10 +2411,10 @@ WOLFSSL_API void wolfSSL_THREADID_set_callback(void (*threadid_func)(void*)); WOLFSSL_API void wolfSSL_THREADID_set_numeric(void* id, unsigned long val); -WOLFSSL_API STACK_OF(WOLFSSL_X509)* wolfSSL_X509_STORE_get1_certs( +WOLFSSL_API WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_X509_STORE_get1_certs( WOLFSSL_X509_STORE_CTX*, WOLFSSL_X509_NAME*); -WOLFSSL_API void wolfSSL_sk_X509_pop_free(STACK_OF(WOLFSSL_X509)* sk, void f (WOLFSSL_X509*)); +WOLFSSL_API void wolfSSL_sk_X509_pop_free(WOLF_STACK_OF(WOLFSSL_X509)* sk, void f (WOLFSSL_X509*)); #endif /* HAVE_STUNNEL || WOLFSSL_NGINX || WOLFSSL_HAPROXY */ #if defined(HAVE_STUNNEL) || defined(WOLFSSL_MYSQL_COMPATIBLE) \ @@ -2363,7 +2461,7 @@ WOLFSSL_LOCAL char* wolfSSL_get_ocsp_url(WOLFSSL* ssl); /* Not an OpenSSL API. */ WOLFSSL_API int wolfSSL_set_ocsp_url(WOLFSSL* ssl, char* url); -WOLFSSL_API STACK_OF(WOLFSSL_CIPHER) *wolfSSL_get_ciphers_compat(const WOLFSSL *ssl); +WOLFSSL_API WOLF_STACK_OF(WOLFSSL_CIPHER) *wolfSSL_get_ciphers_compat(const WOLFSSL *ssl); WOLFSSL_API void wolfSSL_OPENSSL_config(char *config_name); WOLFSSL_API int wolfSSL_X509_get_ex_new_index(int idx, void *arg, void *a, void *b, void *c); @@ -2401,15 +2499,15 @@ WOLFSSL_API int wolfSSL_CTX_set_tlsext_ticket_key_cb(WOLFSSL_CTX *, int (*)( #ifdef HAVE_OCSP WOLFSSL_API int wolfSSL_CTX_get_extra_chain_certs(WOLFSSL_CTX* ctx, - STACK_OF(X509)** chain); + WOLF_STACK_OF(X509)** chain); WOLFSSL_API int wolfSSL_CTX_set_tlsext_status_cb(WOLFSSL_CTX* ctx, int(*)(WOLFSSL*, void*)); WOLFSSL_API int wolfSSL_X509_STORE_CTX_get1_issuer(WOLFSSL_X509 **issuer, WOLFSSL_X509_STORE_CTX *ctx, WOLFSSL_X509 *x); -WOLFSSL_API void wolfSSL_X509_email_free(STACK_OF(WOLFSSL_STRING) *sk); -WOLFSSL_API STACK_OF(WOLFSSL_STRING) *wolfSSL_X509_get1_ocsp(WOLFSSL_X509 *x); +WOLFSSL_API void wolfSSL_X509_email_free(WOLF_STACK_OF(WOLFSSL_STRING) *sk); +WOLFSSL_API WOLF_STACK_OF(WOLFSSL_STRING) *wolfSSL_X509_get1_ocsp(WOLFSSL_X509 *x); WOLFSSL_API int wolfSSL_X509_check_issued(WOLFSSL_X509 *issuer, WOLFSSL_X509 *subject); @@ -2417,7 +2515,7 @@ WOLFSSL_API int wolfSSL_X509_check_issued(WOLFSSL_X509 *issuer, WOLFSSL_API WOLFSSL_X509* wolfSSL_X509_dup(WOLFSSL_X509 *x); WOLFSSL_API char* wolfSSL_sk_WOLFSSL_STRING_value( - STACK_OF(WOLFSSL_STRING)* strings, int idx); + WOLF_STACK_OF(WOLFSSL_STRING)* strings, int idx); #endif /* HAVE_OCSP */ WOLFSSL_API int PEM_write_bio_WOLFSSL_X509(WOLFSSL_BIO *bio, @@ -2455,6 +2553,7 @@ WOLFSSL_API void wolfSSL_get0_next_proto_negotiated(const WOLFSSL *s, const unsi unsigned *len); +#ifdef OPENSSL_EXTRA #if defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) WOLFSSL_API const unsigned char *SSL_SESSION_get0_id_context( const WOLFSSL_SESSION *sess, unsigned int *sid_ctx_length); @@ -2472,12 +2571,13 @@ WOLFSSL_API int EVP_PKEY_bits(WOLFSSL_EVP_PKEY *pkey); WOLFSSL_API int i2d_X509(WOLFSSL_X509 *x, unsigned char **out); WOLFSSL_API int i2t_ASN1_OBJECT(char *buf, int buf_len, WOLFSSL_ASN1_OBJECT *a); WOLFSSL_API void SSL_CTX_set_tmp_dh_callback(WOLFSSL_CTX *ctx, WOLFSSL_DH *(*dh) (WOLFSSL *ssl, int is_export, int keylength)); -WOLFSSL_API STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void); +WOLFSSL_API WOLF_STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void); WOLFSSL_API int X509_STORE_load_locations(WOLFSSL_X509_STORE *ctx, const char *file, const char *dir); WOLFSSL_API int wolfSSL_sk_SSL_CIPHER_num(const void * p); WOLFSSL_API int wolfSSL_sk_SSL_COMP_zero(WOLFSSL_STACK* st); WOLFSSL_API WOLFSSL_CIPHER* wolfSSL_sk_SSL_CIPHER_value(void *ciphers, int idx); WOLFSSL_API void ERR_load_SSL_strings(void); +#endif /* OPENSSL_EXTRA */ #ifdef __cplusplus } /* extern "C" */ diff --git a/wolfssl/test.h b/wolfssl/test.h index a5b3961a8..36e1e0e43 100644 --- a/wolfssl/test.h +++ b/wolfssl/test.h @@ -498,7 +498,7 @@ static INLINE void ShowX509(WOLFSSL_X509* x509, const char* hdr) printf(" altname = %s\n", altName); ret = wolfSSL_X509_get_serial_number(x509, serial, &sz); - if (ret == SSL_SUCCESS) { + if (ret == WOLF_SSL_SUCCESS) { int i; int strLen; char serialMsg[80]; @@ -1168,7 +1168,7 @@ static INLINE unsigned int my_psk_server_cb(WOLFSSL* ssl, const char* identity, static INLINE void load_buffer(WOLFSSL_CTX* ctx, const char* fname, int type) { - int format = SSL_FILETYPE_PEM; + int format = WOLF_SSL_FILETYPE_PEM; byte* buff = NULL; size_t sz = 0; @@ -1179,26 +1179,26 @@ static INLINE unsigned int my_psk_server_cb(WOLFSSL* ssl, const char* identity, /* determine format */ if (strstr(fname, ".der")) - format = SSL_FILETYPE_ASN1; + format = WOLF_SSL_FILETYPE_ASN1; if (type == WOLFSSL_CA) { if (wolfSSL_CTX_load_verify_buffer(ctx, buff, (long)sz, format) - != SSL_SUCCESS) + != WOLF_SSL_SUCCESS) err_sys("can't load buffer ca file"); } else if (type == WOLFSSL_CERT) { if (wolfSSL_CTX_use_certificate_buffer(ctx, buff, (long)sz, - format) != SSL_SUCCESS) + format) != WOLF_SSL_SUCCESS) err_sys("can't load buffer cert file"); } else if (type == WOLFSSL_KEY) { if (wolfSSL_CTX_use_PrivateKey_buffer(ctx, buff, (long)sz, - format) != SSL_SUCCESS) + format) != WOLF_SSL_SUCCESS) err_sys("can't load buffer key file"); } else if (type == WOLFSSL_CERT_CHAIN) { if (wolfSSL_CTX_use_certificate_chain_buffer_format(ctx, buff, - (long)sz, format) != SSL_SUCCESS) + (long)sz, format) != WOLF_SSL_SUCCESS) err_sys("can't load cert chain buffer"); } diff --git a/wolfssl/wolfcrypt/asn.h b/wolfssl/wolfcrypt/asn.h index 592ea2b9a..6f4f422da 100644 --- a/wolfssl/wolfcrypt/asn.h +++ b/wolfssl/wolfcrypt/asn.h @@ -136,9 +136,9 @@ enum Misc_ASN { ASN_ECC_HEADER_SZ = 2, /* String type + 1 byte len */ ASN_ECC_CONTEXT_SZ = 2, /* Content specific type + 1 byte len */ #ifdef NO_SHA - KEYID_SIZE = SHA256_DIGEST_SIZE, + KEYID_SIZE = WC_SHA256_DIGEST_SIZE, #else - KEYID_SIZE = SHA_DIGEST_SIZE, + KEYID_SIZE = WC_SHA_DIGEST_SIZE, #endif RSA_INTS = 8, /* RSA ints in private key */ DSA_INTS = 5, /* DSA ints in private key */ @@ -674,9 +674,9 @@ extern const char* BEGIN_EDDSA_PRIV; extern const char* END_EDDSA_PRIV; #ifdef NO_SHA - #define SIGNER_DIGEST_SIZE SHA256_DIGEST_SIZE + #define SIGNER_DIGEST_SIZE WC_SHA256_DIGEST_SIZE #else - #define SIGNER_DIGEST_SIZE SHA_DIGEST_SIZE + #define SIGNER_DIGEST_SIZE WC_SHA_DIGEST_SIZE #endif /* CA Signers */ diff --git a/wolfssl/wolfcrypt/hash.h b/wolfssl/wolfcrypt/hash.h index beaeb65ea..19f7b9a44 100644 --- a/wolfssl/wolfcrypt/hash.h +++ b/wolfssl/wolfcrypt/hash.h @@ -58,39 +58,39 @@ enum wc_HashType { typedef union { #ifndef NO_MD5 - Md5 md5; + wc_Md5 md5; #endif #ifndef NO_SHA - Sha sha; + wc_Sha sha; #endif #ifdef WOLFSSL_SHA224 - Sha224 sha224; + wc_Sha224 sha224; #endif #ifndef NO_SHA256 - Sha256 sha256; + wc_Sha256 sha256; #endif #ifdef WOLFSSL_SHA384 - Sha384 sha384; + wc_Sha384 sha384; #endif #ifdef WOLFSSL_SHA512 - Sha512 sha512; + wc_Sha512 sha512; #endif } wc_HashAlg; /* Find largest possible digest size Note if this gets up to the size of 80 or over check smallstack build */ #if defined(WOLFSSL_SHA512) - #define WC_MAX_DIGEST_SIZE SHA512_DIGEST_SIZE + #define WC_MAX_DIGEST_SIZE WC_SHA512_DIGEST_SIZE #elif defined(WOLFSSL_SHA384) - #define WC_MAX_DIGEST_SIZE SHA384_DIGEST_SIZE + #define WC_MAX_DIGEST_SIZE WC_SHA384_DIGEST_SIZE #elif !defined(NO_SHA256) - #define WC_MAX_DIGEST_SIZE SHA256_DIGEST_SIZE + #define WC_MAX_DIGEST_SIZE WC_SHA256_DIGEST_SIZE #elif defined(WOLFSSL_SHA224) - #define WC_MAX_DIGEST_SIZE SHA224_DIGEST_SIZE + #define WC_MAX_DIGEST_SIZE WC_SHA224_DIGEST_SIZE #elif !defined(NO_SHA) - #define WC_MAX_DIGEST_SIZE SHA_DIGEST_SIZE + #define WC_MAX_DIGEST_SIZE WC_SHA_DIGEST_SIZE #elif !defined(NO_MD5) - #define WC_MAX_DIGEST_SIZE MD5_DIGEST_SIZE + #define WC_MAX_DIGEST_SIZE WC_MD5_DIGEST_SIZE #else #define WC_MAX_DIGEST_SIZE 64 /* default to max size of 64 */ #endif diff --git a/wolfssl/wolfcrypt/hmac.h b/wolfssl/wolfcrypt/hmac.h index 9085512a9..744f2e8e0 100644 --- a/wolfssl/wolfcrypt/hmac.h +++ b/wolfssl/wolfcrypt/hmac.h @@ -71,49 +71,50 @@ enum { /* If any hash is not enabled, add the ID here. */ #ifdef NO_MD5 - MD5 = 0, + WC_MD5 = 0, #endif #ifdef NO_SHA - SHA = 1, + WC_SHA = 1, #endif #ifdef NO_SHA256 - SHA256 = 2, + WC_SHA256 = 2, #endif #ifndef WOLFSSL_SHA512 - SHA512 = 4, + WC_SHA512 = 4, #endif #ifndef WOLFSSL_SHA384 - SHA384 = 5, + WC_SHA384 = 5, #endif #ifndef HAVE_BLAKE2 BLAKE2B_ID = 7, #endif #ifndef WOLFSSL_SHA224 - SHA224 = 8, + WC_SHA224 = 8, #endif + /* Select the largest available hash for the buffer size. */ #if defined(WOLFSSL_SHA512) - MAX_DIGEST_SIZE = SHA512_DIGEST_SIZE, - HMAC_BLOCK_SIZE = SHA512_BLOCK_SIZE, + MAX_DIGEST_SIZE = WC_SHA512_DIGEST_SIZE, + HMAC_BLOCK_SIZE = WC_SHA512_BLOCK_SIZE, #elif defined(HAVE_BLAKE2) MAX_DIGEST_SIZE = BLAKE2B_OUTBYTES, HMAC_BLOCK_SIZE = BLAKE2B_BLOCKBYTES, #elif defined(WOLFSSL_SHA384) - MAX_DIGEST_SIZE = SHA384_DIGEST_SIZE, - HMAC_BLOCK_SIZE = SHA384_BLOCK_SIZE + MAX_DIGEST_SIZE = WC_SHA384_DIGEST_SIZE, + HMAC_BLOCK_SIZE = WC_SHA384_BLOCK_SIZE #elif !defined(NO_SHA256) - MAX_DIGEST_SIZE = SHA256_DIGEST_SIZE, - HMAC_BLOCK_SIZE = SHA256_BLOCK_SIZE + MAX_DIGEST_SIZE = WC_SHA256_DIGEST_SIZE, + HMAC_BLOCK_SIZE = WC_SHA256_BLOCK_SIZE #elif defined(WOLFSSL_SHA224) - MAX_DIGEST_SIZE = SHA224_DIGEST_SIZE, - HMAC_BLOCK_SIZE = SHA224_BLOCK_SIZE + MAX_DIGEST_SIZE = WC_SHA224_DIGEST_SIZE, + HMAC_BLOCK_SIZE = WC_SHA224_BLOCK_SIZE #elif !defined(NO_SHA) - MAX_DIGEST_SIZE = SHA_DIGEST_SIZE, - HMAC_BLOCK_SIZE = SHA_BLOCK_SIZE, + MAX_DIGEST_SIZE = WC_SHA_DIGEST_SIZE, + HMAC_BLOCK_SIZE = WC_SHA_BLOCK_SIZE, #elif !defined(NO_MD5) - MAX_DIGEST_SIZE = MD5_DIGEST_SIZE, - HMAC_BLOCK_SIZE = MD5_BLOCK_SIZE, + MAX_DIGEST_SIZE = WC_MD5_DIGEST_SIZE, + HMAC_BLOCK_SIZE = WC_MD5_BLOCK_SIZE, #else #error "You have to have some kind of hash if you want to use HMAC." #endif @@ -123,22 +124,22 @@ enum { /* hash union */ typedef union { #ifndef NO_MD5 - Md5 md5; + wc_Md5 md5; #endif #ifndef NO_SHA - Sha sha; + wc_Sha sha; #endif #ifdef WOLFSSL_SHA224 - Sha224 sha224; + wc_Sha224 sha224; #endif #ifndef NO_SHA256 - Sha256 sha256; + wc_Sha256 sha256; #endif #ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA384 - Sha384 sha384; + wc_Sha384 sha384; #endif - Sha512 sha512; + wc_Sha512 sha512; #endif #ifdef HAVE_BLAKE2 Blake2b blake2b; diff --git a/wolfssl/wolfcrypt/md5.h b/wolfssl/wolfcrypt/md5.h index 5ad54b715..acc19e936 100644 --- a/wolfssl/wolfcrypt/md5.h +++ b/wolfssl/wolfcrypt/md5.h @@ -38,12 +38,20 @@ extern "C" { #endif +#ifndef NO_OLD_WC_NAMES + #define Md5 wc_Md5 + #define MD5 WC_MD5 + #define MD5_BLOCK_SIZE WC_MD5_BLOCK_SIZE + #define MD5_DIGEST_SIZE WC_MD5_DIGEST_SIZE + #define WC_MD5_PAD_SIZE WC_MD5_PAD_SIZE +#endif + /* in bytes */ enum { - MD5 = 0, /* hash type unique */ - MD5_BLOCK_SIZE = 64, - MD5_DIGEST_SIZE = 16, - MD5_PAD_SIZE = 56 + WC_MD5 = 0, /* hash type unique */ + WC_MD5_BLOCK_SIZE = 64, + WC_MD5_DIGEST_SIZE = 16, + WC_MD5_PAD_SIZE = 56 }; #ifdef WOLFSSL_MICROCHIP_PIC32MZ @@ -58,15 +66,15 @@ enum { #else /* MD5 digest */ -typedef struct Md5 { +typedef struct wc_Md5 { word32 buffLen; /* in bytes */ word32 loLen; /* length in bytes */ word32 hiLen; /* length in bytes */ - word32 buffer[MD5_BLOCK_SIZE / sizeof(word32)]; + word32 buffer[WC_MD5_BLOCK_SIZE / sizeof(word32)]; #ifdef WOLFSSL_PIC32MZ_HASH word32 digest[PIC32_DIGEST_SIZE / sizeof(word32)]; #else - word32 digest[MD5_DIGEST_SIZE / sizeof(word32)]; + word32 digest[WC_MD5_DIGEST_SIZE / sizeof(word32)]; #endif void* heap; #ifdef WOLFSSL_PIC32MZ_HASH @@ -78,21 +86,21 @@ typedef struct Md5 { #ifdef WOLFSSL_ASYNC_CRYPT WC_ASYNC_DEV asyncDev; #endif /* WOLFSSL_ASYNC_CRYPT */ -} Md5; +} wc_Md5; #endif /* WOLFSSL_TI_HASH */ -WOLFSSL_API int wc_InitMd5(Md5*); -WOLFSSL_API int wc_InitMd5_ex(Md5*, void*, int); -WOLFSSL_API int wc_Md5Update(Md5*, const byte*, word32); -WOLFSSL_API int wc_Md5Final(Md5*, byte*); -WOLFSSL_API void wc_Md5Free(Md5*); +WOLFSSL_API int wc_InitMd5(wc_Md5*); +WOLFSSL_API int wc_InitMd5_ex(wc_Md5*, void*, int); +WOLFSSL_API int wc_Md5Update(wc_Md5*, const byte*, word32); +WOLFSSL_API int wc_Md5Final(wc_Md5*, byte*); +WOLFSSL_API void wc_Md5Free(wc_Md5*); -WOLFSSL_API int wc_Md5GetHash(Md5*, byte*); -WOLFSSL_API int wc_Md5Copy(Md5*, Md5*); +WOLFSSL_API int wc_Md5GetHash(wc_Md5*, byte*); +WOLFSSL_API int wc_Md5Copy(wc_Md5*, wc_Md5*); #ifdef WOLFSSL_PIC32MZ_HASH -WOLFSSL_API void wc_Md5SizeSet(Md5* md5, word32 len); +WOLFSSL_API void wc_Md5SizeSet(wc_Md5* md5, word32 len); #endif #ifdef __cplusplus diff --git a/wolfssl/wolfcrypt/rsa.h b/wolfssl/wolfcrypt/rsa.h index 985c64190..817beb568 100644 --- a/wolfssl/wolfcrypt/rsa.h +++ b/wolfssl/wolfcrypt/rsa.h @@ -84,8 +84,10 @@ enum { RSA_PSS_PAD_SZ = 8, +#ifdef OPENSSL_EXTRA RSA_PKCS1_PADDING_SIZE = 11, RSA_PKCS1_OAEP_PADDING_SIZE = 42 /* (2 * hashlen(SHA-1)) + 2 */ + #endif }; diff --git a/wolfssl/wolfcrypt/sha.h b/wolfssl/wolfcrypt/sha.h index 1506690c3..3088378f8 100644 --- a/wolfssl/wolfcrypt/sha.h +++ b/wolfssl/wolfcrypt/sha.h @@ -49,42 +49,47 @@ #include #endif +#ifndef NO_OLD_WC_NAMES + #define Sha wc_Sha + #define SHA WC_SHA + #define SHA_BLOCK_SIZE WC_SHA_BLOCK_SIZE + #define SHA_DIGEST_SIZE WC_SHA_DIGEST_SIZE + #define SHA_PAD_SIZE WC_SHA_PAD_SIZE +#endif + /* in bytes */ enum { - SHA = 1, /* hash type unique */ - SHA_BLOCK_SIZE = 64, - SHA_DIGEST_SIZE = 20, - SHA_PAD_SIZE = 56 + WC_SHA = 1, /* hash type unique */ + WC_SHA_BLOCK_SIZE = 64, + WC_SHA_DIGEST_SIZE = 20, + WC_SHA_PAD_SIZE = 56 }; #ifndef WOLFSSL_TI_HASH /* Sha digest */ -typedef struct Sha { -#ifdef FREESCALE_LTC_SHA - ltc_hash_ctx_t ctx; -#else - word32 buffLen; /* in bytes */ - word32 loLen; /* length in bytes */ - word32 hiLen; /* length in bytes */ - word32 buffer[SHA_BLOCK_SIZE / sizeof(word32)]; -#ifdef WOLFSSL_PIC32MZ_HASH - word32 digest[PIC32_DIGEST_SIZE / sizeof(word32)]; -#else - word32 digest[SHA_DIGEST_SIZE / sizeof(word32)]; -#endif - void* heap; -#ifdef WOLFSSL_PIC32MZ_HASH - hashUpdCache cache; /* cache for updates */ -#endif -#if defined(STM32_HASH) && defined(WOLFSSL_STM32_CUBEMX) - HASH_HandleTypeDef hashHandle; -#endif -#ifdef WOLFSSL_ASYNC_CRYPT - WC_ASYNC_DEV asyncDev; -#endif /* WOLFSSL_ASYNC_CRYPT */ +typedef struct wc_Sha { + #ifdef FREESCALE_LTC_SHA + ltc_hash_ctx_t ctx; + #else + word32 buffLen; /* in bytes */ + word32 loLen; /* length in bytes */ + word32 hiLen; /* length in bytes */ + word32 buffer[WC_SHA_BLOCK_SIZE / sizeof(word32)]; + #ifdef WOLFSSL_PIC32MZ_HASH + word32 digest[PIC32_DIGEST_SIZE / sizeof(word32)]; + #else + word32 digest[WC_SHA_DIGEST_SIZE / sizeof(word32)]; + #endif + void* heap; + #ifdef WOLFSSL_PIC32MZ_HASH + hashUpdCache cache; /* cache for updates */ + #endif + #ifdef WOLFSSL_ASYNC_CRYPT + WC_ASYNC_DEV asyncDev; + #endif /* WOLFSSL_ASYNC_CRYPT */ #endif /* FREESCALE_LTC_SHA */ -} Sha; +} wc_Sha; #else #include "wolfssl/wolfcrypt/port/ti/ti-hash.h" @@ -93,17 +98,17 @@ typedef struct Sha { #endif /* HAVE_FIPS */ -WOLFSSL_API int wc_InitSha(Sha*); -WOLFSSL_API int wc_InitSha_ex(Sha* sha, void* heap, int devId); -WOLFSSL_API int wc_ShaUpdate(Sha*, const byte*, word32); -WOLFSSL_API int wc_ShaFinal(Sha*, byte*); -WOLFSSL_API void wc_ShaFree(Sha*); +WOLFSSL_API int wc_InitSha(wc_Sha*); +WOLFSSL_API int wc_InitSha_ex(wc_Sha* sha, void* heap, int devId); +WOLFSSL_API int wc_ShaUpdate(wc_Sha*, const byte*, word32); +WOLFSSL_API int wc_ShaFinal(wc_Sha*, byte*); +WOLFSSL_API void wc_ShaFree(wc_Sha*); -WOLFSSL_API int wc_ShaGetHash(Sha*, byte*); -WOLFSSL_API int wc_ShaCopy(Sha*, Sha*); +WOLFSSL_API int wc_ShaGetHash(wc_Sha*, byte*); +WOLFSSL_API int wc_ShaCopy(wc_Sha*, wc_Sha*); #ifdef WOLFSSL_PIC32MZ_HASH -WOLFSSL_API void wc_ShaSizeSet(Sha* sha, word32 len); +WOLFSSL_API void wc_ShaSizeSet(wc_Sha* sha, word32 len); #endif #ifdef __cplusplus diff --git a/wolfssl/wolfcrypt/sha256.h b/wolfssl/wolfcrypt/sha256.h index 1e17c6b31..b4b625213 100644 --- a/wolfssl/wolfcrypt/sha256.h +++ b/wolfssl/wolfcrypt/sha256.h @@ -52,24 +52,32 @@ #include #endif +#ifndef NO_OLD_WC_NAMES + #define Sha256 wc_Sha256 + #define SHA256 WC_SHA256 + #define SHA256_BLOCK_SIZE WC_SHA256_BLOCK_SIZE + #define SHA256_DIGEST_SIZE WC_SHA256_DIGEST_SIZE + #define SHA256_PAD_SIZE WC_SHA256_PAD_SIZE +#endif + /* in bytes */ enum { - SHA256 = 2, /* hash type unique */ - SHA256_BLOCK_SIZE = 64, - SHA256_DIGEST_SIZE = 32, - SHA256_PAD_SIZE = 56 + WC_SHA256 = 2, /* hash type unique */ + WC_SHA256_BLOCK_SIZE = 64, + WC_SHA256_DIGEST_SIZE = 32, + WC_SHA256_PAD_SIZE = 56 }; #ifndef WOLFSSL_TI_HASH -/* Sha256 digest */ -typedef struct Sha256 { +/* wc_Sha256 digest */ +typedef struct wc_Sha256 { #ifdef FREESCALE_LTC_SHA ltc_hash_ctx_t ctx; #else /* alignment on digest and buffer speeds up ARMv8 crypto operations */ - ALIGN16 word32 digest[SHA256_DIGEST_SIZE / sizeof(word32)]; - ALIGN16 word32 buffer[SHA256_BLOCK_SIZE / sizeof(word32)]; + ALIGN16 word32 digest[WC_SHA256_DIGEST_SIZE / sizeof(word32)]; + ALIGN16 word32 buffer[WC_SHA256_BLOCK_SIZE / sizeof(word32)]; word32 buffLen; /* in bytes */ word32 loLen; /* length in bytes */ word32 hiLen; /* length in bytes */ @@ -84,7 +92,7 @@ typedef struct Sha256 { WC_ASYNC_DEV asyncDev; #endif /* WOLFSSL_ASYNC_CRYPT */ #endif /* FREESCALE_LTC_SHA */ -} Sha256; +} wc_Sha256; #else #include "wolfssl/wolfcrypt/port/ti/ti-hash.h" @@ -92,41 +100,49 @@ typedef struct Sha256 { #endif /* HAVE_FIPS */ -WOLFSSL_API int wc_InitSha256(Sha256*); -WOLFSSL_API int wc_InitSha256_ex(Sha256*, void*, int); -WOLFSSL_API int wc_Sha256Update(Sha256*, const byte*, word32); -WOLFSSL_API int wc_Sha256Final(Sha256*, byte*); -WOLFSSL_API void wc_Sha256Free(Sha256*); +WOLFSSL_API int wc_InitSha256(wc_Sha256*); +WOLFSSL_API int wc_InitSha256_ex(wc_Sha256*, void*, int); +WOLFSSL_API int wc_Sha256Update(wc_Sha256*, const byte*, word32); +WOLFSSL_API int wc_Sha256Final(wc_Sha256*, byte*); +WOLFSSL_API void wc_Sha256Free(wc_Sha256*); -WOLFSSL_API int wc_Sha256GetHash(Sha256*, byte*); -WOLFSSL_API int wc_Sha256Copy(Sha256* src, Sha256* dst); +WOLFSSL_API int wc_Sha256GetHash(wc_Sha256*, byte*); +WOLFSSL_API int wc_Sha256Copy(wc_Sha256* src, wc_Sha256* dst); #ifdef WOLFSSL_PIC32MZ_HASH -WOLFSSL_API void wc_Sha256SizeSet(Sha256*, word32); +WOLFSSL_API void wc_Sha256SizeSet(wc_Sha256*, word32); #endif #ifdef WOLFSSL_SHA224 +#ifndef NO_OLD_WC_NAMES + #define Sha224 wc_Sha224 + #define SHA224 WC_SHA224 + #define SHA224_BLOCK_SIZE WC_SHA224_BLOCK_SIZE + #define SHA224_DIGEST_SIZE WC_SHA224_DIGEST_SIZE + #define SHA224_PAD_SIZE WC_SHA224_PAD_SIZE +#endif + #ifndef HAVE_FIPS /* avoid redefinition of structs */ /* in bytes */ enum { - SHA224 = 8, /* hash type unique */ - SHA224_BLOCK_SIZE = SHA256_BLOCK_SIZE, - SHA224_DIGEST_SIZE = 28, - SHA224_PAD_SIZE = SHA256_PAD_SIZE + WC_SHA224 = 8, /* hash type unique */ + WC_SHA224_BLOCK_SIZE = WC_SHA256_BLOCK_SIZE, + WC_SHA224_DIGEST_SIZE = 28, + WC_SHA224_PAD_SIZE = WC_SHA256_PAD_SIZE }; -typedef Sha256 Sha224; +typedef wc_Sha256 wc_Sha224; #endif /* HAVE_FIPS */ -WOLFSSL_API int wc_InitSha224(Sha224*); -WOLFSSL_API int wc_InitSha224_ex(Sha224*, void*, int); -WOLFSSL_API int wc_Sha224Update(Sha224*, const byte*, word32); -WOLFSSL_API int wc_Sha224Final(Sha224*, byte*); -WOLFSSL_API void wc_Sha224Free(Sha224*); +WOLFSSL_API int wc_InitSha224(wc_Sha224*); +WOLFSSL_API int wc_InitSha224_ex(wc_Sha224*, void*, int); +WOLFSSL_API int wc_Sha224Update(wc_Sha224*, const byte*, word32); +WOLFSSL_API int wc_Sha224Final(wc_Sha224*, byte*); +WOLFSSL_API void wc_Sha224Free(wc_Sha224*); -WOLFSSL_API int wc_Sha224GetHash(Sha224*, byte*); -WOLFSSL_API int wc_Sha224Copy(Sha224* src, Sha224* dst); +WOLFSSL_API int wc_Sha224GetHash(wc_Sha224*, byte*); +WOLFSSL_API int wc_Sha224Copy(wc_Sha224* src, wc_Sha224* dst); #endif /* WOLFSSL_SHA224 */ diff --git a/wolfssl/wolfcrypt/sha512.h b/wolfssl/wolfcrypt/sha512.h index 7fea27e6e..69719eed8 100644 --- a/wolfssl/wolfcrypt/sha512.h +++ b/wolfssl/wolfcrypt/sha512.h @@ -46,61 +46,78 @@ #include #endif +#ifndef NO_OLD_WC_NAMES + #define Sha512 wc_Sha512 + #define SHA512 WC_SHA512 + #define SHA512_BLOCK_SIZE WC_SHA512_BLOCK_SIZE + #define SHA512_DIGEST_SIZE WC_SHA512_DIGEST_SIZE + #define SHA512_PAD_SIZE WC_SHA512_PAD_SIZE +#endif + /* in bytes */ enum { - SHA512 = 4, /* hash type unique */ - SHA512_BLOCK_SIZE = 128, - SHA512_DIGEST_SIZE = 64, - SHA512_PAD_SIZE = 112 + WC_SHA512 = 4, /* hash type unique */ + WC_SHA512_BLOCK_SIZE = 128, + WC_SHA512_DIGEST_SIZE = 64, + WC_SHA512_PAD_SIZE = 112 }; -/* Sha512 digest */ -typedef struct Sha512 { +/* wc_Sha512 digest */ +typedef struct wc_Sha512 { word32 buffLen; /* in bytes */ word64 loLen; /* length in bytes */ word64 hiLen; /* length in bytes */ - word64 digest[SHA512_DIGEST_SIZE / sizeof(word64)]; - word64 buffer[SHA512_BLOCK_SIZE / sizeof(word64)]; + word64 digest[WC_SHA512_DIGEST_SIZE / sizeof(word64)]; + word64 buffer[WC_SHA512_BLOCK_SIZE / sizeof(word64)]; void* heap; #ifdef WOLFSSL_ASYNC_CRYPT WC_ASYNC_DEV asyncDev; #endif /* WOLFSSL_ASYNC_CRYPT */ -} Sha512; +} wc_Sha512; #endif /* HAVE_FIPS */ -WOLFSSL_API int wc_InitSha512(Sha512*); -WOLFSSL_API int wc_InitSha512_ex(Sha512*, void*, int); -WOLFSSL_API int wc_Sha512Update(Sha512*, const byte*, word32); -WOLFSSL_API int wc_Sha512Final(Sha512*, byte*); -WOLFSSL_API void wc_Sha512Free(Sha512*); +WOLFSSL_API int wc_InitSha512(wc_Sha512*); +WOLFSSL_API int wc_InitSha512_ex(wc_Sha512*, void*, int); +WOLFSSL_API int wc_Sha512Update(wc_Sha512*, const byte*, word32); +WOLFSSL_API int wc_Sha512Final(wc_Sha512*, byte*); +WOLFSSL_API void wc_Sha512Free(wc_Sha512*); -WOLFSSL_API int wc_Sha512GetHash(Sha512*, byte*); -WOLFSSL_API int wc_Sha512Copy(Sha512* src, Sha512* dst); +WOLFSSL_API int wc_Sha512GetHash(wc_Sha512*, byte*); +WOLFSSL_API int wc_Sha512Copy(wc_Sha512* src, wc_Sha512* dst); #if defined(WOLFSSL_SHA384) #ifndef HAVE_FIPS /* avoid redefinition of structs */ + +#ifndef NO_OLD_WC_NAMES + #define Sha384 wc_Sha384 + #define SHA384 WC_SHA384 + #define SHA384_BLOCK_SIZE WC_SHA384_BLOCK_SIZE + #define SHA384_DIGEST_SIZE WC_SHA384_DIGEST_SIZE + #define SHA384_PAD_SIZE WC_SHA384_PAD_SIZE +#endif + /* in bytes */ enum { - SHA384 = 5, /* hash type unique */ - SHA384_BLOCK_SIZE = SHA512_BLOCK_SIZE, - SHA384_DIGEST_SIZE = 48, - SHA384_PAD_SIZE = SHA512_PAD_SIZE + WC_SHA384 = 5, /* hash type unique */ + WC_SHA384_BLOCK_SIZE = WC_SHA512_BLOCK_SIZE, + WC_SHA384_DIGEST_SIZE = 48, + WC_SHA384_PAD_SIZE = WC_SHA512_PAD_SIZE }; -typedef Sha512 Sha384; +typedef wc_Sha512 wc_Sha384; #endif /* HAVE_FIPS */ -WOLFSSL_API int wc_InitSha384(Sha384*); -WOLFSSL_API int wc_InitSha384_ex(Sha384*, void*, int); -WOLFSSL_API int wc_Sha384Update(Sha384*, const byte*, word32); -WOLFSSL_API int wc_Sha384Final(Sha384*, byte*); -WOLFSSL_API void wc_Sha384Free(Sha384*); +WOLFSSL_API int wc_InitSha384(wc_Sha384*); +WOLFSSL_API int wc_InitSha384_ex(wc_Sha384*, void*, int); +WOLFSSL_API int wc_Sha384Update(wc_Sha384*, const byte*, word32); +WOLFSSL_API int wc_Sha384Final(wc_Sha384*, byte*); +WOLFSSL_API void wc_Sha384Free(wc_Sha384*); -WOLFSSL_API int wc_Sha384GetHash(Sha384*, byte*); -WOLFSSL_API int wc_Sha384Copy(Sha384* src, Sha384* dst); +WOLFSSL_API int wc_Sha384GetHash(wc_Sha384*, byte*); +WOLFSSL_API int wc_Sha384Copy(wc_Sha384* src, wc_Sha384* dst); #endif /* WOLFSSL_SHA384 */ diff --git a/wolfssl/wolfcrypt/srp.h b/wolfssl/wolfcrypt/srp.h index 1e9469472..6349d31bd 100644 --- a/wolfssl/wolfcrypt/srp.h +++ b/wolfssl/wolfcrypt/srp.h @@ -37,13 +37,13 @@ /* Select the largest available hash for the buffer size. */ #if defined(WOLFSSL_SHA512) - #define SRP_MAX_DIGEST_SIZE SHA512_DIGEST_SIZE + #define SRP_MAX_DIGEST_SIZE WC_SHA512_DIGEST_SIZE #elif defined(WOLFSSL_SHA384) - #define SRP_MAX_DIGEST_SIZE SHA384_DIGEST_SIZE + #define SRP_MAX_DIGEST_SIZE WC_SHA384_DIGEST_SIZE #elif !defined(NO_SHA256) - #define SRP_MAX_DIGEST_SIZE SHA256_DIGEST_SIZE + #define SRP_MAX_DIGEST_SIZE WC_SHA256_DIGEST_SIZE #elif !defined(NO_SHA) - #define SRP_MAX_DIGEST_SIZE SHA_DIGEST_SIZE + #define SRP_MAX_DIGEST_SIZE WC_SHA_DIGEST_SIZE #else #error "You have to have some kind of SHA hash if you want to use SRP." #endif @@ -79,16 +79,16 @@ typedef struct { byte type; union { #ifndef NO_SHA - Sha sha; + wc_Sha sha; #endif #ifndef NO_SHA256 - Sha256 sha256; + wc_Sha256 sha256; #endif #ifdef WOLFSSL_SHA384 - Sha384 sha384; + wc_Sha384 sha384; #endif #ifdef WOLFSSL_SHA512 - Sha512 sha512; + wc_Sha512 sha512; #endif } data; } SrpHash;