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_enum.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_enum.c')
-rw-r--r-- | src/lib/libcrypto/asn1/a_enum.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/lib/libcrypto/asn1/a_enum.c b/src/lib/libcrypto/asn1/a_enum.c index c1154dde0a..77c7c2cd88 100644 --- a/src/lib/libcrypto/asn1/a_enum.c +++ b/src/lib/libcrypto/asn1/a_enum.c | |||
@@ -67,7 +67,7 @@ | |||
67 | */ | 67 | */ |
68 | 68 | ||
69 | int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v) | 69 | int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v) |
70 | { | 70 | { |
71 | int j,k; | 71 | int j,k; |
72 | unsigned int i; | 72 | unsigned int i; |
73 | unsigned char buf[sizeof(long)+1]; | 73 | unsigned char buf[sizeof(long)+1]; |
@@ -75,39 +75,39 @@ int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v) | |||
75 | 75 | ||
76 | a->type=V_ASN1_ENUMERATED; | 76 | a->type=V_ASN1_ENUMERATED; |
77 | if (a->length < (int)(sizeof(long)+1)) | 77 | if (a->length < (int)(sizeof(long)+1)) |
78 | { | 78 | { |
79 | if (a->data != NULL) | 79 | if (a->data != NULL) |
80 | free(a->data); | 80 | free(a->data); |
81 | if ((a->data=(unsigned char *)malloc(sizeof(long)+1)) != NULL) | 81 | if ((a->data=(unsigned char *)malloc(sizeof(long)+1)) != NULL) |
82 | memset((char *)a->data,0,sizeof(long)+1); | 82 | memset((char *)a->data,0,sizeof(long)+1); |
83 | } | 83 | } |
84 | if (a->data == NULL) | 84 | if (a->data == NULL) |
85 | { | 85 | { |
86 | ASN1err(ASN1_F_ASN1_ENUMERATED_SET,ERR_R_MALLOC_FAILURE); | 86 | ASN1err(ASN1_F_ASN1_ENUMERATED_SET,ERR_R_MALLOC_FAILURE); |
87 | return(0); | 87 | return(0); |
88 | } | 88 | } |
89 | d=v; | 89 | d=v; |
90 | if (d < 0) | 90 | if (d < 0) |
91 | { | 91 | { |
92 | d= -d; | 92 | d= -d; |
93 | a->type=V_ASN1_NEG_ENUMERATED; | 93 | a->type=V_ASN1_NEG_ENUMERATED; |
94 | } | 94 | } |
95 | 95 | ||
96 | for (i=0; i<sizeof(long); i++) | 96 | for (i=0; i<sizeof(long); i++) |
97 | { | 97 | { |
98 | if (d == 0) break; | 98 | if (d == 0) break; |
99 | buf[i]=(int)d&0xff; | 99 | buf[i]=(int)d&0xff; |
100 | d>>=8; | 100 | d>>=8; |
101 | } | 101 | } |
102 | j=0; | 102 | j=0; |
103 | for (k=i-1; k >=0; k--) | 103 | for (k=i-1; k >=0; k--) |
104 | a->data[j++]=buf[k]; | 104 | a->data[j++]=buf[k]; |
105 | a->length=j; | 105 | a->length=j; |
106 | return(1); | 106 | return(1); |
107 | } | 107 | } |
108 | 108 | ||
109 | long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a) | 109 | long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a) |
110 | { | 110 | { |
111 | int neg=0,i; | 111 | int neg=0,i; |
112 | long r=0; | 112 | long r=0; |
113 | 113 | ||
@@ -119,24 +119,24 @@ long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a) | |||
119 | return -1; | 119 | return -1; |
120 | 120 | ||
121 | if (a->length > (int)sizeof(long)) | 121 | if (a->length > (int)sizeof(long)) |
122 | { | 122 | { |
123 | /* hmm... a bit ugly */ | 123 | /* hmm... a bit ugly */ |
124 | return(0xffffffffL); | 124 | return(0xffffffffL); |
125 | } | 125 | } |
126 | if (a->data == NULL) | 126 | if (a->data == NULL) |
127 | return 0; | 127 | return 0; |
128 | 128 | ||
129 | for (i=0; i<a->length; i++) | 129 | for (i=0; i<a->length; i++) |
130 | { | 130 | { |
131 | r<<=8; | 131 | r<<=8; |
132 | r|=(unsigned char)a->data[i]; | 132 | r|=(unsigned char)a->data[i]; |
133 | } | 133 | } |
134 | if (neg) r= -r; | 134 | if (neg) r= -r; |
135 | return(r); | 135 | return(r); |
136 | } | 136 | } |
137 | 137 | ||
138 | ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai) | 138 | ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai) |
139 | { | 139 | { |
140 | ASN1_ENUMERATED *ret; | 140 | ASN1_ENUMERATED *ret; |
141 | int len,j; | 141 | int len,j; |
142 | 142 | ||
@@ -145,38 +145,38 @@ ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai) | |||
145 | else | 145 | else |
146 | ret=ai; | 146 | ret=ai; |
147 | if (ret == NULL) | 147 | if (ret == NULL) |
148 | { | 148 | { |
149 | ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED,ERR_R_NESTED_ASN1_ERROR); | 149 | ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED,ERR_R_NESTED_ASN1_ERROR); |
150 | goto err; | 150 | goto err; |
151 | } | 151 | } |
152 | if(BN_is_negative(bn)) ret->type = V_ASN1_NEG_ENUMERATED; | 152 | if(BN_is_negative(bn)) ret->type = V_ASN1_NEG_ENUMERATED; |
153 | else ret->type=V_ASN1_ENUMERATED; | 153 | else ret->type=V_ASN1_ENUMERATED; |
154 | j=BN_num_bits(bn); | 154 | j=BN_num_bits(bn); |
155 | len=((j == 0)?0:((j/8)+1)); | 155 | len=((j == 0)?0:((j/8)+1)); |
156 | if (ret->length < len+4) | 156 | if (ret->length < len+4) |
157 | { | 157 | { |
158 | unsigned char *new_data=realloc(ret->data, len+4); | 158 | unsigned char *new_data=realloc(ret->data, len+4); |
159 | if (!new_data) | 159 | if (!new_data) |
160 | { | 160 | { |
161 | ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED,ERR_R_MALLOC_FAILURE); | 161 | ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED,ERR_R_MALLOC_FAILURE); |
162 | goto err; | 162 | goto err; |
163 | } | ||
164 | ret->data=new_data; | ||
165 | } | 163 | } |
164 | ret->data=new_data; | ||
165 | } | ||
166 | 166 | ||
167 | ret->length=BN_bn2bin(bn,ret->data); | 167 | ret->length=BN_bn2bin(bn,ret->data); |
168 | return(ret); | 168 | return(ret); |
169 | err: | 169 | err: |
170 | if (ret != ai) M_ASN1_ENUMERATED_free(ret); | 170 | if (ret != ai) M_ASN1_ENUMERATED_free(ret); |
171 | return(NULL); | 171 | return(NULL); |
172 | } | 172 | } |
173 | 173 | ||
174 | BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai, BIGNUM *bn) | 174 | BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai, BIGNUM *bn) |
175 | { | 175 | { |
176 | BIGNUM *ret; | 176 | BIGNUM *ret; |
177 | 177 | ||
178 | if ((ret=BN_bin2bn(ai->data,ai->length,bn)) == NULL) | 178 | if ((ret=BN_bin2bn(ai->data,ai->length,bn)) == NULL) |
179 | ASN1err(ASN1_F_ASN1_ENUMERATED_TO_BN,ASN1_R_BN_LIB); | 179 | ASN1err(ASN1_F_ASN1_ENUMERATED_TO_BN,ASN1_R_BN_LIB); |
180 | else if(ai->type == V_ASN1_NEG_ENUMERATED) BN_set_negative(ret,1); | 180 | else if(ai->type == V_ASN1_NEG_ENUMERATED) BN_set_negative(ret,1); |
181 | return(ret); | 181 | return(ret); |
182 | } | 182 | } |