|
| 1 | +diff --git a/src/bio.c b/src/bio.c |
| 2 | +index 2dab43e..d26a03b 100644 |
| 3 | +--- a/src/bio.c |
| 4 | ++++ b/src/bio.c |
| 5 | +@@ -2336,7 +2336,7 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio) |
| 6 | + |
| 7 | + if (b->ptr != NULL) { |
| 8 | + int rc = wolfSSL_shutdown((WOLFSSL*)b->ptr); |
| 9 | +- if (rc == SSL_SHUTDOWN_NOT_DONE) { |
| 10 | ++ if (rc == WOLFSSL_SHUTDOWN_NOT_DONE) { |
| 11 | + /* In this case, call again to give us a chance to read the |
| 12 | + * close notify alert from the other end. */ |
| 13 | + wolfSSL_shutdown((WOLFSSL*)b->ptr); |
| 14 | +diff --git a/src/pk.c b/src/pk.c |
| 15 | +index d7d32dd..c91aaa8 100644 |
| 16 | +--- a/src/pk.c |
| 17 | ++++ b/src/pk.c |
| 18 | +@@ -25,7 +25,7 @@ |
| 19 | + |
| 20 | + #include <wolfssl/wolfcrypt/settings.h> |
| 21 | + |
| 22 | +- #include <wolfssl/internal.h> |
| 23 | ++#include <wolfssl/internal.h> |
| 24 | + #ifndef WC_NO_RNG |
| 25 | + #include <wolfssl/wolfcrypt/random.h> |
| 26 | + #endif |
| 27 | +@@ -45,10 +45,12 @@ |
| 28 | + #endif |
| 29 | + #else |
| 30 | + |
| 31 | +-#ifndef NO_RSA |
| 32 | ++#ifdef OPENSSL_EXTRA |
| 33 | + #include <wolfssl/wolfcrypt/rsa.h> |
| 34 | + #endif |
| 35 | + |
| 36 | ++#ifndef NO_RSA |
| 37 | ++ |
| 38 | + #if defined(OPENSSL_EXTRA) && !defined(NO_BIO) && defined(WOLFSSL_KEY_GEN) && \ |
| 39 | + (defined(HAVE_ECC) || (!defined(NO_DSA) && !defined(HAVE_SELFTEST))) |
| 40 | + /* Forward declaration for wolfSSL_PEM_write_bio_DSA_PUBKEY. |
| 41 | +@@ -57,6 +59,8 @@ |
| 42 | + static int pem_write_bio_pubkey(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key); |
| 43 | + #endif |
| 44 | + |
| 45 | ++#endif |
| 46 | ++ |
| 47 | + /******************************************************************************* |
| 48 | + * COMMON FUNCTIONS |
| 49 | + ******************************************************************************/ |
| 50 | +@@ -137,7 +141,9 @@ static int pem_mem_to_der(const char* pem, int pemSz, wc_pem_password_cb* cb, |
| 51 | + |
| 52 | + return ret; |
| 53 | + } |
| 54 | +-#endif |
| 55 | ++#endif /* |
| 56 | ++ (!NO_FILESYSTEM && (OPENSSL_EXTRA || OPENSSL_ALL)) || (!NO_BIO && OPENSSL_EXTRA) |
| 57 | ++*/ |
| 58 | + |
| 59 | + #if !defined(NO_RSA) || !defined(WOLFCRYPT_ONLY) |
| 60 | + #ifndef NO_BIO |
| 61 | +@@ -217,7 +223,7 @@ static int pem_read_file_key(XFILE fp, wc_pem_password_cb* cb, void* pass, |
| 62 | + return ret; |
| 63 | + } |
| 64 | + #endif /* !NO_FILESYSTEM */ |
| 65 | +-#endif |
| 66 | ++#endif /* !NO_RSA || !WOLFCRYPT_ONLY */ |
| 67 | + |
| 68 | + #if defined(OPENSSL_EXTRA) && ((!defined(NO_RSA) && defined(WOLFSSL_KEY_GEN)) \ |
| 69 | + || !defined(WOLFCRYPT_ONLY)) |
| 70 | +@@ -294,7 +300,7 @@ static int der_write_to_bio_as_pem(const unsigned char* der, int derSz, |
| 71 | + XFREE(pem, bio->heap, DYNAMIC_TYPE_TMP_BUFFER); |
| 72 | + return ret; |
| 73 | + } |
| 74 | +-#endif |
| 75 | ++#endif /* !NO_BIO */ |
| 76 | + #endif |
| 77 | + |
| 78 | + #if (!defined(NO_RSA) && defined(WOLFSSL_KEY_GEN)) || \ |
| 79 | +diff --git a/src/ssl.c b/src/ssl.c |
| 80 | +index ea66e42..8bede43 100644 |
| 81 | +--- a/src/ssl.c |
| 82 | ++++ b/src/ssl.c |
| 83 | +@@ -27200,7 +27200,7 @@ int wolfSSL_CTX_use_PrivateKey(WOLFSSL_CTX *ctx, WOLFSSL_EVP_PKEY *pkey) |
| 84 | + /* ptr for WOLFSSL_EVP_PKEY struct is expected to be DER format */ |
| 85 | + return wolfSSL_CTX_use_PrivateKey_buffer(ctx, |
| 86 | + (const unsigned char*)pkey->pkey.ptr, |
| 87 | +- pkey->pkey_sz, SSL_FILETYPE_ASN1); |
| 88 | ++ pkey->pkey_sz, WOLFSSL_FILETYPE_ASN1); |
| 89 | + } |
| 90 | + |
| 91 | + WOLFSSL_MSG("wolfSSL private key not set"); |
| 92 | +@@ -27861,7 +27861,7 @@ int wolfSSL_CTX_use_RSAPrivateKey(WOLFSSL_CTX* ctx, WOLFSSL_RSA* rsa) |
| 93 | + return WOLFSSL_FAILURE; |
| 94 | + } |
| 95 | + ret = wolfSSL_CTX_use_PrivateKey_buffer(ctx, (const unsigned char*)maxDerBuf, |
| 96 | +- derSize, SSL_FILETYPE_ASN1); |
| 97 | ++ derSize, WOLFSSL_FILETYPE_ASN1); |
| 98 | + if (ret != WOLFSSL_SUCCESS) { |
| 99 | + WOLFSSL_MSG("wolfSSL_CTX_USE_PrivateKey_buffer() failure"); |
| 100 | + XFREE(maxDerBuf, NULL, DYNAMIC_TYPE_TMP_BUFFER); |
| 101 | +diff --git a/src/x509.c b/src/x509.c |
| 102 | +index eefa69c..4d5244c 100644 |
| 103 | +--- a/src/x509.c |
| 104 | ++++ b/src/x509.c |
| 105 | +@@ -37,6 +37,7 @@ |
| 106 | + #ifndef NO_CERTS |
| 107 | + |
| 108 | + #if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL) |
| 109 | ++ #include <wolfssl/openssl/rsa.h> |
| 110 | + #include <wolfssl/openssl/x509v3.h> |
| 111 | + #endif |
| 112 | + |
| 113 | +@@ -11549,7 +11550,7 @@ err: |
| 114 | + #ifndef NO_FILESYSTEM |
| 115 | + WOLF_STACK_OF(WOLFSSL_X509_INFO)* wolfSSL_PEM_X509_INFO_read( |
| 116 | + XFILE fp, WOLF_STACK_OF(WOLFSSL_X509_INFO)* sk, |
| 117 | +- pem_password_cb* cb, void* u) |
| 118 | ++ wc_pem_password_cb* cb, void* u) |
| 119 | + { |
| 120 | + WOLFSSL_BIO* fileBio = wolfSSL_BIO_new_fp(fp, BIO_NOCLOSE); |
| 121 | + WOLF_STACK_OF(WOLFSSL_X509_INFO)* ret = NULL; |
| 122 | +diff --git a/wolfcrypt/src/evp.c b/wolfcrypt/src/evp.c |
| 123 | +index a365ff6..44dc74c 100644 |
| 124 | +--- a/wolfcrypt/src/evp.c |
| 125 | ++++ b/wolfcrypt/src/evp.c |
| 126 | +@@ -44,6 +44,7 @@ |
| 127 | + |
| 128 | + #include <wolfssl/openssl/ecdsa.h> |
| 129 | + #include <wolfssl/openssl/evp.h> |
| 130 | ++#include <wolfssl/openssl/rsa.h> |
| 131 | + #include <wolfssl/openssl/kdf.h> |
| 132 | + #include <wolfssl/wolfcrypt/wolfmath.h> |
| 133 | + |
| 134 | +@@ -8791,11 +8792,11 @@ WOLFSSL_DSA* wolfSSL_EVP_PKEY_get1_DSA(WOLFSSL_EVP_PKEY* key) |
| 135 | + |
| 136 | + if (key->type == EVP_PKEY_DSA) { |
| 137 | + if (wolfSSL_DSA_LoadDer(local, (const unsigned char*)key->pkey.ptr, |
| 138 | +- key->pkey_sz) != SSL_SUCCESS) { |
| 139 | ++ key->pkey_sz) != WOLFSSL_SUCCESS) { |
| 140 | + /* now try public key */ |
| 141 | + if (wolfSSL_DSA_LoadDer_ex(local, |
| 142 | + (const unsigned char*)key->pkey.ptr, key->pkey_sz, |
| 143 | +- WOLFSSL_DSA_LOAD_PUBLIC) != SSL_SUCCESS) { |
| 144 | ++ WOLFSSL_DSA_LOAD_PUBLIC) != WOLFSSL_SUCCESS) { |
| 145 | + wolfSSL_DSA_free(local); |
| 146 | + local = NULL; |
| 147 | + } |
| 148 | +@@ -8986,7 +8987,7 @@ WOLFSSL_DH* wolfSSL_EVP_PKEY_get1_DH(WOLFSSL_EVP_PKEY* key) |
| 149 | + return NULL; |
| 150 | + } |
| 151 | + if (wolfSSL_DH_LoadDer(local, (const unsigned char*)key->pkey.ptr, |
| 152 | +- key->pkey_sz) != SSL_SUCCESS) { |
| 153 | ++ key->pkey_sz) != WOLFSSL_SUCCESS) { |
| 154 | + wolfSSL_DH_free(local); |
| 155 | + WOLFSSL_MSG("Error wolfSSL_DH_LoadDer"); |
| 156 | + local = NULL; |
| 157 | +diff --git a/wolfssl/openssl/cms.h b/wolfssl/openssl/cms.h |
| 158 | +index 5355c61..9e4585b 100644 |
| 159 | +--- a/wolfssl/openssl/cms.h |
| 160 | ++++ b/wolfssl/openssl/cms.h |
| 161 | +@@ -22,5 +22,4 @@ |
| 162 | + #ifndef WOLFSSL_CMS_H_ |
| 163 | + #define WOLFSSL_CMS_H_ |
| 164 | + |
| 165 | +- |
| 166 | + #endif /* WOLFSSL_CMS_H_ */ |
| 167 | +diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h |
| 168 | +index 804ec44..0e28177 100644 |
| 169 | +--- a/wolfssl/ssl.h |
| 170 | ++++ b/wolfssl/ssl.h |
| 171 | +@@ -40,6 +40,9 @@ |
| 172 | + |
| 173 | + /* For the types */ |
| 174 | + #include <wolfssl/openssl/compat_types.h> |
| 175 | ++#ifdef OPENSSL_EXTRA |
| 176 | ++#include <wolfssl/openssl/bn.h> |
| 177 | ++#endif |
| 178 | + |
| 179 | + #ifdef HAVE_WOLF_EVENT |
| 180 | + #include <wolfssl/wolfcrypt/wolfevent.h> |
| 181 | +@@ -4481,7 +4484,7 @@ WOLFSSL_API WOLFSSL_X509 *wolfSSL_PEM_read_bio_X509_AUX |
| 182 | + #ifndef NO_FILESYSTEM |
| 183 | + WOLFSSL_API WOLF_STACK_OF(WOLFSSL_X509_INFO)* wolfSSL_PEM_X509_INFO_read( |
| 184 | + XFILE fp, WOLF_STACK_OF(WOLFSSL_X509_INFO)* sk, |
| 185 | +- pem_password_cb* cb, void* u); |
| 186 | ++ wc_pem_password_cb* cb, void* u); |
| 187 | + #endif |
| 188 | + WOLFSSL_API WOLF_STACK_OF(WOLFSSL_X509_INFO)* wolfSSL_PEM_X509_INFO_read_bio( |
| 189 | + WOLFSSL_BIO* bio, WOLF_STACK_OF(WOLFSSL_X509_INFO)* sk, |
0 commit comments