diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-08-05 17:32:10 +0200 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-08-05 17:32:10 +0200 |
| commit | bc32dbbea9a5b8eb813cbc76368ceaafe2bcaeed (patch) | |
| tree | ae941b628a8c160245057abd2016f082c73d5ad9 /crypto/pkcs12/pkcs12.h | |
| parent | Update from 1.0.0-stable. (diff) | |
| download | openssl-bc32dbbea9a5b8eb813cbc76368ceaafe2bcaeed.tar.xz openssl-bc32dbbea9a5b8eb813cbc76368ceaafe2bcaeed.zip | |
Oops!
Diffstat (limited to 'crypto/pkcs12/pkcs12.h')
| -rw-r--r-- | crypto/pkcs12/pkcs12.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h index d86f70b471..b17eb9f42b 100644 --- a/crypto/pkcs12/pkcs12.h +++ b/crypto/pkcs12/pkcs12.h @@ -230,11 +230,8 @@ 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) |