generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SSL export fixes (from Adam Langley).

Browse Source
This commit is contained in:
Ben Laurie 2011-12-13 14:25:11 +00:00
parent 7b467c6b81
commit e87afb1518
5 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/s3_lib.c
View File

@ -2904,8 +2904,8 @@ SSL3_ENC_METHOD SSLv3_enc_data={
SSL3_MD_CLIENT_FINISHED_CONST,4, SSL3_MD_CLIENT_FINISHED_CONST,4,
SSL3_MD_SERVER_FINISHED_CONST,4, SSL3_MD_SERVER_FINISHED_CONST,4,
ssl3_alert_code, ssl3_alert_code,
(int (*)(SSL *, unsigned char *, unsigned int, const char *, (int (*)(SSL *, unsigned char *, size_t, const char *,
unsigned int, const unsigned char *, unsigned int, size_t, const unsigned char *, size_t,
int use_context))ssl_undefined_function, int use_context))ssl_undefined_function,
}; };

11
ssl/ssl_lib.c
View File

@ -177,9 +177,9 @@ SSL3_ENC_METHOD ssl3_undef_enc_method={
NULL, /* server_finished_label */ NULL, /* server_finished_label */
0, /* server_finished_label_len */ 0, /* server_finished_label_len */
(int (*)(int))ssl_undefined_function, (int (*)(int))ssl_undefined_function,
(int (*)(SSL *, unsigned char *, unsigned int, const char *, (int (*)(SSL *, unsigned char *, size_t, const char *,
unsigned int, const unsigned char *, unsigned int, size_t, const unsigned char *, size_t,
int use_context))ssl_undefined_function, int use_context)) ssl_undefined_function,
}; };
int SSL_clear(SSL *s) int SSL_clear(SSL *s)
@ -1627,8 +1627,9 @@ void SSL_CTX_set_next_proto_select_cb(SSL_CTX *ctx, int (*cb) (SSL *s, unsigned
# endif # endif
#endif #endif
int SSL_export_keying_material(SSL *s, unsigned char *out, int olen, int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
char *label, int llen, unsigned char *p, int plen, int use_context) const char *label, size_t llen, const unsigned char *p, size_t plen,
int use_context)
{ {
if (s->version < TLS1_VERSION) if (s->version < TLS1_VERSION)
return -1; return -1;

12
ssl/ssl_locl.h
View File

@ -571,9 +571,9 @@ typedef struct ssl3_enc_method
const char *server_finished_label; const char *server_finished_label;
int server_finished_label_len; int server_finished_label_len;
int (*alert_value)(int); int (*alert_value)(int);
int (*export_keying_material)(SSL *, unsigned char *, unsigned int, int (*export_keying_material)(SSL *, unsigned char *, size_t,
const char *, unsigned int, const char *, size_t,
const unsigned char *, unsigned int, const unsigned char *, size_t,
int use_context); int use_context);
} SSL3_ENC_METHOD; } SSL3_ENC_METHOD;
@ -1061,9 +1061,9 @@ int tls1_cert_verify_mac(SSL *s, int md_nid, unsigned char *p);
int tls1_mac(SSL *ssl, unsigned char *md, int snd); int tls1_mac(SSL *ssl, unsigned char *md, int snd);
int tls1_generate_master_secret(SSL *s, unsigned char *out, int tls1_generate_master_secret(SSL *s, unsigned char *out,
unsigned char *p, int len); unsigned char *p, int len);
int tls1_export_keying_material(SSL *s, unsigned char *out, unsigned int olen, int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
const char *label, unsigned int llen, const unsigned char *p, const char *label, size_t llen,
unsigned int plen, int use_context); const unsigned char *p, size_t plen, int use_context);
int tls1_alert_code(int code); int tls1_alert_code(int code);
int ssl3_alert_code(int code); int ssl3_alert_code(int code);
int ssl_ok(SSL *s); int ssl_ok(SSL *s);

58
ssl/t1_enc.c
View File

