From a267d032e2aaa6ac481f33615c9e57c613d49e2e Mon Sep 17 00:00:00 2001 From: jsing <> Date: Sat, 19 Apr 2014 16:44:36 +0000 Subject: KNF. --- src/lib/libcrypto/objects/obj_lib.c | 116 +++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 54 deletions(-) (limited to 'src/lib/libcrypto/objects/obj_lib.c') diff --git a/src/lib/libcrypto/objects/obj_lib.c b/src/lib/libcrypto/objects/obj_lib.c index 338fe851fc..57f0b28cc0 100644 --- a/src/lib/libcrypto/objects/obj_lib.c +++ b/src/lib/libcrypto/objects/obj_lib.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,68 +62,76 @@ #include #include -ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o) - { +ASN1_OBJECT * +OBJ_dup(const ASN1_OBJECT *o) +{ ASN1_OBJECT *r; int i; - char *ln=NULL,*sn=NULL; - unsigned char *data=NULL; + char *ln = NULL, *sn = NULL; + unsigned char *data = NULL; - if (o == NULL) return(NULL); + if (o == NULL) + return (NULL); if (!(o->flags & ASN1_OBJECT_FLAG_DYNAMIC)) return((ASN1_OBJECT *)o); /* XXX: ugh! Why? What kind of duplication is this??? */ - r=ASN1_OBJECT_new(); - if (r == NULL) - { - OBJerr(OBJ_F_OBJ_DUP,ERR_R_ASN1_LIB); - return(NULL); - } - data=malloc(o->length); + r = ASN1_OBJECT_new(); + if (r == NULL) { + OBJerr(OBJ_F_OBJ_DUP, ERR_R_ASN1_LIB); + return (NULL); + } + data = malloc(o->length); if (data == NULL) goto err; if (o->data != NULL) - memcpy(data,o->data,o->length); + memcpy(data, o->data, o->length); /* once data attached to object it remains const */ r->data = data; - r->length=o->length; - r->nid=o->nid; - r->ln=r->sn=NULL; - if (o->ln != NULL) - { - i=strlen(o->ln)+1; - ln=malloc(i); - if (ln == NULL) goto err; - memcpy(ln,o->ln,i); - r->ln=ln; - } + r->length = o->length; + r->nid = o->nid; + r->ln = r->sn = NULL; + if (o->ln != NULL) { + i = strlen(o->ln) + 1; + ln = malloc(i); + if (ln == NULL) + goto err; + memcpy(ln, o->ln, i); + r->ln = ln; + } - if (o->sn != NULL) - { - i=strlen(o->sn)+1; - sn=malloc(i); - if (sn == NULL) goto err; - memcpy(sn,o->sn,i); - r->sn=sn; - } - r->flags=o->flags|(ASN1_OBJECT_FLAG_DYNAMIC| - ASN1_OBJECT_FLAG_DYNAMIC_STRINGS|ASN1_OBJECT_FLAG_DYNAMIC_DATA); - return(r); -err: - OBJerr(OBJ_F_OBJ_DUP,ERR_R_MALLOC_FAILURE); - if (ln != NULL) free(ln); - if (sn != NULL) free(sn); - if (data != NULL) free(data); - if (r != NULL) free(r); - return(NULL); + if (o->sn != NULL) { + i = strlen(o->sn) + 1; + sn = malloc(i); + if (sn == NULL) + goto err; + memcpy(sn, o->sn, i); + r->sn = sn; } + r->flags = o->flags | (ASN1_OBJECT_FLAG_DYNAMIC | + ASN1_OBJECT_FLAG_DYNAMIC_STRINGS | ASN1_OBJECT_FLAG_DYNAMIC_DATA); + return (r); -int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b) - { +err: + OBJerr(OBJ_F_OBJ_DUP, ERR_R_MALLOC_FAILURE); + if (ln != NULL) + free(ln); + if (sn != NULL) + free(sn); + if (data != NULL) + free(data); + if (r != NULL) + free(r); + return (NULL); +} + +int +OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b) +{ int ret; - ret=(a->length-b->length); - if (ret) return(ret); - return(memcmp(a->data,b->data,a->length)); - } + ret = (a->length - b->length); + if (ret) + return (ret); + return (memcmp(a->data, b->data, a->length)); +} -- cgit v1.2.3-55-g6feb