[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Wed Oct 21 22:05:44 UTC 2015
The branch master has been updated
via 15db6a40d3569789329d3f6f84e47e0e0e8f9caa (commit)
via a0e8da5d92718052343146e5b5ed85c2fe74492b (commit)
via cc79f06c0af2a23cc6f7c01599f484a094b37c3a (commit)
from 21cd6e006cc1ea9a1ba13c45c6858118e34604f6 (commit)
- Log -----------------------------------------------------------------
commit 15db6a40d3569789329d3f6f84e47e0e0e8f9caa
Author: Richard Levitte <levitte at openssl.org>
Date: Mon Oct 19 20:53:14 2015 +0200
make update
Reviewed-by: Matt Caswell <matt at openssl.org>
commit a0e8da5d92718052343146e5b5ed85c2fe74492b
Author: Richard Levitte <levitte at openssl.org>
Date: Mon Oct 19 05:24:16 2015 +0200
Don't forget to load the CT error strings
Reviewed-by: Matt Caswell <matt at openssl.org>
commit cc79f06c0af2a23cc6f7c01599f484a094b37c3a
Author: Richard Levitte <levitte at openssl.org>
Date: Mon Oct 19 04:20:01 2015 +0200
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 at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Makefile.org | 1 +
crypto/ct/Makefile | 14 ++++++++++++--
crypto/ct/ct.ec | 6 ++++++
crypto/ct/ct_err.c | 4 ++--
crypto/err/Makefile | 3 ++-
crypto/err/err_all.c | 4 ++++
crypto/err/openssl.ec | 1 -
7 files changed, 27 insertions(+), 6 deletions(-)
create mode 100644 crypto/ct/ct.ec
diff --git a/Makefile.org b/Makefile.org
index 5aa721f..629cdae 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 8d6e6b7..2f55a2d 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
@@ -60,6 +63,13 @@ clean:
# DO NOT DELETE THIS LINE -- make depend depends on it.
+ct_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
+ct_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+ct_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+ct_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ct_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ct_err.o: ../../include/openssl/symhacks.h ../include/internal/ct_int.h
+ct_err.o: ct_err.c
ct_lib.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
ct_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
ct_lib.o: ../../include/openssl/comp.h ../../include/openssl/crypto.h
diff --git a/crypto/ct/ct.ec b/crypto/ct/ct.ec
new file mode 100644
index 0000000..6f50f9a
--- /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 d2781c5..df79252 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/Makefile b/crypto/err/Makefile
index e384e62..dcd7347 100644
--- a/crypto/err/Makefile
+++ b/crypto/err/Makefile
@@ -86,7 +86,8 @@ err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
err_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
err_all.o: ../../include/openssl/ts.h ../../include/openssl/ui.h
err_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-err_all.o: ../../include/openssl/x509v3.h err_all.c
+err_all.o: ../../include/openssl/x509v3.h ../include/internal/ct_int.h
+err_all.o: err_all.c
err_prn.o: ../../e_os.h ../../include/openssl/bio.h
err_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index b844167..d9a2a57 100644
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -105,6 +105,7 @@
#ifndef OPENSSL_NO_JPAKE
# include <openssl/jpake.h>
#endif
+#include <internal/ct_int.h>
void ERR_load_crypto_strings(void)
{
@@ -161,5 +162,8 @@ void ERR_load_crypto_strings(void)
# ifndef OPENSSL_NO_JPAKE
ERR_load_JPAKE_strings();
# endif
+# ifndef OPENSSL_NO_CT
+ ERR_load_CT_strings();
+# endif
#endif
}
diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec
index 08b0c0b..8a10b80 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
More information about the openssl-commits
mailing list