diff options
author | tedu <> | 2014-04-18 00:10:08 +0000 |
---|---|---|
committer | tedu <> | 2014-04-18 00:10:08 +0000 |
commit | 07f5c09b19f56c323fa22ebd5efb5a4df9f5dc4d (patch) | |
tree | 6327d50d69a1982f840dc68fe928ea459e2c41e0 /src/lib/libcrypto/asn1/a_dup.c | |
parent | 288a9e368d9d4a72792b12a00ad69e3592d94073 (diff) | |
download | openbsd-07f5c09b19f56c323fa22ebd5efb5a4df9f5dc4d.tar.gz openbsd-07f5c09b19f56c323fa22ebd5efb5a4df9f5dc4d.tar.bz2 openbsd-07f5c09b19f56c323fa22ebd5efb5a4df9f5dc4d.zip |
putting most of the braces in the right column is the very least we can do.
Diffstat (limited to 'src/lib/libcrypto/asn1/a_dup.c')
-rw-r--r-- | src/lib/libcrypto/asn1/a_dup.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/lib/libcrypto/asn1/a_dup.c b/src/lib/libcrypto/asn1/a_dup.c index e825b9c2d4..4482a89337 100644 --- a/src/lib/libcrypto/asn1/a_dup.c +++ b/src/lib/libcrypto/asn1/a_dup.c | |||
@@ -63,7 +63,7 @@ | |||
63 | #ifndef NO_OLD_ASN1 | 63 | #ifndef NO_OLD_ASN1 |
64 | 64 | ||
65 | void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x) | 65 | void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x) |
66 | { | 66 | { |
67 | unsigned char *b,*p; | 67 | unsigned char *b,*p; |
68 | const unsigned char *p2; | 68 | const unsigned char *p2; |
69 | int i; | 69 | int i; |
@@ -74,14 +74,16 @@ void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x) | |||
74 | i=i2d(x,NULL); | 74 | i=i2d(x,NULL); |
75 | b=malloc(i+10); | 75 | b=malloc(i+10); |
76 | if (b == NULL) | 76 | if (b == NULL) |
77 | { ASN1err(ASN1_F_ASN1_DUP,ERR_R_MALLOC_FAILURE); return(NULL); } | 77 | { |
78 | ASN1err(ASN1_F_ASN1_DUP,ERR_R_MALLOC_FAILURE); return(NULL); | ||
79 | } | ||
78 | p= b; | 80 | p= b; |
79 | i=i2d(x,&p); | 81 | i=i2d(x,&p); |
80 | p2= b; | 82 | p2= b; |
81 | ret=d2i(NULL,&p2,i); | 83 | ret=d2i(NULL,&p2,i); |
82 | free(b); | 84 | free(b); |
83 | return(ret); | 85 | return(ret); |
84 | } | 86 | } |
85 | 87 | ||
86 | #endif | 88 | #endif |
87 | 89 | ||
@@ -91,7 +93,7 @@ void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x) | |||
91 | */ | 93 | */ |
92 | 94 | ||
93 | void *ASN1_item_dup(const ASN1_ITEM *it, void *x) | 95 | void *ASN1_item_dup(const ASN1_ITEM *it, void *x) |
94 | { | 96 | { |
95 | unsigned char *b = NULL; | 97 | unsigned char *b = NULL; |
96 | const unsigned char *p; | 98 | const unsigned char *p; |
97 | long i; | 99 | long i; |
@@ -101,9 +103,11 @@ void *ASN1_item_dup(const ASN1_ITEM *it, void *x) | |||
101 | 103 | ||
102 | i=ASN1_item_i2d(x,&b,it); | 104 | i=ASN1_item_i2d(x,&b,it); |
103 | if (b == NULL) | 105 | if (b == NULL) |
104 | { ASN1err(ASN1_F_ASN1_ITEM_DUP,ERR_R_MALLOC_FAILURE); return(NULL); } | 106 | { |
107 | ASN1err(ASN1_F_ASN1_ITEM_DUP,ERR_R_MALLOC_FAILURE); return(NULL); | ||
108 | } | ||
105 | p= b; | 109 | p= b; |
106 | ret=ASN1_item_d2i(NULL,&p,i, it); | 110 | ret=ASN1_item_d2i(NULL,&p,i, it); |
107 | free(b); | 111 | free(b); |
108 | return(ret); | 112 | return(ret); |
109 | } | 113 | } |