1214501SrpauloThis patch is adding support for TLS hello extensions and externally 2214501Srpaulogenerated pre-shared key material to OpenSSL 0.9.8d. This is 3214501Srpaulobased on the patch from Alexey Kobozev <akobozev@cisco.com> 4214501Srpaulo(sent to openssl-dev mailing list on Tue, 07 Jun 2005 15:40:58 +0300). 5214501Srpaulo 6214501Srpaulo 7214501Srpaulo 8214501Srpaulodiff -uprN openssl-0.9.8d.orig/include/openssl/ssl.h openssl-0.9.8d/include/openssl/ssl.h 9214501Srpaulo--- openssl-0.9.8d.orig/include/openssl/ssl.h 2006-06-14 06:52:49.000000000 -0700 10214501Srpaulo+++ openssl-0.9.8d/include/openssl/ssl.h 2006-12-10 08:20:02.000000000 -0800 11214501Srpaulo@@ -345,6 +345,7 @@ extern "C" { 12214501Srpaulo * 'struct ssl_st *' function parameters used to prototype callbacks 13214501Srpaulo * in SSL_CTX. */ 14214501Srpaulo typedef struct ssl_st *ssl_crock_st; 15214501Srpaulo+typedef struct tls_extension_st TLS_EXTENSION; 16214501Srpaulo 17214501Srpaulo /* used to hold info on the particular ciphers used */ 18214501Srpaulo typedef struct ssl_cipher_st 19214501Srpaulo@@ -366,6 +367,8 @@ DECLARE_STACK_OF(SSL_CIPHER) 20214501Srpaulo typedef struct ssl_st SSL; 21214501Srpaulo typedef struct ssl_ctx_st SSL_CTX; 22214501Srpaulo 23214501Srpaulo+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); 24214501Srpaulo+ 25214501Srpaulo /* Used to hold functions for SSLv2 or SSLv3/TLSv1 functions */ 26214501Srpaulo typedef struct ssl_method_st 27214501Srpaulo { 28214501Srpaulo@@ -973,6 +976,15 @@ struct ssl_st 29214501Srpaulo int first_packet; 30214501Srpaulo int client_version; /* what was passed, used for 31214501Srpaulo * SSLv3/TLS rollback check */ 32214501Srpaulo+ 33214501Srpaulo+ /* TLS externsions */ 34214501Srpaulo+ TLS_EXTENSION *tls_extension; 35214501Srpaulo+ int (*tls_extension_cb)(SSL *s, TLS_EXTENSION *tls_ext, void *arg); 36214501Srpaulo+ void *tls_extension_cb_arg; 37214501Srpaulo+ 38214501Srpaulo+ /* TLS pre-shared secret session resumption */ 39214501Srpaulo+ tls_session_secret_cb_fn tls_session_secret_cb; 40214501Srpaulo+ void *tls_session_secret_cb_arg; 41214501Srpaulo }; 42214501Srpaulo 43214501Srpaulo #ifdef __cplusplus 44214501Srpaulo@@ -1538,6 +1550,13 @@ void *SSL_COMP_get_compression_methods(v 45214501Srpaulo int SSL_COMP_add_compression_method(int id,void *cm); 46214501Srpaulo #endif 47214501Srpaulo 48214501Srpaulo+/* TLS extensions functions */ 49214501Srpaulo+int SSL_set_hello_extension(SSL *s, int ext_type, void *ext_data, int ext_len); 50214501Srpaulo+int SSL_set_hello_extension_cb(SSL *s, int (*cb)(SSL *, TLS_EXTENSION *, void *), void *arg); 51214501Srpaulo+ 52214501Srpaulo+/* Pre-shared secret session resumption functions */ 53214501Srpaulo+int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secret_cb, void *arg); 54214501Srpaulo+ 55214501Srpaulo /* BEGIN ERROR CODES */ 56214501Srpaulo /* The following lines are auto generated by the script mkerr.pl. Any changes 57214501Srpaulo * made after this point may be overwritten when the script is next run. 58214501Srpaulo@@ -1719,6 +1738,7 @@ void ERR_load_SSL_strings(void); 59214501Srpaulo #define SSL_F_TLS1_ENC 210 60214501Srpaulo #define SSL_F_TLS1_SETUP_KEY_BLOCK 211 61214501Srpaulo #define SSL_F_WRITE_PENDING 212 62214501Srpaulo+#define SSL_F_SSL_SET_HELLO_EXTENSION 213 63214501Srpaulo 64214501Srpaulo /* Reason codes. */ 65214501Srpaulo #define SSL_R_APP_DATA_IN_HANDSHAKE 100 66214501Srpaulodiff -uprN openssl-0.9.8d.orig/include/openssl/tls1.h openssl-0.9.8d/include/openssl/tls1.h 67214501Srpaulo--- openssl-0.9.8d.orig/include/openssl/tls1.h 2006-06-14 10:52:01.000000000 -0700 68214501Srpaulo+++ openssl-0.9.8d/include/openssl/tls1.h 2006-12-10 08:20:02.000000000 -0800 69214501Srpaulo@@ -296,6 +296,14 @@ extern "C" { 70214501Srpaulo #define TLS_MD_MASTER_SECRET_CONST "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74" /*master secret*/ 71214501Srpaulo #endif 72214501Srpaulo 73214501Srpaulo+/* TLS extension struct */ 74214501Srpaulo+struct tls_extension_st 75214501Srpaulo+{ 76214501Srpaulo+ unsigned short type; 77214501Srpaulo+ unsigned short length; 78214501Srpaulo+ void *data; 79214501Srpaulo+}; 80214501Srpaulo+ 81214501Srpaulo #ifdef __cplusplus 82214501Srpaulo } 83214501Srpaulo #endif 84214501Srpaulodiff -uprN openssl-0.9.8d.orig/ssl/Makefile openssl-0.9.8d/ssl/Makefile 85214501Srpaulo--- openssl-0.9.8d.orig/ssl/Makefile 2006-02-03 17:49:35.000000000 -0800 86214501Srpaulo+++ openssl-0.9.8d/ssl/Makefile 2006-12-10 08:20:02.000000000 -0800 87214501Srpaulo@@ -24,7 +24,7 @@ LIBSRC= \ 88214501Srpaulo s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \ 89214501Srpaulo s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \ 90214501Srpaulo s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \ 91214501Srpaulo- t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c \ 92214501Srpaulo+ t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c t1_ext.c \ 93214501Srpaulo d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c \ 94214501Srpaulo d1_both.c d1_enc.c \ 95214501Srpaulo ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \ 96214501Srpaulo@@ -35,7 +35,7 @@ LIBOBJ= \ 97214501Srpaulo s2_meth.o s2_srvr.o s2_clnt.o s2_lib.o s2_enc.o s2_pkt.o \ 98214501Srpaulo s3_meth.o s3_srvr.o s3_clnt.o s3_lib.o s3_enc.o s3_pkt.o s3_both.o \ 99214501Srpaulo s23_meth.o s23_srvr.o s23_clnt.o s23_lib.o s23_pkt.o \ 100214501Srpaulo- t1_meth.o t1_srvr.o t1_clnt.o t1_lib.o t1_enc.o \ 101214501Srpaulo+ t1_meth.o t1_srvr.o t1_clnt.o t1_lib.o t1_enc.o t1_ext.o \ 102214501Srpaulo d1_meth.o d1_srvr.o d1_clnt.o d1_lib.o d1_pkt.o \ 103214501Srpaulo d1_both.o d1_enc.o \ 104214501Srpaulo ssl_lib.o ssl_err2.o ssl_cert.o ssl_sess.o \ 105214501Srpaulo@@ -968,3 +968,4 @@ t1_srvr.o: ../include/openssl/ssl23.h .. 106214501Srpaulo t1_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h 107214501Srpaulo t1_srvr.o: ../include/openssl/tls1.h ../include/openssl/x509.h 108214501Srpaulo t1_srvr.o: ../include/openssl/x509_vfy.h ssl_locl.h t1_srvr.c 109214501Srpaulo+t1_ext.o: t1_ext.c ssl_locl.h 110214501Srpaulodiff -uprN openssl-0.9.8d.orig/ssl/s3_clnt.c openssl-0.9.8d/ssl/s3_clnt.c 111214501Srpaulo--- openssl-0.9.8d.orig/ssl/s3_clnt.c 2005-12-12 23:41:46.000000000 -0800 112214501Srpaulo+++ openssl-0.9.8d/ssl/s3_clnt.c 2006-12-10 08:20:02.000000000 -0800 113214501Srpaulo@@ -601,6 +601,20 @@ int ssl3_client_hello(SSL *s) 114214501Srpaulo #endif 115214501Srpaulo *(p++)=0; /* Add the NULL method */ 116214501Srpaulo 117214501Srpaulo+ /* send client hello extensions if any */ 118214501Srpaulo+ if (s->version >= TLS1_VERSION && s->tls_extension) 119214501Srpaulo+ { 120214501Srpaulo+ // set the total extensions length 121214501Srpaulo+ s2n(s->tls_extension->length + 4, p); 122214501Srpaulo+ 123214501Srpaulo+ // put the extensions with type and length 124214501Srpaulo+ s2n(s->tls_extension->type, p); 125214501Srpaulo+ s2n(s->tls_extension->length, p); 126214501Srpaulo+ 127214501Srpaulo+ memcpy(p, s->tls_extension->data, s->tls_extension->length); 128214501Srpaulo+ p+=s->tls_extension->length; 129214501Srpaulo+ } 130214501Srpaulo+ 131214501Srpaulo l=(p-d); 132214501Srpaulo d=buf; 133214501Srpaulo *(d++)=SSL3_MT_CLIENT_HELLO; 134214501Srpaulo@@ -623,7 +637,7 @@ int ssl3_get_server_hello(SSL *s) 135214501Srpaulo STACK_OF(SSL_CIPHER) *sk; 136214501Srpaulo SSL_CIPHER *c; 137214501Srpaulo unsigned char *p,*d; 138214501Srpaulo- int i,al,ok; 139214501Srpaulo+ int i,al,ok,pre_shared; 140214501Srpaulo unsigned int j; 141214501Srpaulo long n; 142214501Srpaulo #ifndef OPENSSL_NO_COMP 143214501Srpaulo@@ -690,7 +704,24 @@ int ssl3_get_server_hello(SSL *s) 144214501Srpaulo goto f_err; 145214501Srpaulo } 146214501Srpaulo 147214501Srpaulo- if (j != 0 && j == s->session->session_id_length 148214501Srpaulo+ /* check if we want to resume the session based on external pre-shared secret */ 149214501Srpaulo+ pre_shared = 0; 150214501Srpaulo+ if (s->version >= TLS1_VERSION && s->tls_session_secret_cb) 151214501Srpaulo+ { 152214501Srpaulo+ SSL_CIPHER *pref_cipher=NULL; 153214501Srpaulo+ s->session->master_key_length=sizeof(s->session->master_key); 154214501Srpaulo+ if (s->tls_session_secret_cb(s, s->session->master_key, &s->session->master_key_length, 155214501Srpaulo+ NULL, &pref_cipher, s->tls_session_secret_cb_arg)) 156214501Srpaulo+ { 157214501Srpaulo+ s->hit=1; 158214501Srpaulo+ s->session->cipher=pref_cipher ? pref_cipher : ssl_get_cipher_by_char(s,p+j); 159214501Srpaulo+ s->session->session_id_length = j; 160214501Srpaulo+ memcpy(s->session->session_id, p, j); 161214501Srpaulo+ pre_shared = 1; 162214501Srpaulo+ } 163214501Srpaulo+ } 164214501Srpaulo+ 165214501Srpaulo+ if ((pre_shared || j != 0) && j == s->session->session_id_length 166214501Srpaulo && memcmp(p,s->session->session_id,j) == 0) 167214501Srpaulo { 168214501Srpaulo if(s->sid_ctx_length != s->session->sid_ctx_length 169214501Srpaulodiff -uprN openssl-0.9.8d.orig/ssl/s3_srvr.c openssl-0.9.8d/ssl/s3_srvr.c 170214501Srpaulo--- openssl-0.9.8d.orig/ssl/s3_srvr.c 2006-09-28 04:29:03.000000000 -0700 171214501Srpaulo+++ openssl-0.9.8d/ssl/s3_srvr.c 2006-12-10 08:20:02.000000000 -0800 172214501Srpaulo@@ -943,6 +943,75 @@ int ssl3_get_client_hello(SSL *s) 173214501Srpaulo } 174214501Srpaulo #endif 175214501Srpaulo 176214501Srpaulo+ /* Check for TLS client hello extension here */ 177214501Srpaulo+ if (p < (d+n) && s->version >= TLS1_VERSION) 178214501Srpaulo+ { 179214501Srpaulo+ if (s->tls_extension_cb) 180214501Srpaulo+ { 181214501Srpaulo+ TLS_EXTENSION tls_ext; 182214501Srpaulo+ unsigned short ext_total_len; 183214501Srpaulo+ 184214501Srpaulo+ n2s(p, ext_total_len); 185214501Srpaulo+ n2s(p, tls_ext.type); 186214501Srpaulo+ n2s(p, tls_ext.length); 187214501Srpaulo+ 188214501Srpaulo+ // sanity check in TLS extension len 189214501Srpaulo+ if (tls_ext.length > (d+n) - p) 190214501Srpaulo+ { 191214501Srpaulo+ // just cut the lenth to packet border 192214501Srpaulo+ tls_ext.length = (d+n) - p; 193214501Srpaulo+ } 194214501Srpaulo+ 195214501Srpaulo+ tls_ext.data = p; 196214501Srpaulo+ 197214501Srpaulo+ // returns an alert code or 0 198214501Srpaulo+ al = s->tls_extension_cb(s, &tls_ext, s->tls_extension_cb_arg); 199214501Srpaulo+ if (al != 0) 200214501Srpaulo+ { 201214501Srpaulo+ SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_PEER_ERROR); 202214501Srpaulo+ goto f_err; 203214501Srpaulo+ } 204214501Srpaulo+ } 205214501Srpaulo+ } 206214501Srpaulo+ 207214501Srpaulo+ /* Check if we want to use external pre-shared secret for this handshake */ 208214501Srpaulo+ /* for not reused session only */ 209214501Srpaulo+ if (!s->hit && s->version >= TLS1_VERSION && s->tls_session_secret_cb) 210214501Srpaulo+ { 211214501Srpaulo+ SSL_CIPHER *pref_cipher=NULL; 212214501Srpaulo+ 213214501Srpaulo+ s->session->master_key_length=sizeof(s->session->master_key); 214214501Srpaulo+ if(s->tls_session_secret_cb(s, s->session->master_key, &s->session->master_key_length, 215214501Srpaulo+ ciphers, &pref_cipher, s->tls_session_secret_cb_arg)) 216214501Srpaulo+ { 217214501Srpaulo+ s->hit=1; 218214501Srpaulo+ s->session->ciphers=ciphers; 219214501Srpaulo+ s->session->verify_result=X509_V_OK; 220214501Srpaulo+ 221214501Srpaulo+ ciphers=NULL; 222214501Srpaulo+ 223214501Srpaulo+ /* check if some cipher was preferred by call back */ 224214501Srpaulo+ pref_cipher=pref_cipher ? pref_cipher : ssl3_choose_cipher(s, s->session->ciphers, SSL_get_ciphers(s)); 225214501Srpaulo+ if (pref_cipher == NULL) 226214501Srpaulo+ { 227214501Srpaulo+ al=SSL_AD_HANDSHAKE_FAILURE; 228214501Srpaulo+ SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_SHARED_CIPHER); 229214501Srpaulo+ goto f_err; 230214501Srpaulo+ } 231214501Srpaulo+ 232214501Srpaulo+ s->session->cipher=pref_cipher; 233214501Srpaulo+ 234214501Srpaulo+ if (s->cipher_list) 235214501Srpaulo+ sk_SSL_CIPHER_free(s->cipher_list); 236214501Srpaulo+ 237214501Srpaulo+ if (s->cipher_list_by_id) 238214501Srpaulo+ sk_SSL_CIPHER_free(s->cipher_list_by_id); 239214501Srpaulo+ 240214501Srpaulo+ s->cipher_list = sk_SSL_CIPHER_dup(s->session->ciphers); 241214501Srpaulo+ s->cipher_list_by_id = sk_SSL_CIPHER_dup(s->session->ciphers); 242214501Srpaulo+ } 243214501Srpaulo+ } 244214501Srpaulo+ 245214501Srpaulo /* Given s->session->ciphers and SSL_get_ciphers, we must 246214501Srpaulo * pick a cipher */ 247214501Srpaulo 248214501Srpaulodiff -uprN openssl-0.9.8d.orig/ssl/ssl.h openssl-0.9.8d/ssl/ssl.h 249214501Srpaulo--- openssl-0.9.8d.orig/ssl/ssl.h 2006-06-14 06:52:49.000000000 -0700 250214501Srpaulo+++ openssl-0.9.8d/ssl/ssl.h 2006-12-10 08:20:02.000000000 -0800 251214501Srpaulo@@ -345,6 +345,7 @@ extern "C" { 252214501Srpaulo * 'struct ssl_st *' function parameters used to prototype callbacks 253214501Srpaulo * in SSL_CTX. */ 254214501Srpaulo typedef struct ssl_st *ssl_crock_st; 255214501Srpaulo+typedef struct tls_extension_st TLS_EXTENSION; 256214501Srpaulo 257214501Srpaulo /* used to hold info on the particular ciphers used */ 258214501Srpaulo typedef struct ssl_cipher_st 259214501Srpaulo@@ -366,6 +367,8 @@ DECLARE_STACK_OF(SSL_CIPHER) 260214501Srpaulo typedef struct ssl_st SSL; 261214501Srpaulo typedef struct ssl_ctx_st SSL_CTX; 262214501Srpaulo 263214501Srpaulo+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); 264214501Srpaulo+ 265214501Srpaulo /* Used to hold functions for SSLv2 or SSLv3/TLSv1 functions */ 266214501Srpaulo typedef struct ssl_method_st 267214501Srpaulo { 268214501Srpaulo@@ -973,6 +976,15 @@ struct ssl_st 269214501Srpaulo int first_packet; 270214501Srpaulo int client_version; /* what was passed, used for 271214501Srpaulo * SSLv3/TLS rollback check */ 272214501Srpaulo+ 273214501Srpaulo+ /* TLS externsions */ 274214501Srpaulo+ TLS_EXTENSION *tls_extension; 275214501Srpaulo+ int (*tls_extension_cb)(SSL *s, TLS_EXTENSION *tls_ext, void *arg); 276214501Srpaulo+ void *tls_extension_cb_arg; 277214501Srpaulo+ 278214501Srpaulo+ /* TLS pre-shared secret session resumption */ 279214501Srpaulo+ tls_session_secret_cb_fn tls_session_secret_cb; 280214501Srpaulo+ void *tls_session_secret_cb_arg; 281214501Srpaulo }; 282214501Srpaulo 283214501Srpaulo #ifdef __cplusplus 284214501Srpaulo@@ -1538,6 +1550,13 @@ void *SSL_COMP_get_compression_methods(v 285214501Srpaulo int SSL_COMP_add_compression_method(int id,void *cm); 286214501Srpaulo #endif 287214501Srpaulo 288214501Srpaulo+/* TLS extensions functions */ 289214501Srpaulo+int SSL_set_hello_extension(SSL *s, int ext_type, void *ext_data, int ext_len); 290214501Srpaulo+int SSL_set_hello_extension_cb(SSL *s, int (*cb)(SSL *, TLS_EXTENSION *, void *), void *arg); 291214501Srpaulo+ 292214501Srpaulo+/* Pre-shared secret session resumption functions */ 293214501Srpaulo+int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secret_cb, void *arg); 294214501Srpaulo+ 295214501Srpaulo /* BEGIN ERROR CODES */ 296214501Srpaulo /* The following lines are auto generated by the script mkerr.pl. Any changes 297214501Srpaulo * made after this point may be overwritten when the script is next run. 298214501Srpaulo@@ -1719,6 +1738,7 @@ void ERR_load_SSL_strings(void); 299214501Srpaulo #define SSL_F_TLS1_ENC 210 300214501Srpaulo #define SSL_F_TLS1_SETUP_KEY_BLOCK 211 301214501Srpaulo #define SSL_F_WRITE_PENDING 212 302214501Srpaulo+#define SSL_F_SSL_SET_HELLO_EXTENSION 213 303214501Srpaulo 304214501Srpaulo /* Reason codes. */ 305214501Srpaulo #define SSL_R_APP_DATA_IN_HANDSHAKE 100 306214501Srpaulodiff -uprN openssl-0.9.8d.orig/ssl/ssl_err.c openssl-0.9.8d/ssl/ssl_err.c 307214501Srpaulo--- openssl-0.9.8d.orig/ssl/ssl_err.c 2006-01-08 13:52:46.000000000 -0800 308214501Srpaulo+++ openssl-0.9.8d/ssl/ssl_err.c 2006-12-10 08:20:02.000000000 -0800 309214501Srpaulo@@ -242,6 +242,7 @@ static ERR_STRING_DATA SSL_str_functs[]= 310214501Srpaulo {ERR_FUNC(SSL_F_TLS1_ENC), "TLS1_ENC"}, 311214501Srpaulo {ERR_FUNC(SSL_F_TLS1_SETUP_KEY_BLOCK), "TLS1_SETUP_KEY_BLOCK"}, 312214501Srpaulo {ERR_FUNC(SSL_F_WRITE_PENDING), "WRITE_PENDING"}, 313214501Srpaulo+{ERR_FUNC(SSL_F_SSL_SET_HELLO_EXTENSION), "SSL_set_hello_extension"}, 314214501Srpaulo {0,NULL} 315214501Srpaulo }; 316214501Srpaulo 317214501Srpaulodiff -uprN openssl-0.9.8d.orig/ssl/ssl_sess.c openssl-0.9.8d/ssl/ssl_sess.c 318214501Srpaulo--- openssl-0.9.8d.orig/ssl/ssl_sess.c 2005-12-30 15:51:57.000000000 -0800 319214501Srpaulo+++ openssl-0.9.8d/ssl/ssl_sess.c 2006-12-10 08:20:02.000000000 -0800 320214501Srpaulo@@ -656,6 +656,15 @@ long SSL_CTX_get_timeout(const SSL_CTX * 321214501Srpaulo return(s->session_timeout); 322214501Srpaulo } 323214501Srpaulo 324214501Srpaulo+int SSL_set_session_secret_cb(SSL *s, int (*tls_session_secret_cb)(SSL *s, void *secret, int *secret_len, 325214501Srpaulo+ STACK_OF(SSL_CIPHER) *peer_ciphers, SSL_CIPHER **cipher, void *arg), void *arg) 326214501Srpaulo+{ 327214501Srpaulo+ if (s == NULL) return(0); 328214501Srpaulo+ s->tls_session_secret_cb = tls_session_secret_cb; 329214501Srpaulo+ s->tls_session_secret_cb_arg = arg; 330214501Srpaulo+ return(1); 331214501Srpaulo+} 332214501Srpaulo+ 333214501Srpaulo typedef struct timeout_param_st 334214501Srpaulo { 335214501Srpaulo SSL_CTX *ctx; 336214501Srpaulodiff -uprN openssl-0.9.8d.orig/ssl/t1_ext.c openssl-0.9.8d/ssl/t1_ext.c 337214501Srpaulo--- openssl-0.9.8d.orig/ssl/t1_ext.c 1969-12-31 16:00:00.000000000 -0800 338214501Srpaulo+++ openssl-0.9.8d/ssl/t1_ext.c 2006-12-10 08:20:02.000000000 -0800 339214501Srpaulo@@ -0,0 +1,48 @@ 340214501Srpaulo+ 341214501Srpaulo+#include <stdio.h> 342214501Srpaulo+#include "ssl_locl.h" 343214501Srpaulo+ 344214501Srpaulo+ 345214501Srpaulo+int SSL_set_hello_extension(SSL *s, int ext_type, void *ext_data, int ext_len) 346214501Srpaulo+{ 347214501Srpaulo+ if(s->version >= TLS1_VERSION) 348214501Srpaulo+ { 349214501Srpaulo+ if(s->tls_extension) 350214501Srpaulo+ { 351214501Srpaulo+ OPENSSL_free(s->tls_extension); 352214501Srpaulo+ s->tls_extension = NULL; 353214501Srpaulo+ } 354214501Srpaulo+ 355214501Srpaulo+ if(ext_data) 356214501Srpaulo+ { 357214501Srpaulo+ s->tls_extension = OPENSSL_malloc(sizeof(TLS_EXTENSION) + ext_len); 358214501Srpaulo+ if(!s->tls_extension) 359214501Srpaulo+ { 360214501Srpaulo+ SSLerr(SSL_F_SSL_SET_HELLO_EXTENSION, ERR_R_MALLOC_FAILURE); 361214501Srpaulo+ return 0; 362214501Srpaulo+ } 363214501Srpaulo+ 364214501Srpaulo+ s->tls_extension->type = ext_type; 365214501Srpaulo+ s->tls_extension->length = ext_len; 366214501Srpaulo+ s->tls_extension->data = s->tls_extension + 1; 367214501Srpaulo+ memcpy(s->tls_extension->data, ext_data, ext_len); 368214501Srpaulo+ } 369214501Srpaulo+ 370214501Srpaulo+ return 1; 371214501Srpaulo+ } 372214501Srpaulo+ 373214501Srpaulo+ return 0; 374214501Srpaulo+} 375214501Srpaulo+ 376214501Srpaulo+int SSL_set_hello_extension_cb(SSL *s, int (*cb)(SSL *, TLS_EXTENSION *, void *), void *arg) 377214501Srpaulo+{ 378214501Srpaulo+ if(s->version >= TLS1_VERSION) 379214501Srpaulo+ { 380214501Srpaulo+ s->tls_extension_cb = cb; 381214501Srpaulo+ s->tls_extension_cb_arg = arg; 382214501Srpaulo+ 383214501Srpaulo+ return 1; 384214501Srpaulo+ } 385214501Srpaulo+ 386214501Srpaulo+ return 0; 387214501Srpaulo+} 388214501Srpaulodiff -uprN openssl-0.9.8d.orig/ssl/t1_lib.c openssl-0.9.8d/ssl/t1_lib.c 389214501Srpaulo--- openssl-0.9.8d.orig/ssl/t1_lib.c 2005-08-05 16:52:07.000000000 -0700 390214501Srpaulo+++ openssl-0.9.8d/ssl/t1_lib.c 2006-12-10 08:20:02.000000000 -0800 391214501Srpaulo@@ -97,6 +97,10 @@ int tls1_new(SSL *s) 392214501Srpaulo 393214501Srpaulo void tls1_free(SSL *s) 394214501Srpaulo { 395214501Srpaulo+ if(s->tls_extension) 396214501Srpaulo+ { 397214501Srpaulo+ OPENSSL_free(s->tls_extension); 398214501Srpaulo+ } 399214501Srpaulo ssl3_free(s); 400214501Srpaulo } 401214501Srpaulo 402214501Srpaulodiff -uprN openssl-0.9.8d.orig/ssl/tls1.h openssl-0.9.8d/ssl/tls1.h 403214501Srpaulo--- openssl-0.9.8d.orig/ssl/tls1.h 2006-06-14 10:52:01.000000000 -0700 404214501Srpaulo+++ openssl-0.9.8d/ssl/tls1.h 2006-12-10 08:20:02.000000000 -0800 405214501Srpaulo@@ -296,6 +296,14 @@ extern "C" { 406214501Srpaulo #define TLS_MD_MASTER_SECRET_CONST "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74" /*master secret*/ 407214501Srpaulo #endif 408214501Srpaulo 409214501Srpaulo+/* TLS extension struct */ 410214501Srpaulo+struct tls_extension_st 411214501Srpaulo+{ 412214501Srpaulo+ unsigned short type; 413214501Srpaulo+ unsigned short length; 414214501Srpaulo+ void *data; 415214501Srpaulo+}; 416214501Srpaulo+ 417214501Srpaulo #ifdef __cplusplus 418214501Srpaulo } 419214501Srpaulo #endif 420214501Srpaulodiff -uprN openssl-0.9.8d.orig/util/ssleay.num openssl-0.9.8d/util/ssleay.num 421214501Srpaulo--- openssl-0.9.8d.orig/util/ssleay.num 2005-05-08 17:22:02.000000000 -0700 422214501Srpaulo+++ openssl-0.9.8d/util/ssleay.num 2006-12-10 08:20:02.000000000 -0800 423214501Srpaulo@@ -226,3 +226,6 @@ DTLSv1_server_method 424214501Srpaulo SSL_COMP_get_compression_methods 276 EXIST:!VMS:FUNCTION:COMP 425214501Srpaulo SSL_COMP_get_compress_methods 276 EXIST:VMS:FUNCTION:COMP 426214501Srpaulo SSL_SESSION_get_id 277 EXIST::FUNCTION: 427214501Srpaulo+SSL_set_hello_extension 278 EXIST::FUNCTION: 428214501Srpaulo+SSL_set_hello_extension_cb 279 EXIST::FUNCTION: 429214501Srpaulo+SSL_set_session_secret_cb 280 EXIST::FUNCTION: 430