This is a first-cut at improving the callback mechanisms used in

key-generation and prime-checking functions. Rather than explicitly passing
callback functions and caller-defined context data for the callbacks, a new
structure BN_GENCB is defined that encapsulates this; a pointer to the
structure is passed to all such functions instead.

This wrapper structure allows the encapsulation of "old" and "new" style
callbacks - "new" callbacks return a boolean result on the understanding
that returning FALSE should terminate keygen/primality processing.  The
BN_GENCB abstraction will allow future callback modifications without
needing to break binary compatibility nor change the API function
prototypes. The new API functions have been given names ending in "_ex" and
the old functions are implemented as wrappers to the new ones.  The
OPENSSL_NO_DEPRECATED symbol has been introduced so that, if defined,
declaration of the older functions will be skipped. NB: Some
openssl-internal code will stick with the older callbacks for now, so
appropriate "#undef" logic will be put in place - this is in case the user
is *building* openssl (rather than *including* its headers) with this
symbol defined.

There is another change in the new _ex functions; the key-generation
functions do not return key structures but operate on structures passed by
the caller, the return value is a boolean. This will allow for a smoother
transition to having key-generation as "virtual function" in the various
***_METHOD tables.
This commit is contained in:
Geoff Thorpe
2002-12-08 05:24:31 +00:00
parent e90e719739
commit e9224c7177
25 changed files with 619 additions and 116 deletions

View File

@@ -1580,9 +1580,21 @@ static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength)
{
if (rsa_tmp == NULL)
{
rsa_tmp = RSA_new();
if(!rsa_tmp)
{
BIO_printf(bio_err, "Memory error...");
goto end;
}
BIO_printf(bio_err,"Generating temp (%d bit) RSA key...",keylength);
(void)BIO_flush(bio_err);
rsa_tmp=RSA_generate_key(keylength,RSA_F4,NULL,NULL);
if(!RSA_generate_key_ex(rsa_tmp,keylength,RSA_F4,NULL))
{
BIO_printf(bio_err, "Error generating key.", keylength);
RSA_free(rsa_tmp);
rsa_tmp = NULL;
}
end:
BIO_printf(bio_err,"\n");
(void)BIO_flush(bio_err);
}