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:
5b57fe0
)
Oops ... deleted too much in the previous commit when I deleted
author
Bodo Möller
<bodo@openssl.org>
Thu, 15 Jun 2006 16:07:10 +0000
(16:07 +0000)
committer
Bodo Möller
<bodo@openssl.org>
Thu, 15 Jun 2006 16:07:10 +0000
(16:07 +0000)
the Fortezza stuff
ssl/s3_srvr.c
patch
|
blob
|
history
diff --git
a/ssl/s3_srvr.c
b/ssl/s3_srvr.c
index b4b95c3edb20e8bc41d94f0ff52aad3768b63d0b..db0f31e054a8db607663b0173df7d7534afffdc8 100644
(file)
--- a/
ssl/s3_srvr.c
+++ b/
ssl/s3_srvr.c
@@
-374,6
+374,7
@@
int ssl3_accept(SSL *s)
#ifndef OPENSSL_NO_PSK
|| ((l & SSL_kPSK) && s->ctx->psk_identity_hint)
#endif
+ || (l & SSL_DH)
|| (l & SSL_kEECDH)
|| ((l & SSL_kRSA)
&& (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL