2008-04-15 10:08:15 -04:00
|
|
|
This patch adds support for TLS SessionTicket extension (RFC 5077) for
|
2008-02-27 20:34:43 -05:00
|
|
|
the parts used by EAP-FAST (RFC 4851).
|
|
|
|
|
|
|
|
This is based on the patch from Alexey Kobozev <akobozev@cisco.com>
|
|
|
|
(sent to openssl-dev mailing list on Tue, 07 Jun 2005 15:40:58 +0300).
|
|
|
|
|
|
|
|
|
|
|
|
|
2008-11-11 22:06:03 -05:00
|
|
|
Index: openssl-SNAP-20081111/ssl/s3_clnt.c
|
2008-08-24 06:12:54 -04:00
|
|
|
===================================================================
|
2008-11-11 22:06:03 -05:00
|
|
|
--- openssl-SNAP-20081111.orig/ssl/s3_clnt.c
|
|
|
|
+++ openssl-SNAP-20081111/ssl/s3_clnt.c
|
|
|
|
@@ -788,6 +788,23 @@ int ssl3_get_server_hello(SSL *s)
|
2008-02-27 20:34:43 -05:00
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
|
|
|
|
+#ifndef OPENSSL_NO_TLSEXT
|
2008-04-15 10:08:15 -04:00
|
|
|
+ /* check if we want to resume the session based on external pre-shared secret */
|
2008-02-27 20:34:43 -05:00
|
|
|
+ if (s->version >= TLS1_VERSION && s->tls_session_secret_cb)
|
2008-11-11 22:06:03 -05:00
|
|
|
+ {
|
2008-02-27 20:34:43 -05:00
|
|
|
+ SSL_CIPHER *pref_cipher=NULL;
|
|
|
|
+ s->session->master_key_length=sizeof(s->session->master_key);
|
2008-11-11 22:06:03 -05:00
|
|
|
+ if (s->tls_session_secret_cb(s, s->session->master_key,
|
|
|
|
+ &s->session->master_key_length,
|
|
|
|
+ NULL, &pref_cipher,
|
|
|
|
+ s->tls_session_secret_cb_arg))
|
|
|
|
+ {
|
|
|
|
+ s->session->cipher = pref_cipher ?
|
|
|
|
+ pref_cipher : ssl_get_cipher_by_char(s, p+j);
|
|
|
|
+ }
|
2008-02-27 20:34:43 -05:00
|
|
|
+ }
|
|
|
|
+#endif /* OPENSSL_NO_TLSEXT */
|
|
|
|
+
|
2008-04-15 10:08:15 -04:00
|
|
|
if (j != 0 && j == s->session->session_id_length
|
2008-02-27 20:34:43 -05:00
|
|
|
&& memcmp(p,s->session->session_id,j) == 0)
|
|
|
|
{
|
2008-11-11 22:06:03 -05:00
|
|
|
@@ -2927,11 +2944,8 @@ static int ssl3_check_finished(SSL *s)
|
2008-05-29 04:00:33 -04:00
|
|
|
{
|
|
|
|
int ok;
|
|
|
|
long n;
|
|
|
|
- /* If we have no ticket or session ID is non-zero length (a match of
|
|
|
|
- * a non-zero session length would never reach here) it cannot be a
|
|
|
|
- * resumed session.
|
|
|
|
- */
|
|
|
|
- if (!s->session->tlsext_tick || s->session->session_id_length)
|
|
|
|
+ /* If we have no ticket it cannot be a resumed session. */
|
|
|
|
+ if (!s->session->tlsext_tick)
|
|
|
|
return 1;
|
|
|
|
/* this function is called when we really expect a Certificate
|
|
|
|
* message, so permit appropriate message length */
|
2008-11-11 22:06:03 -05:00
|
|
|
Index: openssl-SNAP-20081111/ssl/s3_srvr.c
|
2008-08-24 06:12:54 -04:00
|
|
|
===================================================================
|
2008-11-11 22:06:03 -05:00
|
|
|
--- openssl-SNAP-20081111.orig/ssl/s3_srvr.c
|
|
|
|
+++ openssl-SNAP-20081111/ssl/s3_srvr.c
|
2008-09-28 11:06:12 -04:00
|
|
|
@@ -1010,6 +1010,59 @@ int ssl3_get_client_hello(SSL *s)
|
2008-02-27 20:34:43 -05:00
|
|
|
SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ /* Check if we want to use external pre-shared secret for this
|
|
|
|
+ * handshake for not reused session only. We need to generate
|
|
|
|
+ * server_random before calling tls_session_secret_cb in order to allow
|
|
|
|
+ * SessionTicket processing to use it in key derivation. */
|
|
|
|
+ {
|
|
|
|
+ unsigned long Time;
|
|
|
|
+ unsigned char *pos;
|
|
|
|
+ Time=(unsigned long)time(NULL); /* Time */
|
|
|
|
+ pos=s->s3->server_random;
|
|
|
|
+ l2n(Time,pos);
|
|
|
|
+ if (RAND_pseudo_bytes(pos,SSL3_RANDOM_SIZE-4) <= 0)
|
2008-11-11 22:06:03 -05:00
|
|
|
+ {
|
2008-02-27 20:34:43 -05:00
|
|
|
+ al=SSL_AD_INTERNAL_ERROR;
|
|
|
|
+ goto f_err;
|
2008-11-11 22:06:03 -05:00
|
|
|
+ }
|
2008-02-27 20:34:43 -05:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (!s->hit && s->version >= TLS1_VERSION && s->tls_session_secret_cb)
|
2008-11-11 22:06:03 -05:00
|
|
|
+ {
|
2008-02-27 20:34:43 -05:00
|
|
|
+ SSL_CIPHER *pref_cipher=NULL;
|
|
|
|
+
|
|
|
|
+ s->session->master_key_length=sizeof(s->session->master_key);
|
2008-08-24 06:12:54 -04:00
|
|
|
+ if(s->tls_session_secret_cb(s, s->session->master_key, &s->session->master_key_length,
|
2008-02-27 20:34:43 -05:00
|
|
|
+ ciphers, &pref_cipher, s->tls_session_secret_cb_arg))
|
2008-11-11 22:06:03 -05:00
|
|
|
+ {
|
2008-02-27 20:34:43 -05:00
|
|
|
+ s->hit=1;
|
|
|
|
+ s->session->ciphers=ciphers;
|
|
|
|
+ s->session->verify_result=X509_V_OK;
|
2008-08-24 06:12:54 -04:00
|
|
|
+
|
2008-02-27 20:34:43 -05:00
|
|
|
+ ciphers=NULL;
|
2008-08-24 06:12:54 -04:00
|
|
|
+
|
2008-02-27 20:34:43 -05:00
|
|
|
+ /* check if some cipher was preferred by call back */
|
|
|
|
+ pref_cipher=pref_cipher ? pref_cipher : ssl3_choose_cipher(s, s->session->ciphers, SSL_get_ciphers(s));
|
|
|
|
+ if (pref_cipher == NULL)
|
|
|
|
+ {
|
|
|
|
+ al=SSL_AD_HANDSHAKE_FAILURE;
|
|
|
|
+ SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_SHARED_CIPHER);
|
|
|
|
+ goto f_err;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ s->session->cipher=pref_cipher;
|
|
|
|
+
|
|
|
|
+ if (s->cipher_list)
|
|
|
|
+ sk_SSL_CIPHER_free(s->cipher_list);
|
|
|
|
+
|
|
|
|
+ if (s->cipher_list_by_id)
|
|
|
|
+ sk_SSL_CIPHER_free(s->cipher_list_by_id);
|
|
|
|
+
|
|
|
|
+ s->cipher_list = sk_SSL_CIPHER_dup(s->session->ciphers);
|
|
|
|
+ s->cipher_list_by_id = sk_SSL_CIPHER_dup(s->session->ciphers);
|
2008-11-11 22:06:03 -05:00
|
|
|
+ }
|
2008-02-27 20:34:43 -05:00
|
|
|
+ }
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Worst case, we will use the NULL compression, but if we have other
|
2008-09-28 11:06:12 -04:00
|
|
|
@@ -1134,16 +1187,22 @@ int ssl3_send_server_hello(SSL *s)
|
2008-02-27 20:34:43 -05:00
|
|
|
unsigned char *buf;
|
|
|
|
unsigned char *p,*d;
|
|
|
|
int i,sl;
|
|
|
|
- unsigned long l,Time;
|
|
|
|
+ unsigned long l;
|
|
|
|
+#ifdef OPENSSL_NO_TLSEXT
|
|
|
|
+ unsigned long Time;
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
if (s->state == SSL3_ST_SW_SRVR_HELLO_A)
|
|
|
|
{
|
|
|
|
buf=(unsigned char *)s->init_buf->data;
|
|
|
|
+#ifdef OPENSSL_NO_TLSEXT
|
|
|
|
p=s->s3->server_random;
|
|
|
|
+ /* Generate server_random if it was not needed previously */
|
|
|
|
Time=(unsigned long)time(NULL); /* Time */
|
|
|
|
l2n(Time,p);
|
|
|
|
if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)
|
|
|
|
return -1;
|
|
|
|
+#endif
|
|
|
|
/* Do the message type and length last */
|
|
|
|
d=p= &(buf[4]);
|
|
|
|
|
2008-11-11 22:06:03 -05:00
|
|
|
Index: openssl-SNAP-20081111/ssl/ssl_err.c
|
2008-08-24 06:12:54 -04:00
|
|
|
===================================================================
|
2008-11-11 22:06:03 -05:00
|
|
|
--- openssl-SNAP-20081111.orig/ssl/ssl_err.c
|
|
|
|
+++ openssl-SNAP-20081111/ssl/ssl_err.c
|
2008-08-24 06:12:54 -04:00
|
|
|
@@ -263,6 +263,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
|
|
|
|
{ERR_FUNC(SSL_F_TLS1_PRF), "tls1_prf"},
|
|
|
|
{ERR_FUNC(SSL_F_TLS1_SETUP_KEY_BLOCK), "TLS1_SETUP_KEY_BLOCK"},
|
|
|
|
{ERR_FUNC(SSL_F_WRITE_PENDING), "WRITE_PENDING"},
|
|
|
|
+{ERR_FUNC(SSL_F_SSL_SET_HELLO_EXTENSION), "SSL_set_hello_extension"},
|
|
|
|
{0,NULL}
|
|
|
|
};
|
|
|
|
|
2008-11-11 22:06:03 -05:00
|
|
|
Index: openssl-SNAP-20081111/ssl/ssl.h
|
2008-08-24 06:12:54 -04:00
|
|
|
===================================================================
|
2008-11-11 22:06:03 -05:00
|
|
|
--- openssl-SNAP-20081111.orig/ssl/ssl.h
|
|
|
|
+++ openssl-SNAP-20081111/ssl/ssl.h
|
2008-09-28 11:06:12 -04:00
|
|
|
@@ -355,6 +355,7 @@ extern "C" {
|
2008-02-27 20:34:43 -05:00
|
|
|
* 'struct ssl_st *' function parameters used to prototype callbacks
|
|
|
|
* in SSL_CTX. */
|
|
|
|
typedef struct ssl_st *ssl_crock_st;
|
|
|
|
+typedef struct tls_extension_st TLS_EXTENSION;
|
|
|
|
|
|
|
|
/* used to hold info on the particular ciphers used */
|
|
|
|
typedef struct ssl_cipher_st
|
2008-09-28 11:06:12 -04:00
|
|
|
@@ -378,6 +379,8 @@ typedef struct ssl_cipher_st
|
2008-08-24 06:12:54 -04:00
|
|
|
|
|
|
|
DECLARE_STACK_OF(SSL_CIPHER)
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
+typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len, STACK_OF(SSL_CIPHER) *peer_ciphers, SSL_CIPHER **cipher, void *arg);
|
|
|
|
+
|
|
|
|
/* Used to hold functions for SSLv2 or SSLv3/TLSv1 functions */
|
|
|
|
typedef struct ssl_method_st
|
|
|
|
{
|
2008-09-28 11:06:12 -04:00
|
|
|
@@ -1145,6 +1148,13 @@ struct ssl_st
|
2008-02-27 20:34:43 -05:00
|
|
|
void *tlsext_opaque_prf_input;
|
|
|
|
size_t tlsext_opaque_prf_input_len;
|
|
|
|
|
|
|
|
+ /* TLS extensions */
|
|
|
|
+ TLS_EXTENSION *tls_extension;
|
|
|
|
+
|
|
|
|
+ /* TLS pre-shared secret session resumption */
|
|
|
|
+ tls_session_secret_cb_fn tls_session_secret_cb;
|
|
|
|
+ void *tls_session_secret_cb_arg;
|
|
|
|
+
|
|
|
|
SSL_CTX * initial_ctx; /* initial ctx, used to store sessions */
|
|
|
|
#define session_ctx initial_ctx
|
|
|
|
#else
|
2008-09-28 11:06:12 -04:00
|
|
|
@@ -1746,6 +1756,12 @@ void *SSL_COMP_get_compression_methods(v
|
2008-02-27 20:34:43 -05:00
|
|
|
int SSL_COMP_add_compression_method(int id,void *cm);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
+/* TLS extensions functions */
|
|
|
|
+int SSL_set_hello_extension(SSL *s, int ext_type, void *ext_data, int ext_len);
|
|
|
|
+
|
|
|
|
+/* Pre-shared secret session resumption functions */
|
|
|
|
+int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secret_cb, void *arg);
|
|
|
|
+
|
|
|
|
/* BEGIN ERROR CODES */
|
|
|
|
/* The following lines are auto generated by the script mkerr.pl. Any changes
|
|
|
|
* made after this point may be overwritten when the script is next run.
|
2008-09-28 11:06:12 -04:00
|
|
|
@@ -1948,6 +1964,7 @@ void ERR_load_SSL_strings(void);
|
2008-02-27 20:34:43 -05:00
|
|
|
#define SSL_F_TLS1_PRF 284
|
|
|
|
#define SSL_F_TLS1_SETUP_KEY_BLOCK 211
|
|
|
|
#define SSL_F_WRITE_PENDING 212
|
|
|
|
+#define SSL_F_SSL_SET_HELLO_EXTENSION 213
|
|
|
|
|
|
|
|
/* Reason codes. */
|
|
|
|
#define SSL_R_APP_DATA_IN_HANDSHAKE 100
|
2008-11-11 22:06:03 -05:00
|
|
|
Index: openssl-SNAP-20081111/ssl/ssl_sess.c
|
2008-08-24 06:12:54 -04:00
|
|
|
===================================================================
|
2008-11-11 22:06:03 -05:00
|
|
|
--- openssl-SNAP-20081111.orig/ssl/ssl_sess.c
|
|
|
|
+++ openssl-SNAP-20081111/ssl/ssl_sess.c
|
|
|
|
@@ -834,6 +834,54 @@ long SSL_CTX_get_timeout(const SSL_CTX *
|
2008-02-27 20:34:43 -05:00
|
|
|
return(s->session_timeout);
|
|
|
|
}
|
|
|
|
|
|
|
|
+#ifndef OPENSSL_NO_TLSEXT
|
2008-08-24 06:12:54 -04:00
|
|
|
+int SSL_set_session_secret_cb(SSL *s, int (*tls_session_secret_cb)(SSL *s, void *secret, int *secret_len,
|
2008-02-27 20:34:43 -05:00
|
|
|
+ STACK_OF(SSL_CIPHER) *peer_ciphers, SSL_CIPHER **cipher, void *arg), void *arg)
|
2008-11-11 22:06:03 -05:00
|
|
|
+ {
|
2008-02-27 20:34:43 -05:00
|
|
|
+ if (s == NULL) return(0);
|
|
|
|
+ s->tls_session_secret_cb = tls_session_secret_cb;
|
|
|
|
+ s->tls_session_secret_cb_arg = arg;
|
|
|
|
+ return(1);
|
2008-11-11 22:06:03 -05:00
|
|
|
+ }
|
2008-02-27 20:34:43 -05:00
|
|
|
+
|
|
|
|
+int SSL_set_hello_extension(SSL *s, int ext_type, void *ext_data, int ext_len)
|
|
|
|
+ {
|
2008-11-11 22:06:03 -05:00
|
|
|
+ if (s->version >= TLS1_VERSION)
|
2008-02-27 20:34:43 -05:00
|
|
|
+ {
|
2008-11-11 22:06:03 -05:00
|
|
|
+ if (s->tls_extension)
|
|
|
|
+ {
|
2008-02-27 20:34:43 -05:00
|
|
|
+ OPENSSL_free(s->tls_extension);
|
|
|
|
+ s->tls_extension = NULL;
|
2008-11-11 22:06:03 -05:00
|
|
|
+ }
|
2008-02-27 20:34:43 -05:00
|
|
|
+
|
|
|
|
+ s->tls_extension = OPENSSL_malloc(sizeof(TLS_EXTENSION) + ext_len);
|
2008-11-11 22:06:03 -05:00
|
|
|
+ if (!s->tls_extension)
|
|
|
|
+ {
|
2008-02-27 20:34:43 -05:00
|
|
|
+ SSLerr(SSL_F_SSL_SET_HELLO_EXTENSION, ERR_R_MALLOC_FAILURE);
|
|
|
|
+ return 0;
|
2008-11-11 22:06:03 -05:00
|
|
|
+ }
|
2008-02-27 20:34:43 -05:00
|
|
|
+
|
|
|
|
+ s->tls_extension->type = ext_type;
|
|
|
|
+
|
2008-11-11 22:06:03 -05:00
|
|
|
+ if (ext_data)
|
|
|
|
+ {
|
2008-02-27 20:34:43 -05:00
|
|
|
+ s->tls_extension->length = ext_len;
|
|
|
|
+ s->tls_extension->data = s->tls_extension + 1;
|
|
|
|
+ memcpy(s->tls_extension->data, ext_data, ext_len);
|
2008-11-11 22:06:03 -05:00
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
2008-02-27 20:34:43 -05:00
|
|
|
+ s->tls_extension->length = 0;
|
|
|
|
+ s->tls_extension->data = NULL;
|
2008-11-11 22:06:03 -05:00
|
|
|
+ }
|
2008-02-27 20:34:43 -05:00
|
|
|
+
|
|
|
|
+ return 1;
|
2008-11-11 22:06:03 -05:00
|
|
|
+ }
|
2008-02-27 20:34:43 -05:00
|
|
|
+
|
|
|
|
+ return 0;
|
2008-11-11 22:06:03 -05:00
|
|
|
+ }
|
2008-02-27 20:34:43 -05:00
|
|
|
+#endif /* OPENSSL_NO_TLSEXT */
|
|
|
|
+
|
|
|
|
typedef struct timeout_param_st
|
|
|
|
{
|
|
|
|
SSL_CTX *ctx;
|
2008-11-11 22:06:03 -05:00
|
|
|
Index: openssl-SNAP-20081111/ssl/t1_lib.c
|
2008-08-24 06:12:54 -04:00
|
|
|
===================================================================
|
2008-11-11 22:06:03 -05:00
|
|
|
--- openssl-SNAP-20081111.orig/ssl/t1_lib.c
|
|
|
|
+++ openssl-SNAP-20081111/ssl/t1_lib.c
|
2008-02-27 20:34:43 -05:00
|
|
|
@@ -154,6 +154,12 @@ int tls1_new(SSL *s)
|
|
|
|
|
|
|
|
void tls1_free(SSL *s)
|
|
|
|
{
|
|
|
|
+#ifndef OPENSSL_NO_TLSEXT
|
2008-11-11 22:06:03 -05:00
|
|
|
+ if (s->tls_extension)
|
|
|
|
+ {
|
2008-02-27 20:34:43 -05:00
|
|
|
+ OPENSSL_free(s->tls_extension);
|
2008-11-11 22:06:03 -05:00
|
|
|
+ }
|
|
|
|
+#endif /* OPENSSL_NO_TLSEXT */
|
2008-02-27 20:34:43 -05:00
|
|
|
ssl3_free(s);
|
|
|
|
}
|
|
|
|
|
2008-04-15 10:08:15 -04:00
|
|
|
@@ -357,8 +363,24 @@ unsigned char *ssl_add_clienthello_tlsex
|
2008-02-27 20:34:43 -05:00
|
|
|
int ticklen;
|
|
|
|
if (s->session && s->session->tlsext_tick)
|
|
|
|
ticklen = s->session->tlsext_ticklen;
|
|
|
|
+ else if (s->session && s->tls_extension &&
|
2008-11-11 22:06:03 -05:00
|
|
|
+ s->tls_extension->type == TLSEXT_TYPE_session_ticket &&
|
|
|
|
+ s->tls_extension->data)
|
|
|
|
+ {
|
2008-02-27 20:34:43 -05:00
|
|
|
+ ticklen = s->tls_extension->length;
|
|
|
|
+ s->session->tlsext_tick = OPENSSL_malloc(ticklen);
|
|
|
|
+ if (!s->session->tlsext_tick)
|
|
|
|
+ return NULL;
|
|
|
|
+ memcpy(s->session->tlsext_tick, s->tls_extension->data,
|
|
|
|
+ ticklen);
|
|
|
|
+ s->session->tlsext_ticklen = ticklen;
|
2008-11-11 22:06:03 -05:00
|
|
|
+ }
|
2008-02-27 20:34:43 -05:00
|
|
|
else
|
|
|
|
ticklen = 0;
|
|
|
|
+ if (ticklen == 0 && s->tls_extension &&
|
|
|
|
+ s->tls_extension->type == TLSEXT_TYPE_session_ticket &&
|
|
|
|
+ s->tls_extension->data == NULL)
|
|
|
|
+ goto skip_ext;
|
|
|
|
/* Check for enough room 2 for extension type, 2 for len
|
|
|
|
* rest for ticket
|
|
|
|
*/
|
2008-04-15 10:08:15 -04:00
|
|
|
@@ -371,6 +393,7 @@ unsigned char *ssl_add_clienthello_tlsex
|
2008-02-27 20:34:43 -05:00
|
|
|
ret += ticklen;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
+ skip_ext:
|
|
|
|
|
|
|
|
#ifdef TLSEXT_TYPE_opaque_prf_input
|
|
|
|
if (s->s3->client_opaque_prf_input != NULL)
|
2008-09-28 11:06:12 -04:00
|
|
|
@@ -1435,6 +1458,15 @@ int tls1_process_ticket(SSL *s, unsigned
|
2008-02-27 20:34:43 -05:00
|
|
|
s->tlsext_ticket_expected = 1;
|
|
|
|
return 0; /* Cache miss */
|
|
|
|
}
|
|
|
|
+ if (s->tls_session_secret_cb)
|
2008-08-24 06:12:54 -04:00
|
|
|
+ {
|
|
|
|
+ /* Indicate cache miss here and instead of
|
|
|
|
+ * generating the session from ticket now,
|
|
|
|
+ * trigger abbreviated handshake based on
|
|
|
|
+ * external mechanism to calculate the master
|
|
|
|
+ * secret later. */
|
2008-02-27 20:34:43 -05:00
|
|
|
+ return 0;
|
2008-08-24 06:12:54 -04:00
|
|
|
+ }
|
2008-02-27 20:34:43 -05:00
|
|
|
return tls_decrypt_ticket(s, p, size, session_id, len,
|
|
|
|
ret);
|
|
|
|
}
|
2008-11-11 22:06:03 -05:00
|
|
|
Index: openssl-SNAP-20081111/ssl/tls1.h
|
2008-08-24 06:12:54 -04:00
|
|
|
===================================================================
|
2008-11-11 22:06:03 -05:00
|
|
|
--- openssl-SNAP-20081111.orig/ssl/tls1.h
|
|
|
|
+++ openssl-SNAP-20081111/ssl/tls1.h
|
2008-05-29 04:00:33 -04:00
|
|
|
@@ -512,6 +512,14 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_T
|
2008-02-27 20:34:43 -05:00
|
|
|
#define TLS_MD_MASTER_SECRET_CONST "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74" /*master secret*/
|
|
|
|
#endif
|
|
|
|
|
|
|
|
+/* TLS extension struct */
|
|
|
|
+struct tls_extension_st
|
2008-11-11 22:06:03 -05:00
|
|
|
+ {
|
2008-02-27 20:34:43 -05:00
|
|
|
+ unsigned short type;
|
|
|
|
+ unsigned short length;
|
|
|
|
+ void *data;
|
2008-11-11 22:06:03 -05:00
|
|
|
+ };
|
2008-02-27 20:34:43 -05:00
|
|
|
+
|
|
|
|
#ifdef __cplusplus
|
|
|
|
}
|
|
|
|
#endif
|
2008-11-11 22:06:03 -05:00
|
|
|
Index: openssl-SNAP-20081111/util/ssleay.num
|
2008-08-24 06:12:54 -04:00
|
|
|
===================================================================
|
2008-11-11 22:06:03 -05:00
|
|
|
--- openssl-SNAP-20081111.orig/util/ssleay.num
|
|
|
|
+++ openssl-SNAP-20081111/util/ssleay.num
|
2008-08-24 06:12:54 -04:00
|
|
|
@@ -254,3 +254,5 @@ PEM_read_bio_SSL_SESSION
|
|
|
|
SSL_CTX_set_psk_server_callback 303 EXIST::FUNCTION:PSK
|
|
|
|
SSL_get_psk_identity 304 EXIST::FUNCTION:PSK
|
|
|
|
PEM_write_SSL_SESSION 305 EXIST:!WIN16:FUNCTION:
|
|
|
|
+SSL_set_hello_extension 306 EXIST::FUNCTION:TLSEXT
|
|
|
|
+SSL_set_session_secret_cb 307 EXIST::FUNCTION:TLSEXT
|