diff options
author | jsing <jsing@openbsd.org> | 2017-03-10 15:03:59 +0000 |
---|---|---|
committer | jsing <jsing@openbsd.org> | 2017-03-10 15:03:59 +0000 |
commit | ddde72fdc3f2294bb70e53cbd904203b4a13aeb3 (patch) | |
tree | 039e4ecea0491ac6e6b5a2746098fab23743deaa /lib/libssl/t1_enc.c | |
parent | Missed this file in the deplatformization commit. (diff) | |
download | wireguard-openbsd-ddde72fdc3f2294bb70e53cbd904203b4a13aeb3.tar.xz wireguard-openbsd-ddde72fdc3f2294bb70e53cbd904203b4a13aeb3.zip |
Make tls1_PRF() non-static so it can be regress tested.
Diffstat (limited to 'lib/libssl/t1_enc.c')
-rw-r--r-- | lib/libssl/t1_enc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/libssl/t1_enc.c b/lib/libssl/t1_enc.c index ac037478d63..fe822a98efd 100644 --- a/lib/libssl/t1_enc.c +++ b/lib/libssl/t1_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_enc.c,v 1.99 2017/03/07 13:37:03 jsing Exp $ */ +/* $OpenBSD: t1_enc.c,v 1.100 2017/03/10 15:03:59 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -144,6 +144,11 @@ #include <openssl/hmac.h> #include <openssl/md5.h> +int tls1_PRF(SSL *s, const void *seed1, int seed1_len, const void *seed2, + int seed2_len, const void *seed3, int seed3_len, const void *seed4, + int seed4_len, const void *seed5, int seed5_len, const unsigned char *sec, + int slen, unsigned char *out1, unsigned char *out2, int olen); + void tls1_cleanup_key_block(SSL *s) { @@ -371,7 +376,7 @@ err: } /* seed1 through seed5 are virtually concatenated */ -static int +int tls1_PRF(SSL *s, const void *seed1, int seed1_len, const void *seed2, int seed2_len, const void *seed3, int seed3_len, const void *seed4, int seed4_len, const void *seed5, int seed5_len, const unsigned char *sec, |