diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-10-19 04:20:01 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-10-21 23:57:29 +0200 |
| commit | cc79f06c0af2a23cc6f7c01599f484a094b37c3a (patch) | |
| tree | fbe5b86bac0c7dfbca5aa13a2308930778f1f0b1 /crypto/ct | |
| parent | 21cd6e006cc1ea9a1ba13c45c6858118e34604f6 (diff) | |
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>
Diffstat (limited to 'crypto/ct')
| -rw-r--r-- | crypto/ct/Makefile | 7 | ||||
| -rw-r--r-- | crypto/ct/ct.ec | 6 | ||||
| -rw-r--r-- | crypto/ct/ct_err.c | 4 |
3 files changed, 13 insertions, 4 deletions
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 |