diff options
| author | tb <> | 2024-01-25 10:53:05 +0000 |
|---|---|---|
| committer | tb <> | 2024-01-25 10:53:05 +0000 |
| commit | 23a215cf6cda61735356a8aceabe6ec889c91f9e (patch) | |
| tree | 9135fda44a77cc964ef492ad5efccc461b1c64b3 /src | |
| parent | 47f2c1160df35b675366e1364db0fa3c2653082e (diff) | |
| download | openbsd-23a215cf6cda61735356a8aceabe6ec889c91f9e.tar.gz openbsd-23a215cf6cda61735356a8aceabe6ec889c91f9e.tar.bz2 openbsd-23a215cf6cda61735356a8aceabe6ec889c91f9e.zip | |
Rename pkcs12_repack_safe() into pkcs12_repack_authsafes()
discussed with jsing
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_npas.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_npas.c b/src/lib/libcrypto/pkcs12/p12_npas.c index b0858b6f2b..23a5c5e768 100644 --- a/src/lib/libcrypto/pkcs12/p12_npas.c +++ b/src/lib/libcrypto/pkcs12/p12_npas.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: p12_npas.c,v 1.21 2024/01/25 10:44:39 tb Exp $ */ | 1 | /* $OpenBSD: p12_npas.c,v 1.22 2024/01/25 10:53:05 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 | */ |
| @@ -165,7 +165,7 @@ pkcs7_repack_encdata(PKCS7 *pkcs7, STACK_OF(PKCS7) *newsafes, const char *oldpas | |||
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | static int | 167 | static int |
| 168 | pkcs12_repack_safe(PKCS12 *pkcs12, STACK_OF(PKCS7) *newsafes, | 168 | pkcs12_repack_authsafes(PKCS12 *pkcs12, STACK_OF(PKCS7) *newsafes, |
| 169 | const char *newpass) | 169 | const char *newpass) |
| 170 | { | 170 | { |
| 171 | ASN1_OCTET_STRING *old_data; | 171 | ASN1_OCTET_STRING *old_data; |
| @@ -234,7 +234,7 @@ newpass_p12(PKCS12 *p12, const char *oldpass, const char *newpass) | |||
| 234 | } | 234 | } |
| 235 | } | 235 | } |
| 236 | 236 | ||
| 237 | if (!pkcs12_repack_safe(p12, newsafes, newpass)) | 237 | if (!pkcs12_repack_authsafes(p12, newsafes, newpass)) |
| 238 | goto err; | 238 | goto err; |
| 239 | 239 | ||
| 240 | ret = 1; | 240 | ret = 1; |
