summaryrefslogtreecommitdiff
path: root/openssl/include
diff options
context:
space:
mode:
authordavidben@chromium.org <davidben@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2014-05-12 20:21:12 +0000
committerdavidben@chromium.org <davidben@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2014-05-12 20:21:12 +0000
commitaf1de6dffdeccfab8cc920fcf3681286490a1459 (patch)
tree67f3852f570e5bff485cd13b7237540c7d2bbfd4 /openssl/include
parent7f0be5dc6cd354f962618d88faa1b1d2b8e32238 (diff)
downloadopenssl-af1de6dffdeccfab8cc920fcf3681286490a1459.tar.gz
Add SSL_get_client_certificate_types.
Exposes the certificate_types parameter in a CertificateRequest. BUG=165446 Review URL: https://codereview.chromium.org/254723002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@269864 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'openssl/include')
-rw-r--r--openssl/include/openssl/ssl.h3
-rw-r--r--openssl/include/openssl/ssl3.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/openssl/include/openssl/ssl.h b/openssl/include/openssl/ssl.h
index fe92ccf..5faae95 100644
--- a/openssl/include/openssl/ssl.h
+++ b/openssl/include/openssl/ssl.h
@@ -1989,6 +1989,9 @@ STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(const SSL_CTX *s);
int SSL_add_client_CA(SSL *ssl,X509 *x);
int SSL_CTX_add_client_CA(SSL_CTX *ctx,X509 *x);
+void SSL_get_client_certificate_types(const SSL *s, const unsigned char **ctype,
+ size_t *ctype_num);
+
void SSL_set_connect_state(SSL *s);
void SSL_set_accept_state(SSL *s);
diff --git a/openssl/include/openssl/ssl3.h b/openssl/include/openssl/ssl3.h
index 899c8a8..019e8d8 100644
--- a/openssl/include/openssl/ssl3.h
+++ b/openssl/include/openssl/ssl3.h
@@ -508,7 +508,7 @@ typedef struct ssl3_state_st
/* used for certificate requests */
int cert_req;
int ctype_num;
- char ctype[SSL3_CT_NUMBER];
+ unsigned char ctype[SSL3_CT_NUMBER];
STACK_OF(X509_NAME) *ca_names;
int use_rsa_tmp;