commit 651b3d928444fc5633b6df10f991c1aaebb5345b
author David Benjamin <davidben@chromium.org> Sun Aug 09 12:07:25 2015 -0400
committer Adam Langley <agl@google.com> Tue Aug 18 22:14:31 2015 +0000
tree 05f380f0e158e921ca1c35f4a928ca0bbc930016
parent 3dd9016a5181c20bad8e146fed231bd0f2cc5b48

ssl->cert and ctx->cert cannot be NULL.

They get initialized in SSL_new and SSL_CTX_new, respectively.

Change-Id: Ib484108987a99f654d1a77fc473103f5cb393bd7
Reviewed-on: https://boringssl-review.googlesource.com/5676
Reviewed-by: Adam Langley <agl@google.com>

ssl/ssl_lib.c

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 7628e7a..e2437b9 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -794,7 +794,7 @@
 
 /* Fix this so it checks all the valid key/cert options */
 int SSL_CTX_check_private_key(const SSL_CTX *ctx) {
-  if (ctx == NULL || ctx->cert == NULL || ctx->cert->x509 == NULL) {
+  if (ctx->cert->x509 == NULL) {
     OPENSSL_PUT_ERROR(SSL, SSL_R_NO_CERTIFICATE_ASSIGNED);
     return 0;
   }
@@ -809,16 +809,6 @@
 
 /* Fix this function so that it takes an optional type parameter */
 int SSL_check_private_key(const SSL *ssl) {
-  if (ssl == NULL) {
-    OPENSSL_PUT_ERROR(SSL, ERR_R_PASSED_NULL_PARAMETER);
-    return 0;
-  }
-
-  if (ssl->cert == NULL) {
-    OPENSSL_PUT_ERROR(SSL, SSL_R_NO_CERTIFICATE_ASSIGNED);
-    return 0;
-  }
-
   if (ssl->cert->x509 == NULL) {
     OPENSSL_PUT_ERROR(SSL, SSL_R_NO_CERTIFICATE_ASSIGNED);
     return 0;
@@ -1811,13 +1801,6 @@
   int have_ecc_cert = 0, ecdsa_ok;
   X509 *x;
 
-  if (c == NULL) {
-    /* TODO(davidben): Is this codepath possible? */
-    *out_mask_k = 0;
-    *out_mask_a = 0;
-    return;
-  }
-
   dh_tmp = (c->dh_tmp != NULL || c->dh_tmp_cb != NULL);
 
   if (s->cert->x509 != NULL && ssl_has_private_key(s)) {