From 47f3f755de44fe72026c26b61f3534245e51ce63 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Fri, 18 Apr 2014 07:09:23 +0000 Subject: More KNF. --- src/lib/libcrypto/asn1/a_enum.c | 141 ++++++++++++++++++++++------------------ 1 file changed, 76 insertions(+), 65 deletions(-) (limited to 'src/lib/libcrypto/asn1/a_enum.c') diff --git a/src/lib/libcrypto/asn1/a_enum.c b/src/lib/libcrypto/asn1/a_enum.c index 70cea0aad2..5e6f7589cf 100644 --- a/src/lib/libcrypto/asn1/a_enum.c +++ b/src/lib/libcrypto/asn1/a_enum.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 @@ -61,114 +61,125 @@ #include #include -/* +/* * Code for ENUMERATED type: identical to INTEGER apart from a different tag. * for comments on encoding see a_int.c */ -int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v) +int +ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v) { - int j,k; + int j, k; unsigned int i; - unsigned char buf[sizeof(long)+1]; + unsigned char buf[sizeof(long) + 1]; long d; - a->type=V_ASN1_ENUMERATED; - if (a->length < (int)(sizeof(long)+1)) { + a->type = V_ASN1_ENUMERATED; + if (a->length < (int)(sizeof(long) + 1)) { if (a->data != NULL) free(a->data); - if ((a->data=(unsigned char *)malloc(sizeof(long)+1)) != NULL) - memset((char *)a->data,0,sizeof(long)+1); + if ((a->data = (unsigned char *)malloc(sizeof(long) + 1)) != NULL) + memset((char *)a->data, 0, sizeof(long) + 1); } if (a->data == NULL) { - ASN1err(ASN1_F_ASN1_ENUMERATED_SET,ERR_R_MALLOC_FAILURE); - return(0); + ASN1err(ASN1_F_ASN1_ENUMERATED_SET, ERR_R_MALLOC_FAILURE); + return (0); } - d=v; + d = v; if (d < 0) { - d= -d; - a->type=V_ASN1_NEG_ENUMERATED; + d = -d; + a->type = V_ASN1_NEG_ENUMERATED; } - for (i=0; i>=8; + for (i = 0; i < sizeof(long); i++) { + if (d == 0) + break; + buf[i] = (int)d & 0xff; + d >>= 8; } - j=0; - for (k=i-1; k >=0; k--) - a->data[j++]=buf[k]; - a->length=j; - return(1); + j = 0; + for (k = i - 1; k >=0; k--) + a->data[j++] = buf[k]; + a->length = j; + return (1); } -long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a) +long +ASN1_ENUMERATED_get(ASN1_ENUMERATED *a) { - int neg=0,i; - long r=0; + int neg = 0, i; + long r = 0; - if (a == NULL) return(0L); - i=a->type; + if (a == NULL) + return (0L); + i = a->type; if (i == V_ASN1_NEG_ENUMERATED) - neg=1; + neg = 1; else if (i != V_ASN1_ENUMERATED) return -1; - + if (a->length > (int)sizeof(long)) { /* hmm... a bit ugly */ - return(0xffffffffL); + return (0xffffffffL); } if (a->data == NULL) return 0; - for (i=0; ilength; i++) { - r<<=8; - r|=(unsigned char)a->data[i]; + for (i = 0; i < a->length; i++) { + r <<= 8; + r |= (unsigned char)a->data[i]; } - if (neg) r= -r; - return(r); + if (neg) + r = -r; + return (r); } -ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai) +ASN1_ENUMERATED * +BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai) { ASN1_ENUMERATED *ret; - int len,j; + int len, j; if (ai == NULL) - ret=M_ASN1_ENUMERATED_new(); + ret = M_ASN1_ENUMERATED_new(); else - ret=ai; + ret = ai; if (ret == NULL) { - ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED,ERR_R_NESTED_ASN1_ERROR); + ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED, ERR_R_NESTED_ASN1_ERROR); goto err; } - if(BN_is_negative(bn)) ret->type = V_ASN1_NEG_ENUMERATED; - else ret->type=V_ASN1_ENUMERATED; - j=BN_num_bits(bn); - len=((j == 0)?0:((j/8)+1)); - if (ret->length < len+4) { - unsigned char *new_data=realloc(ret->data, len+4); - if (!new_data) - { - ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED,ERR_R_MALLOC_FAILURE); + if (BN_is_negative(bn)) + ret->type = V_ASN1_NEG_ENUMERATED; + else + ret->type = V_ASN1_ENUMERATED; + j = BN_num_bits(bn); + len = ((j == 0) ? 0 : ((j / 8) + 1)); + if (ret->length < len + 4) { + unsigned char *new_data = realloc(ret->data, len + 4); + if (!new_data) { + ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED, ERR_R_MALLOC_FAILURE); goto err; } - ret->data=new_data; + ret->data = new_data; } - ret->length=BN_bn2bin(bn,ret->data); - return(ret); + ret->length = BN_bn2bin(bn, ret->data); + return (ret); + err: - if (ret != ai) M_ASN1_ENUMERATED_free(ret); - return(NULL); + if (ret != ai) + M_ASN1_ENUMERATED_free(ret); + return (NULL); } -BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai, BIGNUM *bn) +BIGNUM * +ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai, BIGNUM *bn) { BIGNUM *ret; - if ((ret=BN_bin2bn(ai->data,ai->length,bn)) == NULL) - ASN1err(ASN1_F_ASN1_ENUMERATED_TO_BN,ASN1_R_BN_LIB); - else if(ai->type == V_ASN1_NEG_ENUMERATED) BN_set_negative(ret,1); - return(ret); + if ((ret = BN_bin2bn(ai->data, ai->length, bn)) == NULL) + ASN1err(ASN1_F_ASN1_ENUMERATED_TO_BN, ASN1_R_BN_LIB); + else if (ai->type == V_ASN1_NEG_ENUMERATED) + BN_set_negative(ret, 1); + return (ret); } -- cgit v1.2.3-55-g6feb