diff options
author | beck <> | 2017-01-29 17:49:23 +0000 |
---|---|---|
committer | beck <> | 2017-01-29 17:49:23 +0000 |
commit | 957b11334a7afb14537322f0e4795b2e368b3f59 (patch) | |
tree | 1a54abba678898ee5270ae4f3404a50ee9a92eea /src/lib/libcrypto/asn1/x_long.c | |
parent | df96e020e729c6c37a8c7fe311fdd1fe6a8718c5 (diff) | |
download | openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.tar.gz openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.tar.bz2 openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.zip |
Send the function codes from the error functions to the bit bucket,
as was done earlier in libssl. Thanks inoguchi@ for noticing
libssl had more reacharounds into this.
ok jsing@ inoguchi@
Diffstat (limited to 'src/lib/libcrypto/asn1/x_long.c')
-rw-r--r-- | src/lib/libcrypto/asn1/x_long.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/asn1/x_long.c b/src/lib/libcrypto/asn1/x_long.c index 90a41129bc..9df3a3181a 100644 --- a/src/lib/libcrypto/asn1/x_long.c +++ b/src/lib/libcrypto/asn1/x_long.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_long.c,v 1.10 2015/07/25 17:07:17 jsing Exp $ */ | 1 | /* $OpenBSD: x_long.c,v 1.11 2017/01/29 17:49:22 beck Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -173,7 +173,7 @@ long_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype, | |||
173 | unsigned long utmp = 0; | 173 | unsigned long utmp = 0; |
174 | char *cp = (char *)pval; | 174 | char *cp = (char *)pval; |
175 | if (len > (int)sizeof(long)) { | 175 | if (len > (int)sizeof(long)) { |
176 | ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG); | 176 | ASN1error(ASN1_R_INTEGER_TOO_LARGE_FOR_LONG); |
177 | return 0; | 177 | return 0; |
178 | } | 178 | } |
179 | /* Is it negative? */ | 179 | /* Is it negative? */ |
@@ -195,7 +195,7 @@ long_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype, | |||
195 | ltmp = -ltmp; | 195 | ltmp = -ltmp; |
196 | } | 196 | } |
197 | if (ltmp == it->size) { | 197 | if (ltmp == it->size) { |
198 | ASN1err(ASN1_F_LONG_C2I, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG); | 198 | ASN1error(ASN1_R_INTEGER_TOO_LARGE_FOR_LONG); |
199 | return 0; | 199 | return 0; |
200 | } | 200 | } |
201 | memcpy(cp, <mp, sizeof(long)); | 201 | memcpy(cp, <mp, sizeof(long)); |