summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/p12_sbag.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_sbag.c')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_sbag.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_sbag.c b/src/lib/libcrypto/pkcs12/p12_sbag.c
index cbcb02d23c..db6e3c0af8 100644
--- a/src/lib/libcrypto/pkcs12/p12_sbag.c
+++ b/src/lib/libcrypto/pkcs12/p12_sbag.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_sbag.c,v 1.5 2022/08/20 09:16:18 tb Exp $ */ 1/* $OpenBSD: p12_sbag.c,v 1.6 2022/11/12 13:03:28 beck Exp $ */
2/* 2/*
3 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project 3 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
4 * 1999-2018. 4 * 1999-2018.
@@ -70,12 +70,14 @@ PKCS12_SAFEBAG_get0_attr(const PKCS12_SAFEBAG *bag, int attr_nid)
70{ 70{
71 return PKCS12_get_attr_gen(bag->attrib, attr_nid); 71 return PKCS12_get_attr_gen(bag->attrib, attr_nid);
72} 72}
73LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_attr)
73 74
74ASN1_TYPE * 75ASN1_TYPE *
75PKCS8_get_attr(PKCS8_PRIV_KEY_INFO *p8, int attr_nid) 76PKCS8_get_attr(PKCS8_PRIV_KEY_INFO *p8, int attr_nid)
76{ 77{
77 return PKCS12_get_attr_gen(p8->attributes, attr_nid); 78 return PKCS12_get_attr_gen(p8->attributes, attr_nid);
78} 79}
80LCRYPTO_ALIAS(PKCS8_get_attr)
79 81
80const PKCS8_PRIV_KEY_INFO * 82const PKCS8_PRIV_KEY_INFO *
81PKCS12_SAFEBAG_get0_p8inf(const PKCS12_SAFEBAG *bag) 83PKCS12_SAFEBAG_get0_p8inf(const PKCS12_SAFEBAG *bag)
@@ -85,6 +87,7 @@ PKCS12_SAFEBAG_get0_p8inf(const PKCS12_SAFEBAG *bag)
85 87
86 return bag->value.keybag; 88 return bag->value.keybag;
87} 89}
90LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_p8inf)
88 91
89const X509_SIG * 92const X509_SIG *
90PKCS12_SAFEBAG_get0_pkcs8(const PKCS12_SAFEBAG *bag) 93PKCS12_SAFEBAG_get0_pkcs8(const PKCS12_SAFEBAG *bag)
@@ -94,6 +97,7 @@ PKCS12_SAFEBAG_get0_pkcs8(const PKCS12_SAFEBAG *bag)
94 97
95 return bag->value.shkeybag; 98 return bag->value.shkeybag;
96} 99}
100LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_pkcs8)
97 101
98const STACK_OF(PKCS12_SAFEBAG) * 102const STACK_OF(PKCS12_SAFEBAG) *
99PKCS12_SAFEBAG_get0_safes(const PKCS12_SAFEBAG *bag) 103PKCS12_SAFEBAG_get0_safes(const PKCS12_SAFEBAG *bag)
@@ -103,18 +107,21 @@ PKCS12_SAFEBAG_get0_safes(const PKCS12_SAFEBAG *bag)
103 107
104 return bag->value.safes; 108 return bag->value.safes;
105} 109}
110LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_safes)
106 111
107const ASN1_OBJECT * 112const ASN1_OBJECT *
108PKCS12_SAFEBAG_get0_type(const PKCS12_SAFEBAG *bag) 113PKCS12_SAFEBAG_get0_type(const PKCS12_SAFEBAG *bag)
109{ 114{
110 return bag->type; 115 return bag->type;
111} 116}
117LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_type)
112 118
113int 119int
114PKCS12_SAFEBAG_get_nid(const PKCS12_SAFEBAG *bag) 120PKCS12_SAFEBAG_get_nid(const PKCS12_SAFEBAG *bag)
115{ 121{
116 return OBJ_obj2nid(bag->type); 122 return OBJ_obj2nid(bag->type);
117} 123}
124LCRYPTO_ALIAS(PKCS12_SAFEBAG_get_nid)
118 125
119int 126int
120PKCS12_SAFEBAG_get_bag_nid(const PKCS12_SAFEBAG *bag) 127PKCS12_SAFEBAG_get_bag_nid(const PKCS12_SAFEBAG *bag)
@@ -129,6 +136,7 @@ PKCS12_SAFEBAG_get_bag_nid(const PKCS12_SAFEBAG *bag)
129 136
130 return -1; 137 return -1;
131} 138}
139LCRYPTO_ALIAS(PKCS12_SAFEBAG_get_bag_nid)
132 140
133X509 * 141X509 *
134PKCS12_SAFEBAG_get1_cert(const PKCS12_SAFEBAG *bag) 142PKCS12_SAFEBAG_get1_cert(const PKCS12_SAFEBAG *bag)
@@ -139,6 +147,7 @@ PKCS12_SAFEBAG_get1_cert(const PKCS12_SAFEBAG *bag)
139 return NULL; 147 return NULL;
140 return ASN1_item_unpack(bag->value.bag->value.octet, &X509_it); 148 return ASN1_item_unpack(bag->value.bag->value.octet, &X509_it);
141} 149}
150LCRYPTO_ALIAS(PKCS12_SAFEBAG_get1_cert)
142 151
143X509_CRL * 152X509_CRL *
144PKCS12_SAFEBAG_get1_crl(const PKCS12_SAFEBAG *bag) 153PKCS12_SAFEBAG_get1_crl(const PKCS12_SAFEBAG *bag)
@@ -149,6 +158,7 @@ PKCS12_SAFEBAG_get1_crl(const PKCS12_SAFEBAG *bag)
149 return NULL; 158 return NULL;
150 return ASN1_item_unpack(bag->value.bag->value.octet, &X509_CRL_it); 159 return ASN1_item_unpack(bag->value.bag->value.octet, &X509_CRL_it);
151} 160}
161LCRYPTO_ALIAS(PKCS12_SAFEBAG_get1_crl)
152 162
153PKCS12_SAFEBAG * 163PKCS12_SAFEBAG *
154PKCS12_SAFEBAG_create_cert(X509 *x509) 164PKCS12_SAFEBAG_create_cert(X509 *x509)
@@ -156,6 +166,7 @@ PKCS12_SAFEBAG_create_cert(X509 *x509)
156 return PKCS12_item_pack_safebag(x509, &X509_it, 166 return PKCS12_item_pack_safebag(x509, &X509_it,
157 NID_x509Certificate, NID_certBag); 167 NID_x509Certificate, NID_certBag);
158} 168}
169LCRYPTO_ALIAS(PKCS12_SAFEBAG_create_cert)
159 170
160PKCS12_SAFEBAG * 171PKCS12_SAFEBAG *
161PKCS12_SAFEBAG_create_crl(X509_CRL *crl) 172PKCS12_SAFEBAG_create_crl(X509_CRL *crl)
@@ -163,6 +174,7 @@ PKCS12_SAFEBAG_create_crl(X509_CRL *crl)
163 return PKCS12_item_pack_safebag(crl, &X509_CRL_it, 174 return PKCS12_item_pack_safebag(crl, &X509_CRL_it,
164 NID_x509Crl, NID_crlBag); 175 NID_x509Crl, NID_crlBag);
165} 176}
177LCRYPTO_ALIAS(PKCS12_SAFEBAG_create_crl)
166 178
167/* Turn PKCS8 object into a keybag */ 179/* Turn PKCS8 object into a keybag */
168 180
@@ -181,6 +193,7 @@ PKCS12_SAFEBAG_create0_p8inf(PKCS8_PRIV_KEY_INFO *p8)
181 193
182 return bag; 194 return bag;
183} 195}
196LCRYPTO_ALIAS(PKCS12_SAFEBAG_create0_p8inf)
184 197
185/* Turn PKCS8 object into a shrouded keybag */ 198/* Turn PKCS8 object into a shrouded keybag */
186 199
@@ -200,6 +213,7 @@ PKCS12_SAFEBAG_create0_pkcs8(X509_SIG *p8)
200 213
201 return bag; 214 return bag;
202} 215}
216LCRYPTO_ALIAS(PKCS12_SAFEBAG_create0_pkcs8)
203 217
204PKCS12_SAFEBAG * 218PKCS12_SAFEBAG *
205PKCS12_SAFEBAG_create_pkcs8_encrypt(int pbe_nid, const char *pass, int passlen, 219PKCS12_SAFEBAG_create_pkcs8_encrypt(int pbe_nid, const char *pass, int passlen,
@@ -223,3 +237,4 @@ PKCS12_SAFEBAG_create_pkcs8_encrypt(int pbe_nid, const char *pass, int passlen,
223 237
224 return bag; 238 return bag;
225} 239}
240LCRYPTO_ALIAS(PKCS12_SAFEBAG_create_pkcs8_encrypt)