OLD | NEW |
(Empty) | |
| 1 diff --git android-openssl.orig/include/openssl/ssl.h android-openssl/include/op
enssl/ssl.h |
| 2 index a3944f1..d0d3db4 100644 |
| 3 --- android-openssl.orig/include/openssl/ssl.h |
| 4 +++ android-openssl/include/openssl/ssl.h |
| 5 @@ -1982,6 +1982,8 @@ STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(const SSL_
CTX *s); |
| 6 int SSL_add_client_CA(SSL *ssl,X509 *x); |
| 7 int SSL_CTX_add_client_CA(SSL_CTX *ctx,X509 *x); |
| 8 |
| 9 +void SSL_get_client_certificate_types(const SSL *s, const char **ctype, size_t
*ctype_num); |
| 10 + |
| 11 void SSL_set_connect_state(SSL *s); |
| 12 void SSL_set_accept_state(SSL *s); |
| 13 |
| 14 diff --git android-openssl.orig/ssl/ssl.h android-openssl/ssl/ssl.h |
| 15 index a3944f1..d0d3db4 100644 |
| 16 --- android-openssl.orig/ssl/ssl.h |
| 17 +++ android-openssl/ssl/ssl.h |
| 18 @@ -1982,6 +1982,8 @@ STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(const SSL_
CTX *s); |
| 19 int SSL_add_client_CA(SSL *ssl,X509 *x); |
| 20 int SSL_CTX_add_client_CA(SSL_CTX *ctx,X509 *x); |
| 21 |
| 22 +void SSL_get_client_certificate_types(const SSL *s, const char **ctype, size_t
*ctype_num); |
| 23 + |
| 24 void SSL_set_connect_state(SSL *s); |
| 25 void SSL_set_accept_state(SSL *s); |
| 26 |
| 27 diff --git android-openssl.orig/ssl/ssl_cert.c android-openssl/ssl/ssl_cert.c |
| 28 index 5123a89..19b8f78 100644 |
| 29 --- android-openssl.orig/ssl/ssl_cert.c |
| 30 +++ android-openssl/ssl/ssl_cert.c |
| 31 @@ -660,6 +660,20 @@ static int xname_cmp(const X509_NAME * const *a, const X509
_NAME * const *b) |
| 32 return(X509_NAME_cmp(*a,*b)); |
| 33 } |
| 34 |
| 35 +void SSL_get_client_certificate_types(const SSL *s, const char **ctype, size_t
*ctype_num) |
| 36 + { |
| 37 + if (s->s3 == NULL) |
| 38 + { |
| 39 + *ctype = NULL; |
| 40 + *ctype_num = 0; |
| 41 + return; |
| 42 + } |
| 43 + |
| 44 + /* This always returns nothing for the server. */ |
| 45 + *ctype = s->s3->tmp.ctype; |
| 46 + *ctype_num = s->s3->tmp.ctype_num; |
| 47 + } |
| 48 + |
| 49 #ifndef OPENSSL_NO_STDIO |
| 50 /*! |
| 51 * Load CA certs from a file into a ::STACK. Note that it is somewhat misnamed; |
OLD | NEW |