diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2006-07-09 00:53:45 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2006-07-09 00:53:45 +0000 |
commit | 5ba4bf35c5c596b86b56bde5977d252900367cad (patch) | |
tree | 947b00066cc387a43e1b547f1aa0f431b5f3eed5 /crypto | |
parent | aa93b18c2c1f9913deb52c12271e294e7aea5265 (diff) |
New functions to enumerate digests and ciphers.
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/evp/evp.h | 10 | ||||
-rw-r--r-- | crypto/evp/names.c | 69 | ||||
-rw-r--r-- | crypto/lhash/lhash.c | 3 |
3 files changed, 82 insertions, 0 deletions
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 59460fb277..509f8579af 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -782,6 +782,16 @@ const EVP_CIPHER *EVP_get_cipherbyname(const char *name); const EVP_MD *EVP_get_digestbyname(const char *name); void EVP_cleanup(void); +void EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *ciph, + const char *from, const char *to, void *x), void *arg); +void EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *ciph, + const char *from, const char *to, void *x), void *arg); + +void EVP_MD_do_all(void (*fn)(const EVP_MD *ciph, + const char *from, const char *to, void *x), void *arg); +void EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *ciph, + const char *from, const char *to, void *x), void *arg); + int EVP_PKEY_decrypt_old(unsigned char *dec_key, const unsigned char *enc_key,int enc_key_len, EVP_PKEY *private_key); diff --git a/crypto/evp/names.c b/crypto/evp/names.c index 348df71cba..7fd67fa870 100644 --- a/crypto/evp/names.c +++ b/crypto/evp/names.c @@ -76,6 +76,7 @@ int EVP_add_cipher(const EVP_CIPHER *c) return(r); } + int EVP_add_digest(const EVP_MD *md) { int r; @@ -132,3 +133,71 @@ void EVP_cleanup(void) OBJ_cleanup(); } } + +struct doall_cipher + { + void *arg; + void (*fn)(const EVP_CIPHER *ciph, + const char *from, const char *to, void *arg); + }; + +static void do_all_cipher_fn(const OBJ_NAME *nm, void *arg) + { + struct doall_cipher *dc = arg; + if (nm->alias) + dc->fn(NULL, nm->name, nm->data, dc->arg); + else + dc->fn((const EVP_CIPHER *)nm->data, NULL, NULL, dc->arg); + } + +void EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *ciph, + const char *from, const char *to, void *x), void *arg) + { + struct doall_cipher dc; + dc.fn = fn; + dc.arg = arg; + OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc); + } + +void EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *ciph, + const char *from, const char *to, void *x), void *arg) + { + struct doall_cipher dc; + dc.fn = fn; + dc.arg = arg; + OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn,&dc); + } + +struct doall_md + { + void *arg; + void (*fn)(const EVP_MD *ciph, + const char *from, const char *to, void *arg); + }; + +static void do_all_md_fn(const OBJ_NAME *nm, void *arg) + { + struct doall_md *dc = arg; + if (nm->alias) + dc->fn(NULL, nm->name, nm->data, dc->arg); + else + dc->fn((const EVP_MD *)nm->data, NULL, NULL, dc->arg); + } + +void EVP_MD_do_all(void (*fn)(const EVP_MD *md, + const char *from, const char *to, void *x), void *arg) + { + struct doall_md dc; + dc.fn = fn; + dc.arg = arg; + OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc); + } + +void EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *md, + const char *from, const char *to, void *x), void *arg) + { + struct doall_md dc; + dc.fn = fn; + dc.arg = arg; + OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc); + } diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c index 55cb05579b..373c72dcb6 100644 --- a/crypto/lhash/lhash.c +++ b/crypto/lhash/lhash.c @@ -273,6 +273,9 @@ static void doall_util_fn(LHASH *lh, int use_arg, LHASH_DOALL_FN_TYPE func, int i; LHASH_NODE *a,*n; + if (lh == NULL) + return; + /* reverse the order so we search from 'top to bottom' * We were having memory leaks otherwise */ for (i=lh->num_nodes-1; i>=0; i--) |