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

SSL export fixes (from Adam Langley) [original from 1.0.1]

Browse Source
This commit is contained in:
Dr. Stephen Henson
2012-02-22 15:06:56 +00:00
parent de2b5b7439
commit 74b4b49494
5 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ssl/ssl_lib.c
View File

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