Remove duplicate CHANGES text.

[oweals/openssl.git] / include / openssl / pkcs12err.h

diff --git a/include/openssl/pkcs12err.h b/include/openssl/pkcs12err.h
index 6bbd232dccab38b9392f6b536f2ed2c81b0bf94e..eff5eb26028214b1b817ff37edf802b382107971 100644 (file)
--- a/include/openssl/pkcs12err.h
+++ b/include/openssl/pkcs12err.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -11,17 +11,22 @@
 #ifndef HEADER_PKCS12ERR_H
 # define HEADER_PKCS12ERR_H
 
-# ifdef  __cplusplus
-extern "C" {
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
 # endif
-int ERR_load_PKCS12_strings(void);
+
 # ifdef  __cplusplus
-}
+extern "C"
 # endif
+int ERR_load_PKCS12_strings(void);
 
 /*
  * PKCS12 function codes.
  */
+# define PKCS12_F_OPENSSL_ASC2UNI                         121
+# define PKCS12_F_OPENSSL_UNI2ASC                         124
+# define PKCS12_F_OPENSSL_UNI2UTF8                        127
+# define PKCS12_F_OPENSSL_UTF82UNI                        129
 # define PKCS12_F_PKCS12_CREATE                           105
 # define PKCS12_F_PKCS12_GEN_MAC                          107
 # define PKCS12_F_PKCS12_INIT                             109