From: Bodo Möller <bodo@openssl.org>
Date: Thu, 15 Jun 2006 16:07:10 +0000 (+0000)
Subject: Oops ... deleted too much in the previous commit when I deleted
X-Git-Tag: OpenSSL_0_9_8k^2~1250
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4dfc8f1f0b3ff85adfdca3a37be5df7928092f07;p=oweals%2Fopenssl.git

Oops ... deleted too much in the previous commit when I deleted
the Fortezza stuff
---

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index b4b95c3edb..db0f31e054 100644
--- 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