diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-08-05 15:29:58 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-08-05 15:29:58 +0000 |
| commit | f10f4447dad668df53d9df65beaa2885f61bc9aa (patch) | |
| tree | 798fe397a706e2ab1e8850939a5cc4864e1a7208 /crypto/pkcs12 | |
| parent | d76b8c89ec218b3ce6c83e27220d2df4d0213599 (diff) | |
Update from 1.0.0-stable.
Diffstat (limited to 'crypto/pkcs12')
| -rw-r--r-- | crypto/pkcs12/pkcs12.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h index b17eb9f42b..d86f70b471 100644 --- a/crypto/pkcs12/pkcs12.h +++ b/crypto/pkcs12/pkcs12.h @@ -230,8 +230,11 @@ int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen, const EVP_MD *md_type); int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen, const EVP_MD *md_type); +<<<<<<< pkcs12.h +======= unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen); char *OPENSSL_uni2asc(unsigned char *uni, int unilen); +>>>>>>> 1.44 DECLARE_ASN1_FUNCTIONS(PKCS12) DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA) |