diff options
Diffstat (limited to 'crypto/asn1/p8_key.c')
| -rw-r--r-- | crypto/asn1/p8_key.c | 107 |
1 files changed, 53 insertions, 54 deletions
diff --git a/crypto/asn1/p8_key.c b/crypto/asn1/p8_key.c index 3a31248e14..b1768819e9 100644 --- a/crypto/asn1/p8_key.c +++ b/crypto/asn1/p8_key.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,70 +62,69 @@ #include <openssl/objects.h> int i2d_X509_KEY(X509 *a, unsigned char **pp) - { - M_ASN1_I2D_vars(a); +{ + M_ASN1_I2D_vars(a); - M_ASN1_I2D_len(a->cert_info, i2d_X509_CINF); - M_ASN1_I2D_len(a->sig_alg, i2d_X509_ALGOR); - M_ASN1_I2D_len(a->signature, i2d_ASN1_BIT_STRING); + M_ASN1_I2D_len(a->cert_info, i2d_X509_CINF); + M_ASN1_I2D_len(a->sig_alg, i2d_X509_ALGOR); + M_ASN1_I2D_len(a->signature, i2d_ASN1_BIT_STRING); - M_ASN1_I2D_seq_total(); + M_ASN1_I2D_seq_total(); - M_ASN1_I2D_put(a->cert_info, i2d_X509_CINF); - M_ASN1_I2D_put(a->sig_alg, i2d_X509_ALGOR); - M_ASN1_I2D_put(a->signature, i2d_ASN1_BIT_STRING); + M_ASN1_I2D_put(a->cert_info, i2d_X509_CINF); + M_ASN1_I2D_put(a->sig_alg, i2d_X509_ALGOR); + M_ASN1_I2D_put(a->signature, i2d_ASN1_BIT_STRING); - M_ASN1_I2D_finish(); - } + M_ASN1_I2D_finish(); +} X509 *d2i_X509_KEY(X509 **a, unsigned char **pp, long length) - { - M_ASN1_D2I_vars(a,X509 *,X509_new); +{ + M_ASN1_D2I_vars(a, X509 *, X509_new); - M_ASN1_D2I_Init(); - M_ASN1_D2I_start_sequence(); - M_ASN1_D2I_get(ret->cert_info,d2i_X509_CINF); - M_ASN1_D2I_get(ret->sig_alg,d2i_X509_ALGOR); - M_ASN1_D2I_get(ret->signature,d2i_ASN1_BIT_STRING); - M_ASN1_D2I_Finish(a,X509_free,ASN1_F_D2I_X509); - } + M_ASN1_D2I_Init(); + M_ASN1_D2I_start_sequence(); + M_ASN1_D2I_get(ret->cert_info, d2i_X509_CINF); + M_ASN1_D2I_get(ret->sig_alg, d2i_X509_ALGOR); + M_ASN1_D2I_get(ret->signature, d2i_ASN1_BIT_STRING); + M_ASN1_D2I_Finish(a, X509_free, ASN1_F_D2I_X509); +} X509 *X509_KEY_new(void) - { - X509_KEY *ret=NULL; +{ + X509_KEY *ret = NULL; - M_ASN1_New_OPENSSL_malloc(ret,X509_KEY); - ret->references=1; - ret->type=NID - M_ASN1_New(ret->cert_info,X509_CINF_new); - M_ASN1_New(ret->sig_alg,X509_ALGOR_new); - M_ASN1_New(ret->signature,ASN1_BIT_STRING_new); - return(ret); - M_ASN1_New_Error(ASN1_F_X509_NEW); - } + M_ASN1_New_OPENSSL_malloc(ret, X509_KEY); + ret->references = 1; + ret->type = NID M_ASN1_New(ret->cert_info, X509_CINF_new); + M_ASN1_New(ret->sig_alg, X509_ALGOR_new); + M_ASN1_New(ret->signature, ASN1_BIT_STRING_new); + return (ret); + M_ASN1_New_Error(ASN1_F_X509_NEW); +} void X509_KEY_free(X509 *a) - { - int i; +{ + int i; - if (a == NULL) return; + if (a == NULL) + return; - i=CRYPTO_add_lock(&a->references,-1,CRYPTO_LOCK_X509_KEY); + i = CRYPTO_add_lock(&a->references, -1, CRYPTO_LOCK_X509_KEY); #ifdef REF_PRINT - REF_PRINT("X509_KEY",a); + REF_PRINT("X509_KEY", a); #endif - if (i > 0) return; + if (i > 0) + return; #ifdef REF_CHECK - if (i < 0) - { - fprintf(stderr,"X509_KEY_free, bad reference count\n"); - abort(); - } + if (i < 0) { + fprintf(stderr, "X509_KEY_free, bad reference count\n"); + abort(); + } #endif - X509_CINF_free(a->cert_info); - X509_ALGOR_free(a->sig_alg); - ASN1_BIT_STRING_free(a->signature); - OPENSSL_free(a); - } - + X509_CINF_free(a->cert_info); + X509_ALGOR_free(a->sig_alg); + ASN1_BIT_STRING_free(a->signature); + OPENSSL_free(a); +} |