generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix export tests.

Browse Source
This commit is contained in:
Ben Laurie 1999-01-06 23:18:08 +00:00
parent f8c3c05db9
commit 5b00115ab0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -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 *) Add prototype for temp key callback functions
SSL_CTX_set_tmp_{rsa,dh}_callback(). SSL_CTX_set_tmp_{rsa,dh}_callback().
[Ben Laurie] [Ben Laurie]

8
ssl/s3_srvr.c
View File

@ -915,8 +915,8 @@ SSL *s;
if ((rsa == NULL) && (s->ctx->default_cert->rsa_tmp_cb != NULL)) if ((rsa == NULL) && (s->ctx->default_cert->rsa_tmp_cb != NULL))
{ {
rsa=s->ctx->default_cert->rsa_tmp_cb(s, rsa=s->ctx->default_cert->rsa_tmp_cb(s,
(s->s3->tmp.new_cipher->algorithms| !(s->s3->tmp.new_cipher->algorithms
SSL_NOT_EXP)?0:1); &SSL_NOT_EXP));
CRYPTO_add(&rsa->references,1,CRYPTO_LOCK_RSA); CRYPTO_add(&rsa->references,1,CRYPTO_LOCK_RSA);
cert->rsa_tmp=rsa; cert->rsa_tmp=rsa;
} }
@ -938,8 +938,8 @@ SSL *s;
dhp=cert->dh_tmp; dhp=cert->dh_tmp;
if ((dhp == NULL) && (cert->dh_tmp_cb != NULL)) if ((dhp == NULL) && (cert->dh_tmp_cb != NULL))
dhp=cert->dh_tmp_cb(s, dhp=cert->dh_tmp_cb(s,
(s->s3->tmp.new_cipher->algorithms| !(s->s3->tmp.new_cipher->algorithms
SSL_NOT_EXP)?0:1); &SSL_NOT_EXP));
if (dhp == NULL) if (dhp == NULL)
{ {
al=SSL_AD_HANDSHAKE_FAILURE; al=SSL_AD_HANDSHAKE_FAILURE;