generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle CT error macros separately

Browse Source 
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>
This commit is contained in:
Richard Levitte 2015-10-19 04:20:01 +02:00
parent 21cd6e006c
commit cc79f06c0a
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.org
View File

@ -468,6 +468,7 @@ errors:
$(PERL) util/ck_errf.pl -strict */*.c */*/*.c $(PERL) util/ck_errf.pl -strict */*.c */*/*.c
$(PERL) util/mkerr.pl -recurse -write $(PERL) util/mkerr.pl -recurse -write
(cd engines; $(MAKE) PERL=$(PERL) errors) (cd engines; $(MAKE) PERL=$(PERL) errors)
(cd crypto/ct; $(MAKE) PERL=$(PERL) errors)
stacks: stacks:
$(PERL) util/mkstack.pl -write $(PERL) util/mkstack.pl -write

7
crypto/ct/Makefile
View File

@ -15,8 +15,8 @@ CFLAGS= $(INCLUDES) $(CFLAG)
GENERAL=Makefile GENERAL=Makefile
LIB=$(TOP)/libcrypto.a LIB=$(TOP)/libcrypto.a
LIBSRC= ct_lib.c LIBSRC= ct_lib.c ct_err.c
LIBOBJ= ct_lib.o LIBOBJ= ct_lib.o ct_err.o
SRC= $(LIBSRC) SRC= $(LIBSRC)
@ -42,6 +42,9 @@ files:
tags: tags:
ctags $(SRC) ctags $(SRC)
errors:
$(PERL) $(TOP)/util/mkerr.pl -conf ct.ec -hprefix internal/ -write *.c
lint: lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff lint -DLINT $(INCLUDES) $(SRC)>fluff

6
crypto/ct/ct.ec Normal file
View File

@ -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

4
crypto/ct/ct_err.c
View File

@ -1,4 +1,4 @@
/* crypto/ct/ct_err.c */ /* ct_err.c */
/* ==================================================================== /* ====================================================================
* Copyright (c) 1999-2015 The OpenSSL Project. All rights reserved. * Copyright (c) 1999-2015 The OpenSSL Project. All rights reserved.
* *
@ -61,7 +61,7 @@
#include <stdio.h> #include <stdio.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/ct_locl.h> #include <internal/ct_int.h>
/* BEGIN ERROR CODES */ /* BEGIN ERROR CODES */
#ifndef OPENSSL_NO_ERR #ifndef OPENSSL_NO_ERR

1
crypto/err/openssl.ec
View File

@ -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 CMS include/openssl/cms.h crypto/cms/cms_err.c
L JPAKE include/openssl/jpake.h crypto/jpake/jpake_err.c L JPAKE include/openssl/jpake.h crypto/jpake/jpake_err.c
L FIPS include/openssl/fips.h crypto/fips_err.h 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 # additional header files to be scanned for function names
L NONE crypto/x509/x509_vfy.h NONE L NONE crypto/x509/x509_vfy.h NONE