Fix export tests.
authorBen Laurie <ben@openssl.org>
Wed, 6 Jan 1999 23:18:08 +0000 (23:18 +0000)
committerBen Laurie <ben@openssl.org>
Wed, 6 Jan 1999 23:18:08 +0000 (23:18 +0000)
CHANGES
ssl/s3_srvr.c

diff --git a/CHANGES b/CHANGES
index 412d913..430603a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
 
  Changes between 0.9.1c and 0.9.2
 
 
  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]
   *) Add prototype for temp key callback functions
      SSL_CTX_set_tmp_{rsa,dh}_callback().
      [Ben Laurie]
index 743f8ea..4e856b3 100644 (file)
@@ -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,
                        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;
                                }
                                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,
                        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;
                        if (dhp == NULL)
                                {
                                al=SSL_AD_HANDSHAKE_FAILURE;