Commit cc79f06c authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarMatt Caswell <matt@openssl.org>
parent 21cd6e00

Makefile.org

+1 −0
Original line number Diff line number Diff line
@@ -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

crypto/ct/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -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

crypto/ct/ct.ec

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# 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

crypto/ct/ct_err.c

+2 −2
Original line number Diff line number Diff line 
/* 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

crypto/err/openssl.ec

+0 −1
Original line number Diff line number Diff line
@@ -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