summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/a_strex.c
diff options
context:
space:
mode:
authortb <>2021-11-01 20:53:08 +0000
committertb <>2021-11-01 20:53:08 +0000
commitb1d784eb6c4f1df06e96cfc40e2434cf76165cbe (patch)
treecbf2de4e6ef2a9e9d9281e6e60c30149cd648fd1 /src/lib/libcrypto/asn1/a_strex.c
parent95589e2e9b8cb0aa7ceb0bdf1ad9af358f6564db (diff)
downloadopenbsd-b1d784eb6c4f1df06e96cfc40e2434cf76165cbe.tar.gz
openbsd-b1d784eb6c4f1df06e96cfc40e2434cf76165cbe.tar.bz2
openbsd-b1d784eb6c4f1df06e96cfc40e2434cf76165cbe.zip
Move the now internal X.509-related structs into x509_lcl.h.
Garbage collect the now unused LIBRESSL_CRYPTO_INTERNAL and LIBRESSL_OPAQUE_X509. Include "x509_lcl.h" where needed and fix a couple of unnecessary reacharounds. ok jsing
Diffstat (limited to 'src/lib/libcrypto/asn1/a_strex.c')
-rw-r--r--src/lib/libcrypto/asn1/a_strex.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/asn1/a_strex.c b/src/lib/libcrypto/asn1/a_strex.c
index 4e3deccfda..3b66ea8d36 100644
--- a/src/lib/libcrypto/asn1/a_strex.c
+++ b/src/lib/libcrypto/asn1/a_strex.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: a_strex.c,v 1.28 2018/05/19 10:46:28 tb Exp $ */ 1/* $OpenBSD: a_strex.c,v 1.29 2021/11/01 20:53:08 tb 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 */
@@ -513,7 +513,7 @@ do_name_ex(char_io *io_ch, void *arg, const X509_NAME *n, int indent,
513 else 513 else
514 ent = X509_NAME_get_entry(n, i); 514 ent = X509_NAME_get_entry(n, i);
515 if (prev != -1) { 515 if (prev != -1) {
516 if (prev == ent->set) { 516 if (prev == X509_NAME_ENTRY_set(ent)) {
517 if (!io_ch(arg, sep_mv, sep_mv_len)) 517 if (!io_ch(arg, sep_mv, sep_mv_len))
518 return -1; 518 return -1;
519 outlen += sep_mv_len; 519 outlen += sep_mv_len;
@@ -526,7 +526,7 @@ do_name_ex(char_io *io_ch, void *arg, const X509_NAME *n, int indent,
526 outlen += indent; 526 outlen += indent;
527 } 527 }
528 } 528 }
529 prev = ent->set; 529 prev = X509_NAME_ENTRY_set(ent);
530 fn = X509_NAME_ENTRY_get_object(ent); 530 fn = X509_NAME_ENTRY_get_object(ent);
531 val = X509_NAME_ENTRY_get_data(ent); 531 val = X509_NAME_ENTRY_get_data(ent);
532 fn_nid = OBJ_obj2nid(fn); 532 fn_nid = OBJ_obj2nid(fn);