diff options
-rw-r--r-- | src/lib/libssl/t1_enc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c index ac037478d6..fe822a98ef 100644 --- a/src/lib/libssl/t1_enc.c +++ b/src/lib/libssl/t1_enc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: t1_enc.c,v 1.99 2017/03/07 13:37:03 jsing Exp $ */ | 1 | /* $OpenBSD: t1_enc.c,v 1.100 2017/03/10 15:03:59 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -144,6 +144,11 @@ | |||
144 | #include <openssl/hmac.h> | 144 | #include <openssl/hmac.h> |
145 | #include <openssl/md5.h> | 145 | #include <openssl/md5.h> |
146 | 146 | ||
147 | int tls1_PRF(SSL *s, const void *seed1, int seed1_len, const void *seed2, | ||
148 | int seed2_len, const void *seed3, int seed3_len, const void *seed4, | ||
149 | int seed4_len, const void *seed5, int seed5_len, const unsigned char *sec, | ||
150 | int slen, unsigned char *out1, unsigned char *out2, int olen); | ||
151 | |||
147 | void | 152 | void |
148 | tls1_cleanup_key_block(SSL *s) | 153 | tls1_cleanup_key_block(SSL *s) |
149 | { | 154 | { |
@@ -371,7 +376,7 @@ err: | |||
371 | } | 376 | } |
372 | 377 | ||
373 | /* seed1 through seed5 are virtually concatenated */ | 378 | /* seed1 through seed5 are virtually concatenated */ |
374 | static int | 379 | int |
375 | tls1_PRF(SSL *s, const void *seed1, int seed1_len, const void *seed2, | 380 | tls1_PRF(SSL *s, const void *seed1, int seed1_len, const void *seed2, |
376 | int seed2_len, const void *seed3, int seed3_len, const void *seed4, | 381 | int seed2_len, const void *seed3, int seed3_len, const void *seed4, |
377 | int seed4_len, const void *seed5, int seed5_len, const unsigned char *sec, | 382 | int seed4_len, const void *seed5, int seed5_len, const unsigned char *sec, |