crypto/pkcs12: facilitate accessing data with non-interoperable password.

[thirdparty/openssl.git] / include / openssl / pkcs12.h

diff --git a/include/openssl/pkcs12.h b/include/openssl/pkcs12.h
index 37e2847b3fb89678f4598ba0d9360b504e6640d9..deaded9df921f4325327406c1527d39dda870474 100644 (file)
--- a/include/openssl/pkcs12.h
+++ b/include/openssl/pkcs12.h
@@ -30,19 +30,9 @@ extern "C" {
 
 # define PKCS12_SALT_LEN 8
 
-/* Uncomment out next line for unicode password and names, otherwise ASCII */
-
-/*
- * #define PBE_UNICODE
- */
-
-# ifdef PBE_UNICODE
-#  define PKCS12_key_gen PKCS12_key_gen_uni
-#  define PKCS12_add_friendlyname PKCS12_add_friendlyname_uni
-# else
-#  define PKCS12_key_gen PKCS12_key_gen_utf8
-#  define PKCS12_add_friendlyname PKCS12_add_friendlyname_utf8
-# endif
+/* It's not clear if these are actually needed... */
+# define PKCS12_key_gen PKCS12_key_gen_utf8
+# define PKCS12_add_friendlyname PKCS12_add_friendlyname_utf8
 
 /* MS key usage constants */