projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix export tests.
[openssl.git]
/
ssl
/
s3_srvr.c
diff --git
a/ssl/s3_srvr.c
b/ssl/s3_srvr.c
index 743f8ea235cb4e84c081ea9500c38060e0ffd6ca..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,
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;