summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/p12_attr.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_attr.c')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_attr.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_attr.c b/src/lib/libcrypto/pkcs12/p12_attr.c
index e1635ea038..d43b205a07 100644
--- a/src/lib/libcrypto/pkcs12/p12_attr.c
+++ b/src/lib/libcrypto/pkcs12/p12_attr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_attr.c,v 1.19 2022/11/26 16:08:53 tb Exp $ */ 1/* $OpenBSD: p12_attr.c,v 1.20 2023/02/16 08:38:17 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 1999. 3 * project 1999.
4 */ 4 */
@@ -74,7 +74,7 @@ PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name, int namelen)
74 else 74 else
75 return 0; 75 return 0;
76} 76}
77LCRYPTO_ALIAS(PKCS12_add_localkeyid) 77LCRYPTO_ALIAS(PKCS12_add_localkeyid);
78 78
79/* Add key usage to PKCS#8 structure */ 79/* Add key usage to PKCS#8 structure */
80 80
@@ -86,7 +86,7 @@ PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage)
86 return PKCS8_pkey_add1_attr_by_NID(p8, NID_key_usage, V_ASN1_BIT_STRING, 86 return PKCS8_pkey_add1_attr_by_NID(p8, NID_key_usage, V_ASN1_BIT_STRING,
87 &us_val, 1); 87 &us_val, 1);
88} 88}
89LCRYPTO_ALIAS(PKCS8_add_keyusage) 89LCRYPTO_ALIAS(PKCS8_add_keyusage);
90 90
91/* Add a friendlyname to a safebag */ 91/* Add a friendlyname to a safebag */
92 92
@@ -99,7 +99,7 @@ PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name, int namelen)
99 else 99 else
100 return 0; 100 return 0;
101} 101}
102LCRYPTO_ALIAS(PKCS12_add_friendlyname_asc) 102LCRYPTO_ALIAS(PKCS12_add_friendlyname_asc);
103 103
104 104
105int 105int
@@ -112,7 +112,7 @@ PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag, const unsigned char *name,
112 else 112 else
113 return 0; 113 return 0;
114} 114}
115LCRYPTO_ALIAS(PKCS12_add_friendlyname_uni) 115LCRYPTO_ALIAS(PKCS12_add_friendlyname_uni);
116 116
117int 117int
118PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name, int namelen) 118PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name, int namelen)
@@ -123,7 +123,7 @@ PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name, int namelen)
123 else 123 else
124 return 0; 124 return 0;
125} 125}
126LCRYPTO_ALIAS(PKCS12_add_CSPName_asc) 126LCRYPTO_ALIAS(PKCS12_add_CSPName_asc);
127 127
128ASN1_TYPE * 128ASN1_TYPE *
129PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid) 129PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid)
@@ -140,7 +140,7 @@ PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid)
140 } 140 }
141 return NULL; 141 return NULL;
142} 142}
143LCRYPTO_ALIAS(PKCS12_get_attr_gen) 143LCRYPTO_ALIAS(PKCS12_get_attr_gen);
144 144
145char * 145char *
146PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag) 146PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag)
@@ -154,11 +154,11 @@ PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag)
154 return OPENSSL_uni2asc(atype->value.bmpstring->data, 154 return OPENSSL_uni2asc(atype->value.bmpstring->data,
155 atype->value.bmpstring->length); 155 atype->value.bmpstring->length);
156} 156}
157LCRYPTO_ALIAS(PKCS12_get_friendlyname) 157LCRYPTO_ALIAS(PKCS12_get_friendlyname);
158 158
159const STACK_OF(X509_ATTRIBUTE) * 159const STACK_OF(X509_ATTRIBUTE) *
160PKCS12_SAFEBAG_get0_attrs(const PKCS12_SAFEBAG *bag) 160PKCS12_SAFEBAG_get0_attrs(const PKCS12_SAFEBAG *bag)
161{ 161{
162 return bag->attrib; 162 return bag->attrib;
163} 163}
164LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_attrs) 164LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_attrs);