From cc79f06c0af2a23cc6f7c01599f484a094b37c3a Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Mon, 19 Oct 2015 04:20:01 +0200
Subject: [PATCH] Handle CT error macros separately

Because the default error macro generator assumes the header file with
error macros is in include/openssl and therefore generates a C file
with error texts that include <openssl/{name}.h>, we need to generate
the error macros and texts for CT separately, since the CT module
doesn't follow the default criteria.

Reviewed-by: Matt Caswell <matt@openssl.org>
---
 Makefile.org          | 1 +
 crypto/ct/Makefile    | 7 +++++--
 crypto/ct/ct.ec       | 6 ++++++
 crypto/ct/ct_err.c    | 4 ++--
 crypto/err/openssl.ec | 1 -
 5 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 crypto/ct/ct.ec

diff --git a/Makefile.org b/Makefile.org
index 5aa721f277..629cdaeffd 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -468,6 +468,7 @@ errors:
 	$(PERL) util/ck_errf.pl -strict */*.c */*/*.c
 	$(PERL) util/mkerr.pl -recurse -write
 	(cd engines; $(MAKE) PERL=$(PERL) errors)
+	(cd crypto/ct; $(MAKE) PERL=$(PERL) errors)
 
 stacks:
 	$(PERL) util/mkstack.pl -write
diff --git a/crypto/ct/Makefile b/crypto/ct/Makefile
index 8d6e6b7b9b..813e5baaed 100644
--- a/crypto/ct/Makefile
+++ b/crypto/ct/Makefile
@@ -15,8 +15,8 @@ CFLAGS= $(INCLUDES) $(CFLAG)
 GENERAL=Makefile
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC= ct_lib.c
-LIBOBJ= ct_lib.o
+LIBSRC= ct_lib.c ct_err.c
+LIBOBJ= ct_lib.o ct_err.o
 
 SRC= $(LIBSRC)
 
@@ -42,6 +42,9 @@ files:
 tags:
 	ctags $(SRC)
 
+errors:
+	$(PERL) $(TOP)/util/mkerr.pl -conf ct.ec -hprefix internal/ -write *.c
+
 lint:
 	lint -DLINT $(INCLUDES) $(SRC)>fluff
 
diff --git a/crypto/ct/ct.ec b/crypto/ct/ct.ec
new file mode 100644
index 0000000000..6f50f9abc4
--- /dev/null
+++ b/crypto/ct/ct.ec
@@ -0,0 +1,6 @@
+# crypto/ct/ct.ec
+
+# configuration file for util/mkerr.pl
+
+# files that may have to be rewritten by util/mkerr.pl
+L CT	../../crypto/include/internal/ct_int.h		ct_err.c
diff --git a/crypto/ct/ct_err.c b/crypto/ct/ct_err.c
index d2781c5b5f..df79252449 100644
--- a/crypto/ct/ct_err.c
+++ b/crypto/ct/ct_err.c
@@ -1,4 +1,4 @@
-/* crypto/ct/ct_err.c */
+/* ct_err.c */
 /* ====================================================================
  * Copyright (c) 1999-2015 The OpenSSL Project.  All rights reserved.
  *
@@ -61,7 +61,7 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include <openssl/ct_locl.h>
+#include <internal/ct_int.h>
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec
index 08b0c0ba29..8a10b80b04 100644
--- a/crypto/err/openssl.ec
+++ b/crypto/err/openssl.ec
@@ -36,7 +36,6 @@ L HMAC		include/openssl/hmac.h		crypto/hmac/hmac_err.c
 L CMS		include/openssl/cms.h		crypto/cms/cms_err.c
 L JPAKE		include/openssl/jpake.h		crypto/jpake/jpake_err.c
 L FIPS		include/openssl/fips.h		crypto/fips_err.h
-L CT		crypto/ct/ct_locl.h		crypto/ct/ct_err.c
 
 # additional header files to be scanned for function names
 L NONE		crypto/x509/x509_vfy.h		NONE
-- 
2.25.1