commit 44628096232d22160840b2fa2ea8438343879f6f
author David Benjamin <davidben@chromium.org> Sun Jul 05 12:33:31 2015 -0400
committer Adam Langley <agl@google.com> Tue Jul 07 01:22:32 2015 +0000
tree 817920bc06f60bb2b32152835e56441742c8f2c3
parent d1d8078025cc654d60ee873c88740f8a987a77b7

Remove SSL_CTX_select_current_cert.

Without certificate slots this function doesn't do anything. It's new in
1.02 and thus unused, so get rid of it rather than maintain a
compatibility stub.

BUG=486295

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

include/openssl/ssl.h

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 1295d87..2a48ed2 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1761,7 +1761,6 @@
 #define SSL_CTRL_GET_EC_POINT_FORMATS 111
 
 #define SSL_CTRL_GET_CHAIN_CERTS 115
-#define SSL_CTRL_SELECT_CURRENT_CERT 116
 
 /* DTLSv1_get_timeout queries the next DTLS handshake timeout. If there is a
  * timeout in progress, it sets |*out| to the time remaining and returns one.
@@ -1870,8 +1869,6 @@
 #define SSL_CTX_clear_chain_certs(ctx) SSL_CTX_set0_chain(ctx, NULL)
 #define SSL_CTX_build_cert_chain(ctx, flags) \
   SSL_CTX_ctrl(ctx, SSL_CTRL_BUILD_CERT_CHAIN, flags, NULL)
-#define SSL_CTX_select_current_cert(ctx, x509) \
-  SSL_CTX_ctrl(ctx, SSL_CTRL_SELECT_CURRENT_CERT, 0, (char *)x509)
 
 #define SSL_CTX_set0_verify_cert_store(ctx, st) \
   SSL_CTX_ctrl(ctx, SSL_CTRL_SET_VERIFY_CERT_STORE, 0, (char *)st)
@@ -1893,8 +1890,6 @@
 #define SSL_clear_chain_certs(ctx) SSL_set0_chain(ctx, NULL)
 #define SSL_build_cert_chain(s, flags) \
   SSL_ctrl(s, SSL_CTRL_BUILD_CERT_CHAIN, flags, NULL)
-#define SSL_select_current_cert(ctx, x509) \
-  SSL_ctrl(ctx, SSL_CTRL_SELECT_CURRENT_CERT, 0, (char *)x509)
 
 #define SSL_set0_verify_cert_store(s, st) \
   SSL_ctrl(s, SSL_CTRL_SET_VERIFY_CERT_STORE, 0, (char *)st)

ssl/s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index c4e0704..0272d6c 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -394,9 +394,6 @@
       ret = 1;
       break;
 
-    case SSL_CTRL_SELECT_CURRENT_CERT:
-      return 1;
-
     case SSL_CTRL_GET_CURVES: {
       const uint16_t *clist = s->s3->tmp.peer_ellipticcurvelist;
       size_t clistlen = s->s3->tmp.peer_ellipticcurvelist_length;
@@ -519,9 +516,6 @@
         return ssl_cert_add0_chain_cert(ctx->cert, (X509 *)parg);
       }
 
-    case SSL_CTRL_SELECT_CURRENT_CERT:
-      return 1;
-
     default:
       return 0;
   }