kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove SSL_get0_raw_cipherlist.

Browse Source 
The API is unused and rather awkward (mixes output parameters with
return values, special-case for NULL).

Change-Id: I4396f98534bf1271e53642f255e235cf82c7615a
Reviewed-on: https://boringssl-review.googlesource.com/4560
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-04-26 18:32:05 -04:00 committed by Adam Langley
parent 1d0a194cc1
commit 2844b5eb1e
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/openssl/ssl.h
View File

@ -1637,7 +1637,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
#define SSL_CTRL_SET_VERIFY_CERT_STORE 106 #define SSL_CTRL_SET_VERIFY_CERT_STORE 106
#define SSL_CTRL_SET_CHAIN_CERT_STORE 107 #define SSL_CTRL_SET_CHAIN_CERT_STORE 107
#define SSL_CTRL_GET_SERVER_TMP_KEY 109 #define SSL_CTRL_GET_SERVER_TMP_KEY 109
#define SSL_CTRL_GET_RAW_CIPHERLIST 110
#define SSL_CTRL_GET_EC_POINT_FORMATS 111 #define SSL_CTRL_GET_EC_POINT_FORMATS 111
#define SSL_CTRL_GET_CHAIN_CERTS 115 #define SSL_CTRL_GET_CHAIN_CERTS 115
@ -1825,9 +1824,6 @@ OPENSSL_EXPORT int DTLSv1_handle_timeout(SSL *ssl);
#define SSL_get_server_tmp_key(s, pk) \ #define SSL_get_server_tmp_key(s, pk) \
SSL_ctrl(s, SSL_CTRL_GET_SERVER_TMP_KEY, 0, pk) SSL_ctrl(s, SSL_CTRL_GET_SERVER_TMP_KEY, 0, pk)
#define SSL_get0_raw_cipherlist(s, plst) \
SSL_ctrl(s, SSL_CTRL_GET_RAW_CIPHERLIST, 0, (char *)plst)
#define SSL_get0_ec_point_formats(s, plst) \ #define SSL_get0_ec_point_formats(s, plst) \
SSL_ctrl(s, SSL_CTRL_GET_EC_POINT_FORMATS, 0, (char *)plst) SSL_ctrl(s, SSL_CTRL_GET_EC_POINT_FORMATS, 0, (char *)plst)

13
ssl/ssl_lib.c
View File

@ -1072,19 +1072,6 @@ long SSL_ctrl(SSL *s, int cmd, long larg, void *parg) {
} }
return 0; return 0;
case SSL_CTRL_GET_RAW_CIPHERLIST:
if (parg) {
if (s->cert->ciphers_raw == NULL) {
return 0;
}
*(uint8_t **)parg = s->cert->ciphers_raw;
return (int)s->cert->ciphers_rawlen;
}
/* Passing a NULL |parg| returns the size of a single
* cipher suite value. */
return 2;
default: default:
return s->method->ssl_ctrl(s, cmd, larg, parg); return s->method->ssl_ctrl(s, cmd, larg, parg);
} }