projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
46bfc05
)
Use correct digest when exporting keying material.
author
Dr. Stephen Henson
<steve@openssl.org>
Fri, 30 May 2014 12:21:43 +0000
(13:21 +0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Sat, 31 May 2014 12:43:01 +0000
(13:43 +0100)
PR#3319
(cherry picked from commit
84691390eae86befd33c83721dacedb539ae34e6
)
ssl/t1_enc.c
patch
|
blob
|
history
diff --git
a/ssl/t1_enc.c
b/ssl/t1_enc.c
index 5e05e933223d6921c87617a1ba4295e3e4ce3ec1..ac8c1539968b4599200dcef01e37b2e5823f500e 100644
(file)
--- a/
ssl/t1_enc.c
+++ b/
ssl/t1_enc.c
@@
-1181,7
+1181,7
@@
int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
if (memcmp(val, TLS_MD_KEY_EXPANSION_CONST,
TLS_MD_KEY_EXPANSION_CONST_SIZE) == 0) goto err1;
- rv = tls1_PRF(s
->s3->tmp.new_cipher->algorithm2
,
+ rv = tls1_PRF(s
sl_get_algorithm2(s)
,
val, vallen,
NULL, 0,
NULL, 0,