From 07f5c09b19f56c323fa22ebd5efb5a4df9f5dc4d Mon Sep 17 00:00:00 2001 From: tedu <> Date: Fri, 18 Apr 2014 00:10:08 +0000 Subject: putting most of the braces in the right column is the very least we can do. --- src/lib/libcrypto/asn1/x_pkey.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/lib/libcrypto/asn1/x_pkey.c') diff --git a/src/lib/libcrypto/asn1/x_pkey.c b/src/lib/libcrypto/asn1/x_pkey.c index c37f207e33..37d2d93968 100644 --- a/src/lib/libcrypto/asn1/x_pkey.c +++ b/src/lib/libcrypto/asn1/x_pkey.c @@ -65,12 +65,12 @@ /* need to implement */ int i2d_X509_PKEY(X509_PKEY *a, unsigned char **pp) - { +{ return(0); - } +} X509_PKEY *d2i_X509_PKEY(X509_PKEY **a, const unsigned char **pp, long length) - { +{ int i; M_ASN1_D2I_vars(a,X509_PKEY *,X509_PKEY_new); @@ -82,30 +82,30 @@ X509_PKEY *d2i_X509_PKEY(X509_PKEY **a, const unsigned char **pp, long length) ret->cipher.cipher=EVP_get_cipherbyname( OBJ_nid2ln(OBJ_obj2nid(ret->enc_algor->algorithm))); if (ret->cipher.cipher == NULL) - { + { c.error=ASN1_R_UNSUPPORTED_CIPHER; c.line=__LINE__; goto err; - } + } if (ret->enc_algor->parameter->type == V_ASN1_OCTET_STRING) - { + { i=ret->enc_algor->parameter->value.octet_string->length; if (i > EVP_MAX_IV_LENGTH) - { + { c.error=ASN1_R_IV_TOO_LARGE; c.line=__LINE__; goto err; - } + } memcpy(ret->cipher.iv, ret->enc_algor->parameter->value.octet_string->data,i); - } + } else memset(ret->cipher.iv,0,EVP_MAX_IV_LENGTH); M_ASN1_D2I_Finish(a,X509_PKEY_free,ASN1_F_D2I_X509_PKEY); - } +} X509_PKEY *X509_PKEY_new(void) - { +{ X509_PKEY *ret=NULL; ASN1_CTX c; @@ -122,10 +122,10 @@ X509_PKEY *X509_PKEY_new(void) ret->references=1; return(ret); M_ASN1_New_Error(ASN1_F_X509_PKEY_NEW); - } +} void X509_PKEY_free(X509_PKEY *x) - { +{ int i; if (x == NULL) return; @@ -138,4 +138,4 @@ void X509_PKEY_free(X509_PKEY *x) if (x->dec_pkey != NULL)EVP_PKEY_free(x->dec_pkey); if ((x->key_data != NULL) && (x->key_free)) free(x->key_data); free(x); - } +} -- cgit v1.2.3-55-g6feb