diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/evp_asn1.c')
-rw-r--r-- | src/lib/libcrypto/asn1/evp_asn1.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libcrypto/asn1/evp_asn1.c b/src/lib/libcrypto/asn1/evp_asn1.c index 1f36cebad7..83228bb5d2 100644 --- a/src/lib/libcrypto/asn1/evp_asn1.c +++ b/src/lib/libcrypto/asn1/evp_asn1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: evp_asn1.c,v 1.18 2015/09/30 19:07:08 jsing Exp $ */ | 1 | /* $OpenBSD: evp_asn1.c,v 1.19 2017/01/29 17:49:22 beck Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -87,7 +87,7 @@ ASN1_TYPE_get_octetstring(ASN1_TYPE *a, unsigned char *data, int max_len) | |||
87 | 87 | ||
88 | if ((a->type != V_ASN1_OCTET_STRING) || | 88 | if ((a->type != V_ASN1_OCTET_STRING) || |
89 | (a->value.octet_string == NULL)) { | 89 | (a->value.octet_string == NULL)) { |
90 | ASN1err(ASN1_F_ASN1_TYPE_GET_OCTETSTRING, ASN1_R_DATA_IS_WRONG); | 90 | ASN1error(ASN1_R_DATA_IS_WRONG); |
91 | return (-1); | 91 | return (-1); |
92 | } | 92 | } |
93 | p = ASN1_STRING_data(a->value.octet_string); | 93 | p = ASN1_STRING_data(a->value.octet_string); |
@@ -192,8 +192,7 @@ ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a, long *num, unsigned char *data, | |||
192 | memcpy(data, ASN1_STRING_data(os), n); | 192 | memcpy(data, ASN1_STRING_data(os), n); |
193 | if (0) { | 193 | if (0) { |
194 | err: | 194 | err: |
195 | ASN1err(ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING, | 195 | ASN1error(ASN1_R_DATA_IS_WRONG); |
196 | ASN1_R_DATA_IS_WRONG); | ||
197 | } | 196 | } |
198 | ASN1_OCTET_STRING_free(os); | 197 | ASN1_OCTET_STRING_free(os); |
199 | ASN1_INTEGER_free(ai); | 198 | ASN1_INTEGER_free(ai); |