Break circular dependency between pem and err.

3 files changed, 68 insertions, 9 deletions

diff --git a/crypto/pem/Makefile.ssl b/crypto/pem/Makefile.ssl
index 42787f1336..e1b1318d08 100644
--- a/crypto/pem/Makefile.ssl
+++ b/crypto/pem/Makefile.ssl
@@ -30,7 +30,7 @@ LIBOBJ=	pem_sign.o pem_seal.o pem_info.o pem_lib.o pem_all.o $(ERRC).o
 
 SRC= $(LIBSRC)
 
-EXHEADER= pem.h
+EXHEADER= pem.h pem2.h
 HEADER=	$(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
@@ -115,7 +115,7 @@ pem_all.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 pem_all.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 pem_all.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 pem_all.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-pem_all.o: ../cryptlib.h ../crypto.h pem.h
+pem_all.o: ../cryptlib.h ../crypto.h pem.h pem2.h
 pem_err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 pem_err.o: ../../include/bn.h ../../include/cast.h ../../include/des.h
 pem_err.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h
@@ -124,7 +124,7 @@ pem_err.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
 pem_err.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
 pem_err.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 pem_err.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-pem_err.o: ../../include/x509_vfy.h ../crypto.h pem.h
+pem_err.o: ../../include/x509_vfy.h ../crypto.h pem.h pem2.h
 pem_info.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 pem_info.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 pem_info.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -134,7 +134,7 @@ pem_info.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 pem_info.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 pem_info.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 pem_info.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-pem_info.o: ../cryptlib.h ../crypto.h pem.h
+pem_info.o: ../cryptlib.h ../crypto.h pem.h pem2.h
 pem_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 pem_lib.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 pem_lib.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -144,7 +144,7 @@ pem_lib.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 pem_lib.o: ../../include/rand.h ../../include/rc2.h ../../include/rc4.h
 pem_lib.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 pem_lib.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-pem_lib.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h pem.h
+pem_lib.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h pem.h pem2.h
 pem_seal.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 pem_seal.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 pem_seal.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -154,7 +154,7 @@ pem_seal.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 pem_seal.o: ../../include/rand.h ../../include/rc2.h ../../include/rc4.h
 pem_seal.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 pem_seal.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-pem_seal.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h pem.h
+pem_seal.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h pem.h pem2.h
 pem_sign.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 pem_sign.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 pem_sign.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -164,4 +164,4 @@ pem_sign.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 pem_sign.o: ../../include/rand.h ../../include/rc2.h ../../include/rc4.h
 pem_sign.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 pem_sign.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-pem_sign.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h pem.h
+pem_sign.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h pem.h pem2.h
diff --git a/crypto/pem/pem.org b/crypto/pem/pem.org
index 37d19021e1..3d78699ffd 100644
--- a/crypto/pem/pem.org
+++ b/crypto/pem/pem.org
@@ -73,6 +73,7 @@ extern "C" {
 
 #include "evp.h"
 #include "x509.h"
+#include "pem2.h"
 
 #define PEM_OBJ_UNDEF		0
 #define PEM_OBJ_X509		1
@@ -397,8 +398,6 @@ void    PEM_SignUpdate(EVP_MD_CTX *ctx,unsigned char *d,unsigned int cnt);
 int	PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
 		unsigned int *siglen, EVP_PKEY *pkey);
 
-void	ERR_load_PEM_strings(void);
-
 void	PEM_proc_type(char *buf, int type);
 void	PEM_dek_info(char *buf, char *type, int len, char *str);
 
diff --git a/crypto/pem/pem2.h b/crypto/pem/pem2.h
new file mode 100644
index 0000000000..4a016aacd2
--- /dev/null
+++ b/crypto/pem/pem2.h
@@ -0,0 +1,60 @@
+/* ====================================================================
+ * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+/*
+ * This header only exists to break a circular dependency between pem and err
+ * Ben 30 Jan 1999.
+ */
+
+void ERR_load_PEM_strings(void);