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

Backfit a bugfix from 0.9.7-dev to 0.9.6-stable. init() and finish()

Browse Source 
handlers were previously getting called before (and after, respectively)
the "ex_data" structures - this meant init() had very little that it
could initialise, and finish() had very little it could cleanup.
This commit is contained in:
Geoff Thorpe 2001-02-24 17:32:34 +00:00
parent 75090e0365
commit 4910cbf6db
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -4,6 +4,12 @@
Changes between 0.9.6 and 0.9.6a [xx XXX 2001] Changes between 0.9.6 and 0.9.6a [xx XXX 2001]
*) Initialise "ex_data" member of RSA/DSA/DH structures prior to calling
the method-specific "init()" handler. Also clean up ex_data after
calling the method-specific "finish()" handler. Previously, this was
happening the other way round.
[Geoff Thorpe]
*) Avoid coredump with unsupported or invalid public keys by checking if *) Avoid coredump with unsupported or invalid public keys by checking if
X509_get_pubkey() fails in PKCS7_verify(). Fix memory leak when X509_get_pubkey() fails in PKCS7_verify(). Fix memory leak when
PKCS7_verify() fails with non detached data. PKCS7_verify() fails with non detached data.

8
crypto/dh/dh_lib.c
View File

@ -120,13 +120,13 @@ DH *DH_new_method(DH_METHOD *meth)
ret->method_mont_p=NULL; ret->method_mont_p=NULL;
ret->references = 1; ret->references = 1;
ret->flags=ret->meth->flags; ret->flags=ret->meth->flags;
CRYPTO_new_ex_data(dh_meth,ret,&ret->ex_data);
if ((ret->meth->init != NULL) && !ret->meth->init(ret)) if ((ret->meth->init != NULL) && !ret->meth->init(ret))
{ {
CRYPTO_free_ex_data(dh_meth,ret,&ret->ex_data);
OPENSSL_free(ret); OPENSSL_free(ret);
ret=NULL; ret=NULL;
} }
else
CRYPTO_new_ex_data(dh_meth,ret,&ret->ex_data);
return(ret); return(ret);
} }
@ -147,10 +147,10 @@ void DH_free(DH *r)
} }
#endif #endif
CRYPTO_free_ex_data(dh_meth, r, &r->ex_data);
if(r->meth->finish) r->meth->finish(r); if(r->meth->finish) r->meth->finish(r);
CRYPTO_free_ex_data(dh_meth, r, &r->ex_data);
if (r->p != NULL) BN_clear_free(r->p); if (r->p != NULL) BN_clear_free(r->p);
if (r->g != NULL) BN_clear_free(r->g); if (r->g != NULL) BN_clear_free(r->g);
if (r->q != NULL) BN_clear_free(r->q); if (r->q != NULL) BN_clear_free(r->q);

8
crypto/dsa/dsa_lib.c
View File

@ -125,13 +125,13 @@ DSA *DSA_new_method(DSA_METHOD *meth)
ret->references=1; ret->references=1;
ret->flags=ret->meth->flags; ret->flags=ret->meth->flags;
CRYPTO_new_ex_data(dsa_meth,ret,&ret->ex_data);
if ((ret->meth->init != NULL) && !ret->meth->init(ret)) if ((ret->meth->init != NULL) && !ret->meth->init(ret))
{ {
CRYPTO_free_ex_data(dsa_meth,ret,&ret->ex_data);
OPENSSL_free(ret); OPENSSL_free(ret);
ret=NULL; ret=NULL;
} }
else
CRYPTO_new_ex_data(dsa_meth,ret,&ret->ex_data);
return(ret); return(ret);
} }
@ -155,10 +155,10 @@ void DSA_free(DSA *r)
} }
#endif #endif
CRYPTO_free_ex_data(dsa_meth, r, &r->ex_data);
if(r->meth->finish) r->meth->finish(r); if(r->meth->finish) r->meth->finish(r);
CRYPTO_free_ex_data(dsa_meth, r, &r->ex_data);
if (r->p != NULL) BN_clear_free(r->p); if (r->p != NULL) BN_clear_free(r->p);
if (r->q != NULL) BN_clear_free(r->q); if (r->q != NULL) BN_clear_free(r->q);
if (r->g != NULL) BN_clear_free(r->g); if (r->g != NULL) BN_clear_free(r->g);

8
crypto/rsa/rsa_lib.c
View File

@ -145,13 +145,13 @@ RSA *RSA_new_method(RSA_METHOD *meth)
ret->blinding=NULL; ret->blinding=NULL;
ret->bignum_data=NULL; ret->bignum_data=NULL;
ret->flags=ret->meth->flags; ret->flags=ret->meth->flags;
CRYPTO_new_ex_data(rsa_meth,ret,&ret->ex_data);
if ((ret->meth->init != NULL) && !ret->meth->init(ret)) if ((ret->meth->init != NULL) && !ret->meth->init(ret))
{ {
CRYPTO_free_ex_data(rsa_meth,ret,&ret->ex_data);
OPENSSL_free(ret); OPENSSL_free(ret);
ret=NULL; ret=NULL;
} }
else
CRYPTO_new_ex_data(rsa_meth,ret,&ret->ex_data);
return(ret); return(ret);
} }
@ -174,11 +174,11 @@ void RSA_free(RSA *r)
} }
#endif #endif
CRYPTO_free_ex_data(rsa_meth,r,&r->ex_data);
if (r->meth->finish != NULL) if (r->meth->finish != NULL)
r->meth->finish(r); r->meth->finish(r);
CRYPTO_free_ex_data(rsa_meth,r,&r->ex_data);
if (r->n != NULL) BN_clear_free(r->n); if (r->n != NULL) BN_clear_free(r->n);
if (r->e != NULL) BN_clear_free(r->e); if (r->e != NULL) BN_clear_free(r->e);
if (r->d != NULL) BN_clear_free(r->d); if (r->d != NULL) BN_clear_free(r->d);