summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorjsing <>2018-02-22 17:22:02 +0000
committerjsing <>2018-02-22 17:22:02 +0000
commit6d135bec667cdeb368123bbd901df81dc1774fb9 (patch)
tree998fd70e4b7d704c3a4dc8aa7e8f8b1aa8109292 /src/lib
parentad4d23963c693bccd4966fffee2d9bdf5f461260 (diff)
downloadopenbsd-6d135bec667cdeb368123bbd901df81dc1774fb9.tar.gz
openbsd-6d135bec667cdeb368123bbd901df81dc1774fb9.tar.bz2
openbsd-6d135bec667cdeb368123bbd901df81dc1774fb9.zip
Provide X509_chain_up_ref().
From BoringSSL.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/Symbols.list1
-rw-r--r--src/lib/libcrypto/x509/x509.h3
-rw-r--r--src/lib/libcrypto/x509/x509_cmp.c20
3 files changed, 22 insertions, 2 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 3fdce4de5a..4d10883123 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -2940,6 +2940,7 @@ X509_add_ext
2940X509_alias_get0 2940X509_alias_get0
2941X509_alias_set1 2941X509_alias_set1
2942X509_certificate_type 2942X509_certificate_type
2943X509_chain_up_ref
2943X509_check_akid 2944X509_check_akid
2944X509_check_ca 2945X509_check_ca
2945X509_check_email 2946X509_check_email
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h
index 92f012ea6d..f2df12f248 100644
--- a/src/lib/libcrypto/x509/x509.h
+++ b/src/lib/libcrypto/x509/x509.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509.h,v 1.40 2018/02/22 17:09:28 jsing Exp $ */ 1/* $OpenBSD: x509.h,v 1.41 2018/02/22 17:22:02 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 *
@@ -1309,6 +1309,7 @@ char *X509_TRUST_get0_name(X509_TRUST *xp);
1309int X509_TRUST_get_trust(X509_TRUST *xp); 1309int X509_TRUST_get_trust(X509_TRUST *xp);
1310 1310
1311int X509_up_ref(X509 *x); 1311int X509_up_ref(X509 *x);
1312STACK_OF(X509) *X509_chain_up_ref(STACK_OF(X509) *chain);
1312 1313
1313/* BEGIN ERROR CODES */ 1314/* BEGIN ERROR CODES */
1314/* The following lines are auto generated by the script mkerr.pl. Any changes 1315/* The following lines are auto generated by the script mkerr.pl. Any changes
diff --git a/src/lib/libcrypto/x509/x509_cmp.c b/src/lib/libcrypto/x509/x509_cmp.c
index 440467521b..001f98e61a 100644
--- a/src/lib/libcrypto/x509/x509_cmp.c
+++ b/src/lib/libcrypto/x509/x509_cmp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_cmp.c,v 1.28 2018/02/22 17:05:35 jsing Exp $ */ 1/* $OpenBSD: x509_cmp.c,v 1.29 2018/02/22 17:22:02 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 *
@@ -370,3 +370,21 @@ X509_check_private_key(X509 *x, EVP_PKEY *k)
370 return 1; 370 return 1;
371 return 0; 371 return 0;
372} 372}
373
374/*
375 * Not strictly speaking an "up_ref" as a STACK doesn't have a reference
376 * count but it has the same effect by duping the STACK and upping the ref of
377 * each X509 structure.
378 */
379STACK_OF(X509) *
380X509_chain_up_ref(STACK_OF(X509) *chain)
381{
382 STACK_OF(X509) *ret;
383 size_t i;
384
385 ret = sk_X509_dup(chain);
386 for (i = 0; i < sk_X509_num(ret); i++)
387 X509_up_ref(sk_X509_value(ret, i));
388
389 return ret;
390}