OLD | NEW |
1 diff -burN android-openssl.orig/crypto/bio/bio.h android-openssl/crypto/bio/bio.
h | 1 diff -burN android-openssl.orig/crypto/bio/bio.h android-openssl/crypto/bio/bio.
h |
2 --- android-openssl.orig/crypto/bio/bio.h 2013-02-11 16:26:04.000000000 +0
100 | 2 --- android-openssl.orig/crypto/bio/bio.h 2013-02-11 16:26:04.000000000 +0
100 |
3 +++ android-openssl/crypto/bio/bio.h 2013-10-22 18:22:42.080337200 +0200 | 3 +++ android-openssl/crypto/bio/bio.h 2013-10-22 18:22:42.080337200 +0200 |
4 @@ -266,6 +266,9 @@ | 4 @@ -266,6 +266,9 @@ |
5 #define BIO_RR_CONNECT 0x02 | 5 #define BIO_RR_CONNECT 0x02 |
6 /* Returned from the accept BIO when an accept would have blocked */ | 6 /* Returned from the accept BIO when an accept would have blocked */ |
7 #define BIO_RR_ACCEPT 0x03 | 7 #define BIO_RR_ACCEPT 0x03 |
8 +/* Returned from the SSL bio when the channel id retrieval code cannot find the | 8 +/* Returned from the SSL bio when the channel id retrieval code cannot find the |
9 + * private key. */ | 9 + * private key. */ |
10 +#define BIO_RR_SSL_CHANNEL_ID_LOOKUP 0x04 | 10 +#define BIO_RR_SSL_CHANNEL_ID_LOOKUP 0x04 |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 #define SSL_CTRL_SET_TMP_RSA 2 | 71 #define SSL_CTRL_SET_TMP_RSA 2 |
72 @@ -1672,10 +1680,11 @@ | 72 @@ -1672,10 +1680,11 @@ |
73 #define SSL_set_tmp_ecdh(ssl,ecdh) \ | 73 #define SSL_set_tmp_ecdh(ssl,ecdh) \ |
74 SSL_ctrl(ssl,SSL_CTRL_SET_TMP_ECDH,0,(char *)ecdh) | 74 SSL_ctrl(ssl,SSL_CTRL_SET_TMP_ECDH,0,(char *)ecdh) |
75 | 75 |
76 -/* SSL_enable_tls_channel_id configures a TLS server to accept TLS client | 76 -/* SSL_enable_tls_channel_id configures a TLS server to accept TLS client |
77 - * IDs from clients. Returns 1 on success. */ | 77 - * IDs from clients. Returns 1 on success. */ |
78 -#define SSL_enable_tls_channel_id(ctx) \ | 78 -#define SSL_enable_tls_channel_id(ctx) \ |
79 - SSL_ctrl(ctx,SSL_CTRL_CHANNEL_ID,0,NULL) | 79 - SSL_ctrl(ctx,SSL_CTRL_CHANNEL_ID,0,NULL) |
80 +/* SSL_enable_tls_channel_id either configures a TLS server to accept TLS clien
t | 80 +/* SSL_enable_tls_channel_id either configures a TLS server to accept TLS clien
t |
81 + * IDs from clients, or configure a client to send TLS client IDs to server. | 81 + * IDs from clients, or configures a client to send TLS client IDs to server. |
82 + * Returns 1 on success. */ | 82 + * Returns 1 on success. */ |
83 +#define SSL_enable_tls_channel_id(s) \ | 83 +#define SSL_enable_tls_channel_id(ssl) \ |
84 +» SSL_ctrl(s,SSL_CTRL_CHANNEL_ID,0,NULL) | 84 +» SSL_ctrl(ssl,SSL_CTRL_CHANNEL_ID,0,NULL) |
85 /* SSL_set1_tls_channel_id configures a TLS client to send a TLS Channel ID to | 85 /* SSL_set1_tls_channel_id configures a TLS client to send a TLS Channel ID to |
86 * compatible servers. private_key must be a P-256 EVP_PKEY*. Returns 1 on | 86 * compatible servers. private_key must be a P-256 EVP_PKEY*. Returns 1 on |
87 * success. */ | 87 * success. */ |
88 diff -burN android-openssl.orig/ssl/bio_ssl.c android-openssl/ssl/bio_ssl.c | 88 diff -burN android-openssl.orig/ssl/bio_ssl.c android-openssl/ssl/bio_ssl.c |
89 --- android-openssl.orig/ssl/bio_ssl.c 2013-02-11 16:26:04.000000000 +0100 | 89 --- android-openssl.orig/ssl/bio_ssl.c 2013-02-11 16:26:04.000000000 +0100 |
90 +++ android-openssl/ssl/bio_ssl.c 2013-10-22 18:22:42.090337290 +0200 | 90 +++ android-openssl/ssl/bio_ssl.c 2013-10-22 18:22:42.090337290 +0200 |
91 @@ -206,6 +206,10 @@ | 91 @@ -206,6 +206,10 @@ |
92 BIO_set_retry_special(b); | 92 BIO_set_retry_special(b); |
93 retry_reason=BIO_RR_SSL_X509_LOOKUP; | 93 retry_reason=BIO_RR_SSL_X509_LOOKUP; |
94 break; | 94 break; |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 #define SSL_CTRL_SET_TMP_RSA 2 | 213 #define SSL_CTRL_SET_TMP_RSA 2 |
214 @@ -1672,10 +1680,11 @@ | 214 @@ -1672,10 +1680,11 @@ |
215 #define SSL_set_tmp_ecdh(ssl,ecdh) \ | 215 #define SSL_set_tmp_ecdh(ssl,ecdh) \ |
216 SSL_ctrl(ssl,SSL_CTRL_SET_TMP_ECDH,0,(char *)ecdh) | 216 SSL_ctrl(ssl,SSL_CTRL_SET_TMP_ECDH,0,(char *)ecdh) |
217 | 217 |
218 -/* SSL_enable_tls_channel_id configures a TLS server to accept TLS client | 218 -/* SSL_enable_tls_channel_id configures a TLS server to accept TLS client |
219 - * IDs from clients. Returns 1 on success. */ | 219 - * IDs from clients. Returns 1 on success. */ |
220 -#define SSL_enable_tls_channel_id(ctx) \ | 220 -#define SSL_enable_tls_channel_id(ctx) \ |
221 - SSL_ctrl(ctx,SSL_CTRL_CHANNEL_ID,0,NULL) | 221 - SSL_ctrl(ctx,SSL_CTRL_CHANNEL_ID,0,NULL) |
222 +/* SSL_enable_tls_channel_id either configures a TLS server to accept TLS clien
t | 222 +/* SSL_enable_tls_channel_id either configures a TLS server to accept TLS clien
t |
223 + * IDs from clients, or configure a client to send TLS client IDs to server. | 223 + * IDs from clients, or configures a client to send TLS client IDs to server. |
224 + * Returns 1 on success. */ | 224 + * Returns 1 on success. */ |
225 +#define SSL_enable_tls_channel_id(s) \ | 225 +#define SSL_enable_tls_channel_id(ssl) \ |
226 +» SSL_ctrl(s,SSL_CTRL_CHANNEL_ID,0,NULL) | 226 +» SSL_ctrl(ssl,SSL_CTRL_CHANNEL_ID,0,NULL) |
227 /* SSL_set1_tls_channel_id configures a TLS client to send a TLS Channel ID to | 227 /* SSL_set1_tls_channel_id configures a TLS client to send a TLS Channel ID to |
228 * compatible servers. private_key must be a P-256 EVP_PKEY*. Returns 1 on | 228 * compatible servers. private_key must be a P-256 EVP_PKEY*. Returns 1 on |
229 * success. */ | 229 * success. */ |
230 diff -burN android-openssl.orig/ssl/ssl_lib.c android-openssl/ssl/ssl_lib.c | 230 diff -burN android-openssl.orig/ssl/ssl_lib.c android-openssl/ssl/ssl_lib.c |
231 --- android-openssl.orig/ssl/ssl_lib.c 2013-10-22 18:20:40.299252871 +0200 | 231 --- android-openssl.orig/ssl/ssl_lib.c 2013-10-22 18:20:40.299252871 +0200 |
232 +++ android-openssl/ssl/ssl_lib.c 2013-10-22 18:22:42.090337290 +0200 | 232 +++ android-openssl/ssl/ssl_lib.c 2013-10-22 18:22:42.090337290 +0200 |
233 @@ -2561,6 +2561,10 @@ | 233 @@ -2561,6 +2561,10 @@ |
234 { | 234 { |
235 return(SSL_ERROR_WANT_X509_LOOKUP); | 235 return(SSL_ERROR_WANT_X509_LOOKUP); |
236 } | 236 } |
(...skipping 18 matching lines...) Expand all Loading... |
255 + } | 255 + } |
256 + | 256 + |
257 +void (*SSL_CTX_get_channel_id_cb(SSL_CTX *ctx))(SSL * ssl, EVP_PKEY **pkey) | 257 +void (*SSL_CTX_get_channel_id_cb(SSL_CTX *ctx))(SSL * ssl, EVP_PKEY **pkey) |
258 + { | 258 + { |
259 + return ctx->channel_id_cb; | 259 + return ctx->channel_id_cb; |
260 + } | 260 + } |
261 + | 261 + |
262 #ifndef OPENSSL_NO_ENGINE | 262 #ifndef OPENSSL_NO_ENGINE |
263 int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e) | 263 int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e) |
264 { | 264 { |
OLD | NEW |