diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_attr.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_attr.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_attr.c b/src/lib/libcrypto/pkcs12/p12_attr.c index 989a1476c2..f872127264 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.17 2022/08/20 09:16:18 tb Exp $ */ | 1 | /* $OpenBSD: p12_attr.c,v 1.18 2022/11/12 13:03:28 beck 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,6 +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 | } |
| 77 | LCRYPTO_ALIAS(PKCS12_add_localkeyid) | ||
| 77 | 78 | ||
| 78 | /* Add key usage to PKCS#8 structure */ | 79 | /* Add key usage to PKCS#8 structure */ |
| 79 | 80 | ||
| @@ -85,6 +86,7 @@ PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage) | |||
| 85 | 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, |
| 86 | &us_val, 1); | 87 | &us_val, 1); |
| 87 | } | 88 | } |
| 89 | LCRYPTO_ALIAS(PKCS8_add_keyusage) | ||
| 88 | 90 | ||
| 89 | /* Add a friendlyname to a safebag */ | 91 | /* Add a friendlyname to a safebag */ |
| 90 | 92 | ||
| @@ -97,6 +99,7 @@ PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name, int namelen) | |||
| 97 | else | 99 | else |
| 98 | return 0; | 100 | return 0; |
| 99 | } | 101 | } |
| 102 | LCRYPTO_ALIAS(PKCS12_add_friendlyname_asc) | ||
| 100 | 103 | ||
| 101 | 104 | ||
| 102 | int | 105 | int |
| @@ -109,6 +112,7 @@ PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag, const unsigned char *name, | |||
| 109 | else | 112 | else |
| 110 | return 0; | 113 | return 0; |
| 111 | } | 114 | } |
| 115 | LCRYPTO_ALIAS(PKCS12_add_friendlyname_uni) | ||
| 112 | 116 | ||
| 113 | int | 117 | int |
| 114 | PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name, int namelen) | 118 | PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name, int namelen) |
| @@ -119,6 +123,7 @@ PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name, int namelen) | |||
| 119 | else | 123 | else |
| 120 | return 0; | 124 | return 0; |
| 121 | } | 125 | } |
| 126 | LCRYPTO_ALIAS(PKCS12_add_CSPName_asc) | ||
| 122 | 127 | ||
| 123 | ASN1_TYPE * | 128 | ASN1_TYPE * |
| 124 | PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid) | 129 | PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid) |
| @@ -135,6 +140,7 @@ PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid) | |||
| 135 | } | 140 | } |
| 136 | return NULL; | 141 | return NULL; |
| 137 | } | 142 | } |
| 143 | LCRYPTO_ALIAS(PKCS12_get_attr_gen) | ||
| 138 | 144 | ||
| 139 | char * | 145 | char * |
| 140 | PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag) | 146 | PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag) |
| @@ -148,9 +154,11 @@ PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag) | |||
| 148 | return OPENSSL_uni2asc(atype->value.bmpstring->data, | 154 | return OPENSSL_uni2asc(atype->value.bmpstring->data, |
| 149 | atype->value.bmpstring->length); | 155 | atype->value.bmpstring->length); |
| 150 | } | 156 | } |
| 157 | LCRYPTO_ALIAS(PKCS12_get_friendlyname) | ||
| 151 | 158 | ||
| 152 | const STACK_OF(X509_ATTRIBUTE) * | 159 | const STACK_OF(X509_ATTRIBUTE) * |
| 153 | PKCS12_SAFEBAG_get0_attrs(const PKCS12_SAFEBAG *bag) | 160 | PKCS12_SAFEBAG_get0_attrs(const PKCS12_SAFEBAG *bag) |
| 154 | { | 161 | { |
| 155 | return bag->attrib; | 162 | return bag->attrib; |
| 156 | } | 163 | } |
| 164 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_attrs) | ||
