Refactor : fix some buggy logic + cleaned code

Author: Roy-Carter

src/bio.c

@@ -2077,13 +2077,6 @@ long wolfSSL_BIO_set_nbio(WOLFSSL_BIO* bio, long on)
     return WOLFSSL_SUCCESS;
 }
 
-/* Returns a unique index for a new custom BIO type.
- * In OpenSSL, custom BIO types start at BIO_TYPE_START (128|0x0200).
- * wolfSSL uses a simpler scheme starting at 128.
- *
- * @return  New unique BIO type index on success.
- * @return  -1 when the index space is exhausted.
- */
 int wolfSSL_BIO_get_new_index(void)
 {
     static int bio_type_idx = WOLFSSL_BIO_TYPE_START;
@@ -2092,7 +2085,7 @@ int wolfSSL_BIO_get_new_index(void)
     WOLFSSL_ENTER("wolfSSL_BIO_get_new_index");
 
     idx = bio_type_idx;
-    if (idx > WOLFSSL_BIO_TYPE_MAX + WOLFSSL_BIO_TYPE_START) {
+    if (idx > WOLFSSL_BIO_TYPE_MAX) {
         WOLFSSL_MSG("BIO type index space exhausted");
         return -1;
     }

src/ssl.c

@@ -10758,7 +10758,7 @@ const char* wolfSSL_OpenSSL_version(int type)
         case OPENSSL_PLATFORM:
             return "platform: information not available";
         case OPENSSL_DIR:
-            return "OPENSSLDIR: \"\"";
+            return "OPENSSLDIR: N/A";
         case OPENSSL_ENGINES_DIR:
             return "ENGINESDIR: N/A";
         default:
@@ -10770,8 +10770,8 @@ const char* wolfSSL_OpenSSL_version(void)
 {
     return "wolfSSL " LIBWOLFSSL_VERSION_STRING;
 }
-#endif /* WOLFSSL_QT */
-#endif
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+#endif /* OPENSSL_EXTRA */
 
 
 /* current library version in hex */

tests/api/test_ossl_bio.c

@@ -1811,23 +1811,26 @@ int test_wolfSSL_BIO_get_new_index(void)
     BIO_METHOD* meth = NULL;
     BIO* bio = NULL;
 
-    /* Get three consecutive indices - should be unique and >= 128 */
+    /* Get three consecutive indices - should be unique and in valid range */
     idx1 = BIO_get_new_index();
     idx2 = BIO_get_new_index();
     idx3 = BIO_get_new_index();
 
     ExpectIntGE(idx1, BIO_TYPE_START);
+    ExpectIntLE(idx1, WOLFSSL_BIO_TYPE_MAX);
     ExpectIntGE(idx2, BIO_TYPE_START);
+    ExpectIntLE(idx2, WOLFSSL_BIO_TYPE_MAX);
     ExpectIntGE(idx3, BIO_TYPE_START);
+    ExpectIntLE(idx3, WOLFSSL_BIO_TYPE_MAX);
 
     /* Each index must be unique */
     ExpectIntNE(idx1, idx2);
     ExpectIntNE(idx2, idx3);
     ExpectIntNE(idx1, idx3);
 
-    /* Indices should be sequential */
-    ExpectIntEQ(idx2, idx1 + 1);
-    ExpectIntEQ(idx3, idx2 + 1);
+    /* Each consecutive call must return a strictly increasing value */
+    ExpectIntGT(idx2, idx1);
+    ExpectIntGT(idx3, idx2);
 
     /* Use returned index with BIO_meth_new */
     ExpectNotNull(meth = BIO_meth_new(idx1, "custom_test"));

wolfcrypt/src/evp_pk.c

@@ -1926,8 +1926,10 @@ int wolfSSL_i2d_PUBKEY_bio(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key)
         return WOLFSSL_FAILURE;
     }
 
+    /* Let wolfSSL_i2d_PUBKEY allocate the buffer (pass NULL to trigger
+     * internal allocation). We free it ourselves after writing to the BIO. */
     derSz = wolfSSL_i2d_PUBKEY(key, &der);
-    if (derSz <= 0) {
+    if (derSz <= 0 || der == NULL) {
         WOLFSSL_MSG("wolfSSL_i2d_PUBKEY failed");
         return WOLFSSL_FAILURE;
     }
@@ -1939,7 +1941,7 @@ int wolfSSL_i2d_PUBKEY_bio(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key)
     ret = WOLFSSL_SUCCESS;
 
 cleanup:
-    XFREE(der, NULL, DYNAMIC_TYPE_OPENSSL);
+    XFREE(der, NULL, DYNAMIC_TYPE_TMP_BUFFER);
     return ret;
 }
 #endif /* !NO_BIO */