Refactor - Split test to two different functions

Author: Roy-Carter

tests/api/test_ossl_pem.c

@@ -755,40 +755,31 @@ int test_wolfSSL_PEM_PrivateKey(void)
     return EXPECT_RESULT();
 }
 
-int test_wolfSSL_PEM_write_PrivateKey_PUBKEY(void)
+int test_wolfSSL_PEM_write_PrivateKey(void)
 {
     EXPECT_DECLS;
 #if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && !defined(NO_RSA) && \
     !defined(NO_FILESYSTEM) && defined(USE_CERT_BUFFERS_2048) && \
     !defined(NO_ASN) && !defined(NO_PWDBASED)
     const char* privFile = "./test-pem-write-private-key.pem";
-    const char* pubFile = "./test-pem-write-pubkey.pem";
     const unsigned char* serverKey =
         (const unsigned char*)server_key_der_2048;
     EVP_PKEY* pkey = NULL;
     EVP_PKEY* readPriv = NULL;
-    EVP_PKEY* readPub = NULL;
-    unsigned char* pubDer = NULL;
-    unsigned char* readPubDer = NULL;
     XFILE fp = XBADFILE;
-    long privSz = 0;
-    long pubSz = 0;
-    int pubDerSz = 0;
-    int readPubDerSz = 0;
 
     remove(privFile);
-    remove(pubFile);
 
     ExpectNotNull(wolfSSL_d2i_PrivateKey(EVP_PKEY_RSA, &pkey, &serverKey,
         (long)sizeof_server_key_der_2048));
 
+    /* Bad-argument checks. */
     ExpectIntEQ(PEM_write_PrivateKey(XBADFILE, pkey, NULL, NULL, 0, NULL,
         NULL), 0);
     ExpectIntEQ(PEM_write_PrivateKey(stderr, NULL, NULL, NULL, 0, NULL,
         NULL), 0);
-    ExpectIntEQ(PEM_write_PUBKEY(XBADFILE, pkey), 0);
-    ExpectIntEQ(PEM_write_PUBKEY(stderr, NULL), 0);
 
+    /* Write private key to file. */
     ExpectTrue((fp = XFOPEN(privFile, "wb")) != XBADFILE);
     if (fp != XBADFILE) {
         ExpectIntEQ(PEM_write_PrivateKey(fp, pkey, NULL, NULL, 0, NULL, NULL),
@@ -797,11 +788,9 @@ int test_wolfSSL_PEM_write_PrivateKey_PUBKEY(void)
         fp = XBADFILE;
     }
 
+    /* Read it back and verify the DER content matches. */
     ExpectTrue((fp = XFOPEN(privFile, "rb")) != XBADFILE);
     if (fp != XBADFILE) {
-        ExpectTrue(XFSEEK(fp, 0, XSEEK_END) == 0);
-        ExpectIntGT(privSz = XFTELL(fp), 0);
-        ExpectTrue(XFSEEK(fp, 0, XSEEK_SET) == 0);
         ExpectNotNull(readPriv = PEM_read_PrivateKey(fp, NULL, NULL, NULL));
         XFCLOSE(fp);
         fp = XBADFILE;
@@ -813,19 +802,56 @@ int test_wolfSSL_PEM_write_PrivateKey_PUBKEY(void)
             pkey->pkey_sz), 0);
     }
 
