From: Ben Laurie <ben@openssl.org>
Date: Wed, 6 Jan 1999 23:18:08 +0000 (+0000)
Subject: Fix export tests.
X-Git-Tag: OpenSSL_0_9_2b~272
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=5b00115ab0d1e19f374a8feb20e003514e03a7cb;hp=f8c3c05db95bd30671bd713ea42d26c6d262c36b

Fix export tests.
---

diff --git a/CHANGES b/CHANGES
index 412d913b17..430603ad6b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
 
  Changes between 0.9.1c and 0.9.2
 
+  *) Temp key "for export" tests were wrong in s3_srvr.c.
+     [Anonymous <nobody@replay.com>]
+
   *) Add prototype for temp key callback functions
      SSL_CTX_set_tmp_{rsa,dh}_callback().
      [Ben Laurie]
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 743f8ea235..4e856b3ce8 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -915,8 +915,8 @@ SSL *s;
 			if ((rsa == NULL) && (s->ctx->default_cert->rsa_tmp_cb != NULL))
 				{
 				rsa=s->ctx->default_cert->rsa_tmp_cb(s,
-					(s->s3->tmp.new_cipher->algorithms|
-					SSL_NOT_EXP)?0:1);
+					!(s->s3->tmp.new_cipher->algorithms
+					  &SSL_NOT_EXP));
 				CRYPTO_add(&rsa->references,1,CRYPTO_LOCK_RSA);
 				cert->rsa_tmp=rsa;
 				}
@@ -938,8 +938,8 @@ SSL *s;
 			dhp=cert->dh_tmp;
 			if ((dhp == NULL) && (cert->dh_tmp_cb != NULL))
 				dhp=cert->dh_tmp_cb(s,
-					(s->s3->tmp.new_cipher->algorithms|
-					SSL_NOT_EXP)?0:1);
+					!(s->s3->tmp.new_cipher->algorithms
+					  &SSL_NOT_EXP));
 			if (dhp == NULL)
 				{
 				al=SSL_AD_HANDSHAKE_FAILURE;