@ -1119,16 +1119,17 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
return(SSL3_MASTER_SECRET_SIZE); return(SSL3_MASTER_SECRET_SIZE);
} }
int tls1_export_keying_material(SSL *s, unsigned char *out, unsigned int olen, int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
const char *label, unsigned int llen, const unsigned char *context, const char *label, size_t llen, const unsigned char *context,
unsigned int contextlen, int use_context) size_t contextlen, int use_context)
{ {
unsigned char *buff; unsigned char *buff;
unsigned char *val = NULL; unsigned char *val = NULL;
unsigned int vallen, currentvalpos, rv; size_t vallen, currentvalpos;
int rv;
#ifdef KSSL_DEBUG #ifdef KSSL_DEBUG
printf ("tls1_export_keying_material(%p, %p,%d, %s,%d, %p,%d)\n", s, out,olen, label,llen, p,plen); printf ("tls1_export_keying_material(%p,%p,%d,%s,%d,%p,%d)\n", s, out, olen, label, llen, p, plen);
#endif /* KSSL_DEBUG */ #endif /* KSSL_DEBUG */
buff = OPENSSL_malloc(olen); buff = OPENSSL_malloc(olen);
@ -1140,10 +1141,10 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, unsigned int olen,
* does not create a prohibited label. * does not create a prohibited label.
*/ */
vallen = llen + SSL3_RANDOM_SIZE * 2; vallen = llen + SSL3_RANDOM_SIZE * 2;
if (use_context) if (use_context)
{ {
vallen += 2 + contextlen; vallen += 2 + contextlen;
} }
val = OPENSSL_malloc(vallen); val = OPENSSL_malloc(vallen);
if (val == NULL) goto err2; if (val == NULL) goto err2;
@ -1155,17 +1156,17 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, unsigned int olen,
memcpy(val + currentvalpos, s->s3->server_random, SSL3_RANDOM_SIZE); memcpy(val + currentvalpos, s->s3->server_random, SSL3_RANDOM_SIZE);
currentvalpos += SSL3_RANDOM_SIZE; currentvalpos += SSL3_RANDOM_SIZE;
if (use_context) if (use_context)
{ {
val[currentvalpos] = (contextlen << 8) & 0xff; val[currentvalpos] = (contextlen >> 8) & 0xff;
currentvalpos++; currentvalpos++;
val[currentvalpos] = contextlen & 0xff; val[currentvalpos] = contextlen & 0xff;
currentvalpos++; currentvalpos++;
if ((contextlen > 0) || (context != NULL)) if ((contextlen > 0) || (context != NULL))
{ {
memcpy(val + currentvalpos, context, contextlen); memcpy(val + currentvalpos, context, contextlen);
} }
} }
/* disallow prohibited labels /* disallow prohibited labels
* note that SSL3_RANDOM_SIZE > max(prohibited label len) = * note that SSL3_RANDOM_SIZE > max(prohibited label len) =
@ -1181,19 +1182,18 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, unsigned int olen,
if (memcmp(val, TLS_MD_KEY_EXPANSION_CONST, if (memcmp(val, TLS_MD_KEY_EXPANSION_CONST,
TLS_MD_KEY_EXPANSION_CONST_SIZE) == 0) goto err1; TLS_MD_KEY_EXPANSION_CONST_SIZE) == 0) goto err1;
tls1_PRF(s->s3->tmp.new_cipher->algorithm2, rv = tls1_PRF(s->s3->tmp.new_cipher->algorithm2,
val, vallen, val, vallen,
NULL, 0, NULL, 0,
NULL, 0, NULL, 0,
NULL, 0, NULL, 0,
NULL, 0, NULL, 0,
s->session->master_key,s->session->master_key_length, s->session->master_key,s->session->master_key_length,
out,buff,olen); out,buff,olen);
#ifdef KSSL_DEBUG #ifdef KSSL_DEBUG
printf ("tls1_export_keying_material() complete\n"); printf ("tls1_export_keying_material() complete\n");
#endif /* KSSL_DEBUG */ #endif /* KSSL_DEBUG */
rv = olen;
goto ret; goto ret;
err1: err1:
SSLerr(SSL_F_TLS1_EXPORT_KEYING_MATERIAL, SSL_R_TLS_ILLEGAL_EXPORTER_LABEL); SSLerr(SSL_F_TLS1_EXPORT_KEYING_MATERIAL, SSL_R_TLS_ILLEGAL_EXPORTER_LABEL);

12
ssl/tls1.h
View File

@ -262,8 +262,16 @@ extern "C" {
const char *SSL_get_servername(const SSL *s, const int type); const char *SSL_get_servername(const SSL *s, const int type);
int SSL_get_servername_type(const SSL *s); int SSL_get_servername_type(const SSL *s);
int SSL_export_keying_material(SSL *s, unsigned char *out, int olen, /* SSL_export_keying_material exports a value derived from the master secret,
char *label, int llen, unsigned char *p, int plen, int use_context); * as specified in RFC 5705. It writes |olen| bytes to |out| given a label and
* optional context. (Since a zero length context is allowed, the |use_context|
* flag controls whether a context is included.)
*
* It returns 1 on success and zero otherwise.
*/
int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
const char *label, size_t llen, const unsigned char *p, size_t plen,
int use_context);
#define SSL_set_tlsext_host_name(s,name) \ #define SSL_set_tlsext_host_name(s,name) \
SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_HOSTNAME,TLSEXT_NAMETYPE_host_name,(char *)name) SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_HOSTNAME,TLSEXT_NAMETYPE_host_name,(char *)name)