diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/x_name.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/x_name.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/asn1/x_name.c b/src/lib/libcrypto/asn1/x_name.c index be936318d8..87bcc2c5ba 100644 --- a/src/lib/libcrypto/asn1/x_name.c +++ b/src/lib/libcrypto/asn1/x_name.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x_name.c,v 1.31 2015/07/24 15:09:52 jsing Exp $ */ | 1 | /* $OpenBSD: x_name.c,v 1.32 2016/12/30 16:04:34 jsing 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 | * |
| @@ -302,7 +302,7 @@ x509_name_ex_d2i(ASN1_VALUE **val, const unsigned char **in, long len, | |||
| 302 | 302 | ||
| 303 | /* Get internal representation of Name */ | 303 | /* Get internal representation of Name */ |
| 304 | ret = ASN1_item_ex_d2i(&intname.a, &p, len, | 304 | ret = ASN1_item_ex_d2i(&intname.a, &p, len, |
| 305 | ASN1_ITEM_rptr(X509_NAME_INTERNAL), tag, aclass, opt, ctx); | 305 | &X509_NAME_INTERNAL_it, tag, aclass, opt, ctx); |
| 306 | 306 | ||
| 307 | if (ret <= 0) | 307 | if (ret <= 0) |
| 308 | return ret; | 308 | return ret; |
| @@ -410,11 +410,11 @@ x509_name_encode(X509_NAME *a) | |||
| 410 | goto memerr; | 410 | goto memerr; |
| 411 | } | 411 | } |
| 412 | len = ASN1_item_ex_i2d(&intname.a, NULL, | 412 | len = ASN1_item_ex_i2d(&intname.a, NULL, |
| 413 | ASN1_ITEM_rptr(X509_NAME_INTERNAL), -1, -1); | 413 | &X509_NAME_INTERNAL_it, -1, -1); |
| 414 | if (!BUF_MEM_grow(a->bytes, len)) | 414 | if (!BUF_MEM_grow(a->bytes, len)) |
| 415 | goto memerr; | 415 | goto memerr; |
| 416 | p = (unsigned char *)a->bytes->data; | 416 | p = (unsigned char *)a->bytes->data; |
| 417 | ASN1_item_ex_i2d(&intname.a, &p, ASN1_ITEM_rptr(X509_NAME_INTERNAL), | 417 | ASN1_item_ex_i2d(&intname.a, &p, &X509_NAME_INTERNAL_it, |
| 418 | -1, -1); | 418 | -1, -1); |
| 419 | sk_STACK_OF_X509_NAME_ENTRY_pop_free(intname.s, | 419 | sk_STACK_OF_X509_NAME_ENTRY_pop_free(intname.s, |
| 420 | local_sk_X509_NAME_ENTRY_free); | 420 | local_sk_X509_NAME_ENTRY_free); |
| @@ -615,7 +615,7 @@ i2d_name_canon(STACK_OF(STACK_OF_X509_NAME_ENTRY) *_intname, unsigned char **in) | |||
| 615 | for (i = 0; i < sk_ASN1_VALUE_num(intname); i++) { | 615 | for (i = 0; i < sk_ASN1_VALUE_num(intname); i++) { |
| 616 | v = sk_ASN1_VALUE_value(intname, i); | 616 | v = sk_ASN1_VALUE_value(intname, i); |
| 617 | ltmp = ASN1_item_ex_i2d(&v, in, | 617 | ltmp = ASN1_item_ex_i2d(&v, in, |
| 618 | ASN1_ITEM_rptr(X509_NAME_ENTRIES), -1, -1); | 618 | &X509_NAME_ENTRIES_it, -1, -1); |
| 619 | if (ltmp < 0) | 619 | if (ltmp < 0) |
| 620 | return ltmp; | 620 | return ltmp; |
| 621 | len += ltmp; | 621 | len += ltmp; |
