PR Feedback

justsmth · Oct 17, 2024 · e867b5d · e867b5d
1 parent 0b8733f
commit e867b5d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/crypto/dh_extra/dh_test.cc b/crypto/dh_extra/dh_test.cc
@@ -1137,7 +1137,7 @@ TEST(DHTest, DHMarshalPubKey) {
     ASSERT_TRUE(BIO_flush(out_bio.get()));
     ASSERT_TRUE(BIO_mem_contents(out_bio.get(), &pubkey_pem, &pubkey_pem_len));
     ASSERT_GT(pubkey_pem_len, (size_t)0);
-    ASSERT_NE(pubkey_pem, nullptr);
+    ASSERT_TRUE(pubkey_pem);
     // We own the allocation after this
     pubkey_pem = (const uint8_t*)OPENSSL_memdup(pubkey_pem, pubkey_pem_len);
   }

diff --git a/crypto/evp_extra/evp_asn1.c b/crypto/evp_extra/evp_asn1.c
@@ -142,6 +142,8 @@ EVP_PKEY *EVP_parse_public_key(CBS *cbs) {
 }
 
 int EVP_marshal_public_key(CBB *cbb, const EVP_PKEY *key) {
+  GUARD_PTR(cbb);
+  GUARD_PTR(key);
   if (key->ameth == NULL || key->ameth->pub_encode == NULL) {
     OPENSSL_PUT_ERROR(EVP, EVP_R_UNSUPPORTED_ALGORITHM);
     return 0;