diff options
Diffstat (limited to 'lib/libssl/src/crypto/asn1/x_x509.c')
| -rw-r--r-- | lib/libssl/src/crypto/asn1/x_x509.c | 71 |
1 files changed, 41 insertions, 30 deletions
diff --git a/lib/libssl/src/crypto/asn1/x_x509.c b/lib/libssl/src/crypto/asn1/x_x509.c index 20448a8e3b1..e7d613e20f5 100644 --- a/lib/libssl/src/crypto/asn1/x_x509.c +++ b/lib/libssl/src/crypto/asn1/x_x509.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 @@ -81,15 +81,15 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_CINF) extern void policy_cache_free(X509_POLICY_CACHE *cache); -static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, - void *exarg) +static int +x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg) { X509 *ret = (X509 *)*pval; - switch(operation) { + switch (operation) { case ASN1_OP_NEW_POST: - ret->valid=0; + ret->valid = 0; ret->name = NULL; ret->ex_flags = 0; ret->ex_pathlen = -1; @@ -105,8 +105,9 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, break; case ASN1_OP_D2I_POST: - if (ret->name != NULL) free(ret->name); - ret->name=X509_NAME_oneline(ret->cert_info->subject,NULL,0); + if (ret->name != NULL) + free(ret->name); + ret->name = X509_NAME_oneline(ret->cert_info->subject, NULL, 0); break; case ASN1_OP_FREE_POST: @@ -122,14 +123,12 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, sk_IPAddressFamily_pop_free(ret->rfc3779_addr, IPAddressFamily_free); ASIdentifiers_free(ret->rfc3779_asid); #endif - - if (ret->name != NULL) free(ret->name); + if (ret->name != NULL) + free(ret->name); break; - } return 1; - } ASN1_SEQUENCE_ref(X509, x509_cb, CRYPTO_LOCK_X509) = { @@ -141,21 +140,24 @@ ASN1_SEQUENCE_ref(X509, x509_cb, CRYPTO_LOCK_X509) = { IMPLEMENT_ASN1_FUNCTIONS(X509) IMPLEMENT_ASN1_DUP_FUNCTION(X509) -int X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, - CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func) +int +X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, + CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func) { return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509, argl, argp, - new_func, dup_func, free_func); + new_func, dup_func, free_func); } -int X509_set_ex_data(X509 *r, int idx, void *arg) +int +X509_set_ex_data(X509 *r, int idx, void *arg) { - return(CRYPTO_set_ex_data(&r->ex_data,idx,arg)); + return (CRYPTO_set_ex_data(&r->ex_data, idx, arg)); } -void *X509_get_ex_data(X509 *r, int idx) +void * +X509_get_ex_data(X509 *r, int idx) { - return(CRYPTO_get_ex_data(&r->ex_data,idx)); + return (CRYPTO_get_ex_data(&r->ex_data, idx)); } /* X509_AUX ASN1 routines. X509_AUX is the name given to @@ -166,29 +168,38 @@ void *X509_get_ex_data(X509 *r, int idx) * */ -X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length) +X509 * +d2i_X509_AUX(X509 **a, const unsigned char **pp, long length) { const unsigned char *q; X509 *ret; + /* Save start position */ q = *pp; ret = d2i_X509(a, pp, length); /* If certificate unreadable then forget it */ - if(!ret) return NULL; + if (!ret) + return NULL; /* update length */ length -= *pp - q; - if(!length) return ret; - if(!d2i_X509_CERT_AUX(&ret->aux, pp, length)) goto err; + if (!length) + return ret; + if (!d2i_X509_CERT_AUX(&ret->aux, pp, length)) + goto err; return ret; - err: + +err: X509_free(ret); return NULL; } -int i2d_X509_AUX(X509 *a, unsigned char **pp) +int +i2d_X509_AUX(X509 *a, unsigned char **pp) { int length; + length = i2d_X509(a, pp); - if(a) length += i2d_X509_CERT_AUX(a->aux, pp); + if (a) + length += i2d_X509_CERT_AUX(a->aux, pp); return length; } |