ports/security/openssl/files/patch-RFC-5705
Mathieu Arnold bcdc68f820 Revert the OpenSSL 1.1.0 update, it was not tested.
With hat:	portmgr
Sponsored by:	Absolight
2016-08-27 11:00:44 +00:00

38 lines
1.3 KiB
Text

--- ssl/ssl.h 6 Jan 2010 17:37:38 -0000 1.221.2.24
+++ ssl/ssl.h 17 Jun 2010 12:25:35 -0000
@@ -1806,6 +1806,10 @@
/* 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);
+void SSL_tls1_key_exporter(SSL *s, unsigned char *label, int label_len,
+ unsigned char *context, int context_len,
+ unsigned char *out, int olen);
+
/* 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.
--- ssl/t1_enc.c.orig 2015-01-22 15:58:32.000000000 +0100
+++ ssl/t1_enc.c 2015-03-10 07:21:12.000000000 +0100
@@ -1261,6 +1261,21 @@
return (rv);
}
+void SSL_tls1_key_exporter(SSL *s, unsigned char *label, int label_len,
+ unsigned char *context, int context_len,
+ unsigned char *out, int olen)
+ {
+ unsigned char tmp[olen];
+
+ tls1_PRF(s->s3->tmp.new_cipher->algorithm2,
+ label, label_len,
+ s->s3->client_random,SSL3_RANDOM_SIZE,
+ s->s3->server_random,SSL3_RANDOM_SIZE,
+ context, context_len, NULL, 0,
+ s->session->master_key, s->session->master_key_length,
+ out, tmp, olen);
+ }
+
int tls1_alert_code(int code)
{
switch (code) {