NULL-check s2n_cert_chain_and_key_get_pkey_type (#3064)

aws · Sep 28, 2021 · 32e971f · 32e971f
1 parent 88002d8
commit 32e971f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/crypto/s2n_certificate.c b/crypto/s2n_certificate.c
@@ -619,6 +619,11 @@ void *s2n_cert_chain_and_key_get_ctx(struct s2n_cert_chain_and_key *cert_and_key
 
 s2n_pkey_type s2n_cert_chain_and_key_get_pkey_type(struct s2n_cert_chain_and_key *chain_and_key)
 {
+    if (chain_and_key == NULL
+         || chain_and_key->cert_chain == NULL
+         || chain_and_key->cert_chain->head == NULL) {
+        return S2N_PKEY_TYPE_UNKNOWN;
+    }
     return chain_and_key->cert_chain->head->pkey_type;
 }