projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f617b49
)
The wrong ifdef is used to guard usage of PSK code
author
Kurt Cancemi
<kurt@x64architecture.com>
Thu, 9 Apr 2015 13:54:38 +0000
(09:54 -0400)
committer
Dr. Stephen Henson
<steve@openssl.org>
Fri, 10 Apr 2015 22:52:32 +0000
(23:52 +0100)
PR#3790
Reviewed-by: Stephen Henson <steve@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
ssl/ssl_asn1.c
patch
|
blob
|
history
diff --git
a/ssl/ssl_asn1.c
b/ssl/ssl_asn1.c
index fb2a49556dc2cb7762bc997cb869d14d6c6d7725..b6e784924d5e9dcc6e5543d66f20daa77719f8d5 100644
(file)
--- a/
ssl/ssl_asn1.c
+++ b/
ssl/ssl_asn1.c
@@
-109,7
+109,7
@@
typedef struct {
long tlsext_tick_lifetime_hint;
ASN1_OCTET_STRING *tlsext_tick;
#endif
-#ifndef OPENSSL_NO_
TLSEXT
+#ifndef OPENSSL_NO_
PSK
ASN1_OCTET_STRING *psk_identity_hint;
ASN1_OCTET_STRING *psk_identity;
#endif