+    EVP_PKEY_free(readPriv);
+    EVP_PKEY_free(pkey);
+    if (fp != XBADFILE) {
+        XFCLOSE(fp);
+    }
+    remove(privFile);
+#endif
+    return EXPECT_RESULT();
+}
+
+int test_wolfSSL_PEM_write_PUBKEY(void)
+{
+    EXPECT_DECLS;
+#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && !defined(NO_RSA) && \
+    !defined(NO_FILESYSTEM) && defined(USE_CERT_BUFFERS_2048) && \
+    !defined(NO_ASN) && !defined(NO_PWDBASED)
+    const char* pubFile = "./test-pem-write-pubkey.pem";
+    const unsigned char* serverKey =
+        (const unsigned char*)server_key_der_2048;
+    EVP_PKEY* pkey = NULL;
+    EVP_PKEY* readPub = NULL;
+    unsigned char* pubDer = NULL;
+    unsigned char* readPubDer = NULL;
+    XFILE fp = XBADFILE;
+    int pubDerSz = 0;
+    int readPubDerSz = 0;
+
+    remove(pubFile);
+
+    ExpectNotNull(wolfSSL_d2i_PrivateKey(EVP_PKEY_RSA, &pkey, &serverKey,
+        (long)sizeof_server_key_der_2048));
+
+    /* Bad-argument checks. */
+    ExpectIntEQ(PEM_write_PUBKEY(XBADFILE, pkey), 0);
+    ExpectIntEQ(PEM_write_PUBKEY(stderr, NULL), 0);
+
+    /* Capture the expected public-key DER for later comparison. */
     ExpectIntGT(pubDerSz = wolfSSL_i2d_PUBKEY(pkey, &pubDer), 0);
+
+    /* Write public key to file. */
     ExpectTrue((fp = XFOPEN(pubFile, "wb")) != XBADFILE);
     if (fp != XBADFILE) {
         ExpectIntEQ(PEM_write_PUBKEY(fp, pkey), 1);
         XFCLOSE(fp);
         fp = XBADFILE;
     }
 
+    /* Read it back and verify the DER content matches. */
     ExpectTrue((fp = XFOPEN(pubFile, "rb")) != XBADFILE);
     if (fp != XBADFILE) {
-        ExpectTrue(XFSEEK(fp, 0, XSEEK_END) == 0);
-        ExpectIntGT(pubSz = XFTELL(fp), 0);
-        ExpectTrue(XFSEEK(fp, 0, XSEEK_SET) == 0);
         ExpectNotNull(readPub = PEM_read_PUBKEY(fp, NULL, NULL, NULL));
         XFCLOSE(fp);
         fp = XBADFILE;
@@ -837,17 +863,13 @@ int test_wolfSSL_PEM_write_PrivateKey_PUBKEY(void)
         ExpectIntEQ(XMEMCMP(pubDer, readPubDer, pubDerSz), 0);
     }
 
-    ExpectIntGT(privSz, pubSz);
-
     XFREE(readPubDer, NULL, DYNAMIC_TYPE_PUBLIC_KEY);
     XFREE(pubDer, NULL, DYNAMIC_TYPE_PUBLIC_KEY);
     EVP_PKEY_free(readPub);
-    EVP_PKEY_free(readPriv);
     EVP_PKEY_free(pkey);
     if (fp != XBADFILE) {
         XFCLOSE(fp);
     }
-    remove(privFile);
     remove(pubFile);
 #endif
     return EXPECT_RESULT();

tests/api/test_ossl_pem.h

@@ -32,7 +32,8 @@ int test_wolfSSL_PEM_PrivateKey_ecc(void);
 int test_wolfSSL_PEM_PrivateKey_dsa(void);
 int test_wolfSSL_PEM_PrivateKey_dh(void);
 int test_wolfSSL_PEM_PrivateKey(void);
-int test_wolfSSL_PEM_write_PrivateKey_PUBKEY(void);
+int test_wolfSSL_PEM_write_PrivateKey(void);
+int test_wolfSSL_PEM_write_PUBKEY(void);
 int test_wolfSSL_PEM_file_RSAKey(void);
 int test_wolfSSL_PEM_file_RSAPrivateKey(void);
 int test_wolfSSL_PEM_read_RSA_PUBKEY(void);
@@ -53,7 +54,8 @@ int test_wolfSSL_PEM_PUBKEY(void);
     TEST_DECL_GROUP("ossl_pem", test_wolfSSL_PEM_PrivateKey_dsa),       \
     TEST_DECL_GROUP("ossl_pem", test_wolfSSL_PEM_PrivateKey_dh),        \
     TEST_DECL_GROUP("ossl_pem", test_wolfSSL_PEM_PrivateKey),           \
-    TEST_DECL_GROUP("ossl_pem", test_wolfSSL_PEM_write_PrivateKey_PUBKEY), \
+    TEST_DECL_GROUP("ossl_pem", test_wolfSSL_PEM_write_PrivateKey),     \
+    TEST_DECL_GROUP("ossl_pem", test_wolfSSL_PEM_write_PUBKEY),         \
     TEST_DECL_GROUP("ossl_pem", test_wolfSSL_PEM_file_RSAKey),          \
     TEST_DECL_GROUP("ossl_pem", test_wolfSSL_PEM_file_RSAPrivateKey),   \
     TEST_DECL_GROUP("ossl_pem", test_wolfSSL_PEM_read_RSA_PUBKEY),      \