summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2024-07-12 09:55:38 +0000
committertb <>2024-07-12 09:55:38 +0000
commitff3aab56daa90dbffc5d074b6e763a546e2804d0 (patch)
tree34bfd283a0387523afbe1f5b4e3d6fb9a1fd1ed0 /src
parentea469fd7d94455fc2a07df1df81dbe653428f925 (diff)
downloadopenbsd-ff3aab56daa90dbffc5d074b6e763a546e2804d0.tar.gz
openbsd-ff3aab56daa90dbffc5d074b6e763a546e2804d0.tar.bz2
openbsd-ff3aab56daa90dbffc5d074b6e763a546e2804d0.zip
Rename the sk in this file to exts
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/x509/x509_v3.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/libcrypto/x509/x509_v3.c b/src/lib/libcrypto/x509/x509_v3.c
index dcd790abf6..8bab8c4cd1 100644
--- a/src/lib/libcrypto/x509/x509_v3.c
+++ b/src/lib/libcrypto/x509/x509_v3.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_v3.c,v 1.41 2024/07/12 09:53:30 tb Exp $ */ 1/* $OpenBSD: x509_v3.c,v 1.42 2024/07/12 09:55:38 tb 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 *
@@ -69,36 +69,36 @@
69#include "x509_local.h" 69#include "x509_local.h"
70 70
71int 71int
72X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *sk) 72X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *exts)
73{ 73{
74 if (sk == NULL) 74 if (exts == NULL)
75 return 0; 75 return 0;
76 76
77 return sk_X509_EXTENSION_num(sk); 77 return sk_X509_EXTENSION_num(exts);
78} 78}
79LCRYPTO_ALIAS(X509v3_get_ext_count); 79LCRYPTO_ALIAS(X509v3_get_ext_count);
80 80
81int 81int
82X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *sk, int nid, int lastpos) 82X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *exts, int nid, int lastpos)
83{ 83{
84 const ASN1_OBJECT *obj; 84 const ASN1_OBJECT *obj;
85 85
86 if ((obj = OBJ_nid2obj(nid)) == NULL) 86 if ((obj = OBJ_nid2obj(nid)) == NULL)
87 return -2; 87 return -2;
88 88
89 return X509v3_get_ext_by_OBJ(sk, obj, lastpos); 89 return X509v3_get_ext_by_OBJ(exts, obj, lastpos);
90} 90}
91LCRYPTO_ALIAS(X509v3_get_ext_by_NID); 91LCRYPTO_ALIAS(X509v3_get_ext_by_NID);
92 92
93int 93int
94X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk, 94X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *exts,
95 const ASN1_OBJECT *obj, int lastpos) 95 const ASN1_OBJECT *obj, int lastpos)
96{ 96{
97 if (++lastpos < 0) 97 if (++lastpos < 0)
98 lastpos = 0; 98 lastpos = 0;
99 99
100 for (; lastpos < X509v3_get_ext_count(sk); lastpos++) { 100 for (; lastpos < X509v3_get_ext_count(exts); lastpos++) {
101 const X509_EXTENSION *ext = X509v3_get_ext(sk, lastpos); 101 const X509_EXTENSION *ext = X509v3_get_ext(exts, lastpos);
102 102
103 if (OBJ_cmp(ext->object, obj) == 0) 103 if (OBJ_cmp(ext->object, obj) == 0)
104 return lastpos; 104 return lastpos;
@@ -109,7 +109,7 @@ X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk,
109LCRYPTO_ALIAS(X509v3_get_ext_by_OBJ); 109LCRYPTO_ALIAS(X509v3_get_ext_by_OBJ);
110 110
111int 111int
112X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int critical, 112X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *exts, int critical,
113 int lastpos) 113 int lastpos)
114{ 114{
115 critical = (critical != 0); 115 critical = (critical != 0);
@@ -117,8 +117,8 @@ X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int critical,
117 if (++lastpos < 0) 117 if (++lastpos < 0)
118 lastpos = 0; 118 lastpos = 0;
119 119
120 for (; lastpos < X509v3_get_ext_count(sk); lastpos++) { 120 for (; lastpos < X509v3_get_ext_count(exts); lastpos++) {
121 const X509_EXTENSION *ext = X509v3_get_ext(sk, lastpos); 121 const X509_EXTENSION *ext = X509v3_get_ext(exts, lastpos);
122 122
123 if (X509_EXTENSION_get_critical(ext) == critical) 123 if (X509_EXTENSION_get_critical(ext) == critical)
124 return lastpos; 124 return lastpos;
@@ -129,16 +129,16 @@ X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int critical,
129LCRYPTO_ALIAS(X509v3_get_ext_by_critical); 129LCRYPTO_ALIAS(X509v3_get_ext_by_critical);
130 130
131X509_EXTENSION * 131X509_EXTENSION *
132X509v3_get_ext(const STACK_OF(X509_EXTENSION) *sk, int loc) 132X509v3_get_ext(const STACK_OF(X509_EXTENSION) *exts, int loc)
133{ 133{
134 return sk_X509_EXTENSION_value(sk, loc); 134 return sk_X509_EXTENSION_value(exts, loc);
135} 135}
136LCRYPTO_ALIAS(X509v3_get_ext); 136LCRYPTO_ALIAS(X509v3_get_ext);
137 137
138X509_EXTENSION * 138X509_EXTENSION *
139X509v3_delete_ext(STACK_OF(X509_EXTENSION) *sk, int loc) 139X509v3_delete_ext(STACK_OF(X509_EXTENSION) *exts, int loc)
140{ 140{
141 return sk_X509_EXTENSION_delete(sk, loc); 141 return sk_X509_EXTENSION_delete(exts, loc);
142} 142}
143LCRYPTO_ALIAS(X509v3_delete_ext); 143LCRYPTO_ALIAS(X509v3_delete_ext);
144 144