Fix export tests.

[openssl.git] / ssl / s3_srvr.c

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 64903af1519b5f075febf4f0cf77bd9b2e3b9250..4e856b3ce86b727c23828b4bd924ec932c02d00f 100644 (file)
--- 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;
@@ -1259,7 +1259,7 @@ SSL *s;
                i=RSA_private_decrypt((int)n,p,p,rsa,RSA_PKCS1_PADDING);
 
 #if 1
-               /* If a bad decrypt, use a dud master key */
+               /* If a bad decrypt, use a random master key */
                if ((i != SSL_MAX_MASTER_KEY_LENGTH) ||
                        ((p[0] != (s->version>>8)) ||
                         (p[1] != (s->version & 0xff))))