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

Remove SSL cert_flags.

Browse Source 
These are never used and no flags are defined anyway.

Change-Id: I206dc2838c5f68d87559a702dcb299b208cc7e1e
Reviewed-on: https://boringssl-review.googlesource.com/4493
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-04-21 01:34:50 -04:00 committed by Adam Langley
parent a383f7c9e2
commit ed8fbad170
4 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/openssl/ssl.h
View File

@ -594,14 +594,6 @@ typedef struct timeval OPENSSL_timeval;
#define SSL_get_secure_renegotiation_support(ssl) \ #define SSL_get_secure_renegotiation_support(ssl) \
SSL_ctrl((SSL *)(ssl), SSL_CTRL_GET_RI_SUPPORT, 0, NULL) SSL_ctrl((SSL *)(ssl), SSL_CTRL_GET_RI_SUPPORT, 0, NULL)
#define SSL_CTX_set_cert_flags(ctx, op) \
SSL_CTX_ctrl((ctx), SSL_CTRL_CERT_FLAGS, (op), NULL)
#define SSL_set_cert_flags(s, op) SSL_ctrl((s), SSL_CTRL_CERT_FLAGS, (op), NULL)
#define SSL_CTX_clear_cert_flags(ctx, op) \
SSL_CTX_ctrl((ctx), SSL_CTRL_CLEAR_CERT_FLAGS, (op), NULL)
#define SSL_clear_cert_flags(s, op) \
SSL_ctrl((s), SSL_CTRL_CLEAR_CERT_FLAGS, (op), NULL)
/* SSL_CTX_set_min_version sets the minimum protocol version for |ctx| to /* SSL_CTX_set_min_version sets the minimum protocol version for |ctx| to
* |version|. */ * |version|. */
OPENSSL_EXPORT void SSL_CTX_set_min_version(SSL_CTX *ctx, uint16_t version); OPENSSL_EXPORT void SSL_CTX_set_min_version(SSL_CTX *ctx, uint16_t version);
@ -1652,8 +1644,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
#define SSL_CTRL_SET_CURVES_LIST 92 #define SSL_CTRL_SET_CURVES_LIST 92
#define SSL_CTRL_SET_SIGALGS 97 #define SSL_CTRL_SET_SIGALGS 97
#define SSL_CTRL_SET_SIGALGS_LIST 98 #define SSL_CTRL_SET_SIGALGS_LIST 98
#define SSL_CTRL_CERT_FLAGS 99
#define SSL_CTRL_CLEAR_CERT_FLAGS 100
#define SSL_CTRL_SET_CLIENT_SIGALGS 101 #define SSL_CTRL_SET_CLIENT_SIGALGS 101
#define SSL_CTRL_SET_CLIENT_SIGALGS_LIST 102 #define SSL_CTRL_SET_CLIENT_SIGALGS_LIST 102
#define SSL_CTRL_GET_CLIENT_CERT_TYPES 103 #define SSL_CTRL_GET_CLIENT_CERT_TYPES 103

3
ssl/internal.h
View File

@ -462,9 +462,6 @@ typedef struct cert_st {
* keys. If NULL, a curve is selected automatically. See * keys. If NULL, a curve is selected automatically. See
* |SSL_CTX_set_tmp_ecdh_callback|. */ * |SSL_CTX_set_tmp_ecdh_callback|. */
EC_KEY *(*ecdh_tmp_cb)(SSL *ssl, int is_export, int keysize); EC_KEY *(*ecdh_tmp_cb)(SSL *ssl, int is_export, int keysize);
/* Flags related to certificates */
unsigned int cert_flags;
CERT_PKEY pkeys[SSL_PKEY_NUM]; CERT_PKEY pkeys[SSL_PKEY_NUM];
/* Server-only: client_certificate_types is list of certificate types to /* Server-only: client_certificate_types is list of certificate types to

2
ssl/ssl_cert.c
View File

@ -265,8 +265,6 @@ CERT *ssl_cert_dup(CERT *cert) {
ret->num_client_certificate_types = cert->num_client_certificate_types; ret->num_client_certificate_types = cert->num_client_certificate_types;
} }
ret->cert_flags = cert->cert_flags;
ret->cert_cb = cert->cert_cb; ret->cert_cb = cert->cert_cb;
ret->cert_cb_arg = cert->cert_cb_arg; ret->cert_cb_arg = cert->cert_cb_arg;

12
ssl/ssl_lib.c
View File

@ -1067,12 +1067,6 @@ long SSL_ctrl(SSL *s, int cmd, long larg, void *parg) {
} }
return 0; return 0;
case SSL_CTRL_CERT_FLAGS:
return s->cert->cert_flags |= larg;
case SSL_CTRL_CLEAR_CERT_FLAGS:
return s->cert->cert_flags &= ~larg;
case SSL_CTRL_GET_RAW_CIPHERLIST: case SSL_CTRL_GET_RAW_CIPHERLIST:
if (parg) { if (parg) {
if (s->cert->ciphers_raw == NULL) { if (s->cert->ciphers_raw == NULL) {
@ -1183,12 +1177,6 @@ long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) {
ctx->max_send_fragment = larg; ctx->max_send_fragment = larg;
return 1; return 1;
case SSL_CTRL_CERT_FLAGS:
return ctx->cert->cert_flags |= larg;
case SSL_CTRL_CLEAR_CERT_FLAGS:
return ctx->cert->cert_flags &= ~larg;
default: default:
return ctx->method->ssl_ctx_ctrl(ctx, cmd, larg, parg); return ctx->method->ssl_ctx_ctrl(ctx, cmd, larg, parg);
} }