diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_sbag.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_sbag.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_sbag.c b/src/lib/libcrypto/pkcs12/p12_sbag.c index 16ada0eeb1..b7772b67b8 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.7 2022/11/26 16:08:53 tb Exp $ */ | 1 | /* $OpenBSD: p12_sbag.c,v 1.8 2023/02/16 08:38:17 tb 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,14 +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 | } |
| 73 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_attr) | 73 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_attr); |
| 74 | 74 | ||
| 75 | ASN1_TYPE * | 75 | ASN1_TYPE * |
| 76 | PKCS8_get_attr(PKCS8_PRIV_KEY_INFO *p8, int attr_nid) | 76 | PKCS8_get_attr(PKCS8_PRIV_KEY_INFO *p8, int attr_nid) |
| 77 | { | 77 | { |
| 78 | return PKCS12_get_attr_gen(p8->attributes, attr_nid); | 78 | return PKCS12_get_attr_gen(p8->attributes, attr_nid); |
| 79 | } | 79 | } |
| 80 | LCRYPTO_ALIAS(PKCS8_get_attr) | 80 | LCRYPTO_ALIAS(PKCS8_get_attr); |
| 81 | 81 | ||
| 82 | const PKCS8_PRIV_KEY_INFO * | 82 | const PKCS8_PRIV_KEY_INFO * |
| 83 | PKCS12_SAFEBAG_get0_p8inf(const PKCS12_SAFEBAG *bag) | 83 | PKCS12_SAFEBAG_get0_p8inf(const PKCS12_SAFEBAG *bag) |
| @@ -87,7 +87,7 @@ PKCS12_SAFEBAG_get0_p8inf(const PKCS12_SAFEBAG *bag) | |||
| 87 | 87 | ||
| 88 | return bag->value.keybag; | 88 | return bag->value.keybag; |
| 89 | } | 89 | } |
| 90 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_p8inf) | 90 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_p8inf); |
| 91 | 91 | ||
| 92 | const X509_SIG * | 92 | const X509_SIG * |
| 93 | PKCS12_SAFEBAG_get0_pkcs8(const PKCS12_SAFEBAG *bag) | 93 | PKCS12_SAFEBAG_get0_pkcs8(const PKCS12_SAFEBAG *bag) |
| @@ -97,7 +97,7 @@ PKCS12_SAFEBAG_get0_pkcs8(const PKCS12_SAFEBAG *bag) | |||
| 97 | 97 | ||
| 98 | return bag->value.shkeybag; | 98 | return bag->value.shkeybag; |
| 99 | } | 99 | } |
| 100 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_pkcs8) | 100 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_pkcs8); |
| 101 | 101 | ||
| 102 | const STACK_OF(PKCS12_SAFEBAG) * | 102 | const STACK_OF(PKCS12_SAFEBAG) * |
| 103 | PKCS12_SAFEBAG_get0_safes(const PKCS12_SAFEBAG *bag) | 103 | PKCS12_SAFEBAG_get0_safes(const PKCS12_SAFEBAG *bag) |
| @@ -107,21 +107,21 @@ PKCS12_SAFEBAG_get0_safes(const PKCS12_SAFEBAG *bag) | |||
| 107 | 107 | ||
| 108 | return bag->value.safes; | 108 | return bag->value.safes; |
| 109 | } | 109 | } |
| 110 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_safes) | 110 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_safes); |
| 111 | 111 | ||
| 112 | const ASN1_OBJECT * | 112 | const ASN1_OBJECT * |
| 113 | PKCS12_SAFEBAG_get0_type(const PKCS12_SAFEBAG *bag) | 113 | PKCS12_SAFEBAG_get0_type(const PKCS12_SAFEBAG *bag) |
| 114 | { | 114 | { |
| 115 | return bag->type; | 115 | return bag->type; |
| 116 | } | 116 | } |
| 117 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_type) | 117 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get0_type); |
| 118 | 118 | ||
| 119 | int | 119 | int |
| 120 | PKCS12_SAFEBAG_get_nid(const PKCS12_SAFEBAG *bag) | 120 | PKCS12_SAFEBAG_get_nid(const PKCS12_SAFEBAG *bag) |
| 121 | { | 121 | { |
| 122 | return OBJ_obj2nid(bag->type); | 122 | return OBJ_obj2nid(bag->type); |
| 123 | } | 123 | } |
| 124 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get_nid) | 124 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get_nid); |
| 125 | 125 | ||
| 126 | int | 126 | int |
| 127 | PKCS12_SAFEBAG_get_bag_nid(const PKCS12_SAFEBAG *bag) | 127 | PKCS12_SAFEBAG_get_bag_nid(const PKCS12_SAFEBAG *bag) |
| @@ -136,7 +136,7 @@ PKCS12_SAFEBAG_get_bag_nid(const PKCS12_SAFEBAG *bag) | |||
| 136 | 136 | ||
| 137 | return -1; | 137 | return -1; |
| 138 | } | 138 | } |
| 139 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get_bag_nid) | 139 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get_bag_nid); |
| 140 | 140 | ||
| 141 | X509 * | 141 | X509 * |
| 142 | PKCS12_SAFEBAG_get1_cert(const PKCS12_SAFEBAG *bag) | 142 | PKCS12_SAFEBAG_get1_cert(const PKCS12_SAFEBAG *bag) |
| @@ -147,7 +147,7 @@ PKCS12_SAFEBAG_get1_cert(const PKCS12_SAFEBAG *bag) | |||
| 147 | return NULL; | 147 | return NULL; |
| 148 | return ASN1_item_unpack(bag->value.bag->value.octet, &X509_it); | 148 | return ASN1_item_unpack(bag->value.bag->value.octet, &X509_it); |
| 149 | } | 149 | } |
| 150 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get1_cert) | 150 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get1_cert); |
| 151 | 151 | ||
| 152 | X509_CRL * | 152 | X509_CRL * |
| 153 | PKCS12_SAFEBAG_get1_crl(const PKCS12_SAFEBAG *bag) | 153 | PKCS12_SAFEBAG_get1_crl(const PKCS12_SAFEBAG *bag) |
| @@ -158,7 +158,7 @@ PKCS12_SAFEBAG_get1_crl(const PKCS12_SAFEBAG *bag) | |||
| 158 | return NULL; | 158 | return NULL; |
| 159 | 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); |
| 160 | } | 160 | } |
| 161 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get1_crl) | 161 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_get1_crl); |
| 162 | 162 | ||
| 163 | PKCS12_SAFEBAG * | 163 | PKCS12_SAFEBAG * |
| 164 | PKCS12_SAFEBAG_create_cert(X509 *x509) | 164 | PKCS12_SAFEBAG_create_cert(X509 *x509) |
| @@ -166,7 +166,7 @@ PKCS12_SAFEBAG_create_cert(X509 *x509) | |||
| 166 | return PKCS12_item_pack_safebag(x509, &X509_it, | 166 | return PKCS12_item_pack_safebag(x509, &X509_it, |
| 167 | NID_x509Certificate, NID_certBag); | 167 | NID_x509Certificate, NID_certBag); |
| 168 | } | 168 | } |
| 169 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_create_cert) | 169 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_create_cert); |
| 170 | 170 | ||
| 171 | PKCS12_SAFEBAG * | 171 | PKCS12_SAFEBAG * |
| 172 | PKCS12_SAFEBAG_create_crl(X509_CRL *crl) | 172 | PKCS12_SAFEBAG_create_crl(X509_CRL *crl) |
| @@ -174,7 +174,7 @@ PKCS12_SAFEBAG_create_crl(X509_CRL *crl) | |||
| 174 | return PKCS12_item_pack_safebag(crl, &X509_CRL_it, | 174 | return PKCS12_item_pack_safebag(crl, &X509_CRL_it, |
| 175 | NID_x509Crl, NID_crlBag); | 175 | NID_x509Crl, NID_crlBag); |
| 176 | } | 176 | } |
| 177 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_create_crl) | 177 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_create_crl); |
| 178 | 178 | ||
| 179 | /* Turn PKCS8 object into a keybag */ | 179 | /* Turn PKCS8 object into a keybag */ |
| 180 | 180 | ||
| @@ -193,7 +193,7 @@ PKCS12_SAFEBAG_create0_p8inf(PKCS8_PRIV_KEY_INFO *p8) | |||
| 193 | 193 | ||
| 194 | return bag; | 194 | return bag; |
| 195 | } | 195 | } |
| 196 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_create0_p8inf) | 196 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_create0_p8inf); |
| 197 | 197 | ||
| 198 | /* Turn PKCS8 object into a shrouded keybag */ | 198 | /* Turn PKCS8 object into a shrouded keybag */ |
| 199 | 199 | ||
| @@ -213,7 +213,7 @@ PKCS12_SAFEBAG_create0_pkcs8(X509_SIG *p8) | |||
| 213 | 213 | ||
| 214 | return bag; | 214 | return bag; |
| 215 | } | 215 | } |
| 216 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_create0_pkcs8) | 216 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_create0_pkcs8); |
| 217 | 217 | ||
| 218 | PKCS12_SAFEBAG * | 218 | PKCS12_SAFEBAG * |
| 219 | PKCS12_SAFEBAG_create_pkcs8_encrypt(int pbe_nid, const char *pass, int passlen, | 219 | PKCS12_SAFEBAG_create_pkcs8_encrypt(int pbe_nid, const char *pass, int passlen, |
| @@ -237,4 +237,4 @@ PKCS12_SAFEBAG_create_pkcs8_encrypt(int pbe_nid, const char *pass, int passlen, | |||
| 237 | 237 | ||
| 238 | return bag; | 238 | return bag; |
| 239 | } | 239 | } |
| 240 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_create_pkcs8_encrypt) | 240 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_create_pkcs8_encrypt); |
