From d7f470a7ef3c6db76e177079e2cbfe887f2861b6 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Sat, 3 May 2014 15:50:24 +0000 Subject: KNF. --- src/lib/libcrypto/evp/names.c | 186 +++++++++++++++++++++++------------------- 1 file changed, 104 insertions(+), 82 deletions(-) (limited to 'src/lib/libcrypto/evp/names.c') diff --git a/src/lib/libcrypto/evp/names.c b/src/lib/libcrypto/evp/names.c index 6311ad7cfb..b4793b954b 100644 --- a/src/lib/libcrypto/evp/names.c +++ b/src/lib/libcrypto/evp/names.c @@ -5,21 +5,21 @@ * This package is an SSL implementation written * by Eric Young (eay@cryptsoft.com). * The implementation was written so as to conform with Netscapes SSL. - * + * * This library is free for commercial and non-commercial use as long as * the following conditions are aheared to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, * lhash, DES, etc., code; not just the SSL code. The SSL documentation * included with this distribution is covered by the same copyright terms * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * + * * Copyright remains Eric Young's, and as such any Copyright notices in * the code are not to be removed. * If this package is used in a product, Eric Young should be given attribution * as the author of the parts of the library used. * This can be in the form of a textual message at program startup or * in documentation (online or textual) provided with the package. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -34,10 +34,10 @@ * Eric Young (eay@cryptsoft.com)" * The word 'cryptographic' can be left out if the rouines from the library * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from + * 4. If you include any Windows specific code (or a derivative thereof) from * the apps directory (application code) you must include an acknowledgement: * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * + * * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -49,7 +49,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * The licence and distribution terms for any publically available version or * derivative of this code cannot be changed. i.e. this code cannot simply be * copied and put under another distribution licence @@ -62,65 +62,77 @@ #include #include -int EVP_add_cipher(const EVP_CIPHER *c) - { +int +EVP_add_cipher(const EVP_CIPHER *c) +{ int r; - if (c == NULL) return 0; + if (c == NULL) + return 0; OPENSSL_init(); - r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c); - if (r == 0) return(0); + r = OBJ_NAME_add(OBJ_nid2sn(c->nid), OBJ_NAME_TYPE_CIPHER_METH, + (const char *)c); + if (r == 0) + return (0); check_defer(c->nid); - r=OBJ_NAME_add(OBJ_nid2ln(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c); - return(r); - } - - -int EVP_add_digest(const EVP_MD *md) - { + r = OBJ_NAME_add(OBJ_nid2ln(c->nid), OBJ_NAME_TYPE_CIPHER_METH, + (const char *)c); + return (r); +} + +int +EVP_add_digest(const EVP_MD *md) +{ int r; const char *name; + OPENSSL_init(); - name=OBJ_nid2sn(md->type); - r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(const char *)md); - if (r == 0) return(0); + name = OBJ_nid2sn(md->type); + r = OBJ_NAME_add(name, OBJ_NAME_TYPE_MD_METH, (const char *)md); + if (r == 0) + return (0); check_defer(md->type); - r=OBJ_NAME_add(OBJ_nid2ln(md->type),OBJ_NAME_TYPE_MD_METH,(const char *)md); - if (r == 0) return(0); - - if (md->pkey_type && md->type != md->pkey_type) - { - r=OBJ_NAME_add(OBJ_nid2sn(md->pkey_type), - OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,name); - if (r == 0) return(0); + r = OBJ_NAME_add(OBJ_nid2ln(md->type), OBJ_NAME_TYPE_MD_METH, + (const char *)md); + if (r == 0) + return (0); + + if (md->pkey_type && md->type != md->pkey_type) { + r = OBJ_NAME_add(OBJ_nid2sn(md->pkey_type), + OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS, name); + if (r == 0) + return (0); check_defer(md->pkey_type); - r=OBJ_NAME_add(OBJ_nid2ln(md->pkey_type), - OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,name); - } - return(r); + r = OBJ_NAME_add(OBJ_nid2ln(md->pkey_type), + OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS, name); } + return (r); +} -const EVP_CIPHER *EVP_get_cipherbyname(const char *name) - { +const EVP_CIPHER * +EVP_get_cipherbyname(const char *name) +{ const EVP_CIPHER *cp; - cp=(const EVP_CIPHER *)OBJ_NAME_get(name,OBJ_NAME_TYPE_CIPHER_METH); - return(cp); - } + cp = (const EVP_CIPHER *)OBJ_NAME_get(name, OBJ_NAME_TYPE_CIPHER_METH); + return (cp); +} -const EVP_MD *EVP_get_digestbyname(const char *name) - { +const EVP_MD * +EVP_get_digestbyname(const char *name) +{ const EVP_MD *cp; - cp=(const EVP_MD *)OBJ_NAME_get(name,OBJ_NAME_TYPE_MD_METH); - return(cp); - } + cp = (const EVP_MD *)OBJ_NAME_get(name, OBJ_NAME_TYPE_MD_METH); + return (cp); +} -void EVP_cleanup(void) - { +void +EVP_cleanup(void) +{ OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH); OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH); /* The above calls will only clean out the contents of the name @@ -129,78 +141,88 @@ void EVP_cleanup(void) OBJ_NAME_cleanup(-1); EVP_PBE_cleanup(); - if (obj_cleanup_defer == 2) - { + if (obj_cleanup_defer == 2) { obj_cleanup_defer = 0; OBJ_cleanup(); - } - OBJ_sigid_free(); } + OBJ_sigid_free(); +} -struct doall_cipher - { +struct doall_cipher { void *arg; - void (*fn)(const EVP_CIPHER *ciph, - const char *from, const char *to, 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) - { +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, nm->name, NULL, dc->arg); - } +} -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(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) - { +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); - } + OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, + do_all_cipher_fn, &dc); +} -struct doall_md - { +struct doall_md { void *arg; - void (*fn)(const EVP_MD *ciph, - const char *from, const char *to, 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) - { +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, nm->name, NULL, dc->arg); - } +} -void EVP_MD_do_all(void (*fn)(const EVP_MD *md, - const char *from, const char *to, void *x), void *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) - { +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); - } +} -- cgit v1.2.3-55-g6feb