From 4052f47ddef814e4761c3d3d1cc5a599bd1f2e44 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Sun, 20 Apr 2014 15:06:11 +0000 Subject: KNF. --- src/lib/libcrypto/x509/x509_cmp.c | 231 +++++++++++++++++++++----------------- 1 file changed, 128 insertions(+), 103 deletions(-) (limited to 'src/lib/libcrypto/x509/x509_cmp.c') diff --git a/src/lib/libcrypto/x509/x509_cmp.c b/src/lib/libcrypto/x509/x509_cmp.c index 87c4596414..b6b3423e3f 100644 --- a/src/lib/libcrypto/x509/x509_cmp.c +++ b/src/lib/libcrypto/x509/x509_cmp.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 @@ -64,105 +64,121 @@ #include #include -int X509_issuer_and_serial_cmp(const X509 *a, const X509 *b) +int +X509_issuer_and_serial_cmp(const X509 *a, const X509 *b) { int i; - X509_CINF *ai,*bi; - - ai=a->cert_info; - bi=b->cert_info; - i=M_ASN1_INTEGER_cmp(ai->serialNumber,bi->serialNumber); - if (i) return(i); - return(X509_NAME_cmp(ai->issuer,bi->issuer)); + X509_CINF *ai, *bi; + + ai = a->cert_info; + bi = b->cert_info; + i = M_ASN1_INTEGER_cmp(ai->serialNumber, bi->serialNumber); + if (i) + return (i); + return (X509_NAME_cmp(ai->issuer, bi->issuer)); } #ifndef OPENSSL_NO_MD5 -unsigned long X509_issuer_and_serial_hash(X509 *a) +unsigned long +X509_issuer_and_serial_hash(X509 *a) { - unsigned long ret=0; + unsigned long ret = 0; EVP_MD_CTX ctx; unsigned char md[16]; char *f; EVP_MD_CTX_init(&ctx); - f=X509_NAME_oneline(a->cert_info->issuer,NULL,0); + f = X509_NAME_oneline(a->cert_info->issuer, NULL, 0); if (!EVP_DigestInit_ex(&ctx, EVP_md5(), NULL)) goto err; - if (!EVP_DigestUpdate(&ctx,(unsigned char *)f,strlen(f))) + if (!EVP_DigestUpdate(&ctx, (unsigned char *)f, strlen(f))) goto err; free(f); - if(!EVP_DigestUpdate(&ctx,(unsigned char *)a->cert_info->serialNumber->data, - (unsigned long)a->cert_info->serialNumber->length)) + if (!EVP_DigestUpdate(&ctx, + (unsigned char *)a->cert_info->serialNumber->data, + (unsigned long)a->cert_info->serialNumber->length)) goto err; - if (!EVP_DigestFinal_ex(&ctx,&(md[0]),NULL)) + if (!EVP_DigestFinal_ex(&ctx, &(md[0]), NULL)) goto err; - ret=( ((unsigned long)md[0] )|((unsigned long)md[1]<<8L)| - ((unsigned long)md[2]<<16L)|((unsigned long)md[3]<<24L) - )&0xffffffffL; - err: + ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) | + ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)) & + 0xffffffffL; + +err: EVP_MD_CTX_cleanup(&ctx); - return(ret); + return (ret); } #endif - -int X509_issuer_name_cmp(const X509 *a, const X509 *b) + +int +X509_issuer_name_cmp(const X509 *a, const X509 *b) { - return(X509_NAME_cmp(a->cert_info->issuer,b->cert_info->issuer)); + return (X509_NAME_cmp(a->cert_info->issuer, b->cert_info->issuer)); } -int X509_subject_name_cmp(const X509 *a, const X509 *b) +int +X509_subject_name_cmp(const X509 *a, const X509 *b) { - return(X509_NAME_cmp(a->cert_info->subject,b->cert_info->subject)); + return (X509_NAME_cmp(a->cert_info->subject, b->cert_info->subject)); } -int X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b) +int +X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b) { - return(X509_NAME_cmp(a->crl->issuer,b->crl->issuer)); + return (X509_NAME_cmp(a->crl->issuer, b->crl->issuer)); } #ifndef OPENSSL_NO_SHA -int X509_CRL_match(const X509_CRL *a, const X509_CRL *b) +int +X509_CRL_match(const X509_CRL *a, const X509_CRL *b) { return memcmp(a->sha1_hash, b->sha1_hash, 20); } #endif -X509_NAME *X509_get_issuer_name(X509 *a) +X509_NAME * +X509_get_issuer_name(X509 *a) { - return(a->cert_info->issuer); + return (a->cert_info->issuer); } -unsigned long X509_issuer_name_hash(X509 *x) +unsigned long +X509_issuer_name_hash(X509 *x) { - return(X509_NAME_hash(x->cert_info->issuer)); + return (X509_NAME_hash(x->cert_info->issuer)); } #ifndef OPENSSL_NO_MD5 -unsigned long X509_issuer_name_hash_old(X509 *x) +unsigned long +X509_issuer_name_hash_old(X509 *x) { - return(X509_NAME_hash_old(x->cert_info->issuer)); + return (X509_NAME_hash_old(x->cert_info->issuer)); } #endif -X509_NAME *X509_get_subject_name(X509 *a) +X509_NAME * +X509_get_subject_name(X509 *a) { - return(a->cert_info->subject); + return (a->cert_info->subject); } -ASN1_INTEGER *X509_get_serialNumber(X509 *a) +ASN1_INTEGER * +X509_get_serialNumber(X509 *a) { - return(a->cert_info->serialNumber); + return (a->cert_info->serialNumber); } -unsigned long X509_subject_name_hash(X509 *x) +unsigned long +X509_subject_name_hash(X509 *x) { - return(X509_NAME_hash(x->cert_info->subject)); + return (X509_NAME_hash(x->cert_info->subject)); } #ifndef OPENSSL_NO_MD5 -unsigned long X509_subject_name_hash_old(X509 *x) +unsigned long +X509_subject_name_hash_old(X509 *x) { - return(X509_NAME_hash_old(x->cert_info->subject)); + return (X509_NAME_hash_old(x->cert_info->subject)); } #endif @@ -176,7 +192,8 @@ unsigned long X509_subject_name_hash_old(X509 *x) * where the "depth-first" constification tree has to halt * with an evil cast. */ -int X509_cmp(const X509 *a, const X509 *b) +int +X509_cmp(const X509 *a, const X509 *b) { /* ensure hash is valid */ X509_check_purpose((X509 *)a, -1, 0); @@ -186,49 +203,44 @@ int X509_cmp(const X509 *a, const X509 *b) } #endif - -int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b) +int +X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b) { int ret; /* Ensure canonical encoding is present and up to date */ - if (!a->canon_enc || a->modified) { ret = i2d_X509_NAME((X509_NAME *)a, NULL); if (ret < 0) return -2; } - if (!b->canon_enc || b->modified) { ret = i2d_X509_NAME((X509_NAME *)b, NULL); if (ret < 0) return -2; } - ret = a->canon_enclen - b->canon_enclen; - if (ret) return ret; - return memcmp(a->canon_enc, b->canon_enc, a->canon_enclen); - } -unsigned long X509_NAME_hash(X509_NAME *x) +unsigned long +X509_NAME_hash(X509_NAME *x) { - unsigned long ret=0; + unsigned long ret = 0; unsigned char md[SHA_DIGEST_LENGTH]; /* Make sure X509_NAME structure contains valid cached encoding */ - i2d_X509_NAME(x,NULL); + i2d_X509_NAME(x, NULL); if (!EVP_Digest(x->canon_enc, x->canon_enclen, md, NULL, EVP_sha1(), - NULL)) + NULL)) return 0; - ret=( ((unsigned long)md[0] )|((unsigned long)md[1]<<8L)| - ((unsigned long)md[2]<<16L)|((unsigned long)md[3]<<24L) - )&0xffffffffL; - return(ret); + ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) | + ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)) & + 0xffffffffL; + return (ret); } @@ -236,82 +248,92 @@ unsigned long X509_NAME_hash(X509_NAME *x) /* I now DER encode the name and hash it. Since I cache the DER encoding, * this is reasonably efficient. */ -unsigned long X509_NAME_hash_old(X509_NAME *x) +unsigned long +X509_NAME_hash_old(X509_NAME *x) { EVP_MD_CTX md_ctx; - unsigned long ret=0; + unsigned long ret = 0; unsigned char md[16]; /* Make sure X509_NAME structure contains valid cached encoding */ - i2d_X509_NAME(x,NULL); + i2d_X509_NAME(x, NULL); EVP_MD_CTX_init(&md_ctx); EVP_MD_CTX_set_flags(&md_ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW); - if (EVP_DigestInit_ex(&md_ctx, EVP_md5(), NULL) - && EVP_DigestUpdate(&md_ctx, x->bytes->data, x->bytes->length) - && EVP_DigestFinal_ex(&md_ctx,md,NULL)) - ret=(((unsigned long)md[0] )|((unsigned long)md[1]<<8L)| - ((unsigned long)md[2]<<16L)|((unsigned long)md[3]<<24L) - )&0xffffffffL; + if (EVP_DigestInit_ex(&md_ctx, EVP_md5(), NULL) && + EVP_DigestUpdate(&md_ctx, x->bytes->data, x->bytes->length) && + EVP_DigestFinal_ex(&md_ctx, md, NULL)) + ret = (((unsigned long)md[0]) | + ((unsigned long)md[1] << 8L) | + ((unsigned long)md[2] << 16L) | + ((unsigned long)md[3] << 24L)) & + 0xffffffffL; EVP_MD_CTX_cleanup(&md_ctx); - return(ret); + return (ret); } #endif /* Search a stack of X509 for a match */ -X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, X509_NAME *name, - ASN1_INTEGER *serial) +X509 * +X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, X509_NAME *name, + ASN1_INTEGER *serial) { int i; X509_CINF cinf; - X509 x,*x509=NULL; + X509 x, *x509 = NULL; - if(!sk) return NULL; + if (!sk) + return NULL; - x.cert_info= &cinf; - cinf.serialNumber=serial; - cinf.issuer=name; + x.cert_info = &cinf; + cinf.serialNumber = serial; + cinf.issuer = name; - for (i=0; icert_info == NULL)) - return(NULL); - return(X509_PUBKEY_get(x->cert_info->key)); + return (NULL); + return (X509_PUBKEY_get(x->cert_info->key)); } -ASN1_BIT_STRING *X509_get0_pubkey_bitstr(const X509 *x) +ASN1_BIT_STRING * +X509_get0_pubkey_bitstr(const X509 *x) { - if(!x) return NULL; + if (!x) + return NULL; return x->cert_info->key->public_key; } -int X509_check_private_key(X509 *x, EVP_PKEY *k) +int +X509_check_private_key(X509 *x, EVP_PKEY *k) { EVP_PKEY *xk; int ret; - xk=X509_get_pubkey(x); + xk = X509_get_pubkey(x); if (xk) ret = EVP_PKEY_cmp(xk, k); @@ -322,13 +344,16 @@ int X509_check_private_key(X509 *x, EVP_PKEY *k) case 1: break; case 0: - X509err(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_KEY_VALUES_MISMATCH); + X509err(X509_F_X509_CHECK_PRIVATE_KEY, + X509_R_KEY_VALUES_MISMATCH); break; case -1: - X509err(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_KEY_TYPE_MISMATCH); + X509err(X509_F_X509_CHECK_PRIVATE_KEY, + X509_R_KEY_TYPE_MISMATCH); break; case -2: - X509err(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_UNKNOWN_KEY_TYPE); + X509err(X509_F_X509_CHECK_PRIVATE_KEY, + X509_R_UNKNOWN_KEY_TYPE); } if (xk) EVP_PKEY_free(xk); -- cgit v1.2.3-55-g6feb