Oops!
authorDr. Stephen Henson <steve@openssl.org>
Wed, 5 Aug 2009 15:32:10 +0000 (15:32 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 5 Aug 2009 15:32:10 +0000 (15:32 +0000)
crypto/pkcs12/pkcs12.h

index d86f70b..b17eb9f 100644 (file)
@@ -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)