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
Download Patch File Download Diff File Expand all files Collapse all files

12
ssl/ssl_locl.h
View File

@@ -571,9 +571,9 @@ typedef struct ssl3_enc_method
const char *server_finished_label;
int server_finished_label_len;
int (*alert_value)(int);
int (*export_keying_material)(SSL *, unsigned char *, unsigned int,
const char *, unsigned int,
const unsigned char *, unsigned int,
int (*export_keying_material)(SSL *, unsigned char *, size_t,
const char *, size_t,
const unsigned char *, size_t,
int use_context);
} 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_generate_master_secret(SSL *s, unsigned char *out,
unsigned char *p, int len);
int tls1_export_keying_material(SSL *s, unsigned char *out, unsigned int olen,
const char *label, unsigned int llen, const unsigned char *p,
unsigned int plen, int use_context);
int tls1_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);
int tls1_alert_code(int code);
int ssl3_alert_code(int code);
int ssl_ok(SSL *s);