sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-20 12:00:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

[crypto] Enable both DER and PEM formats by default

Browse Source 
Enable both IMAGE_DER and IMAGE_PEM by default, and drag in the
relevant objects only when image_asn1() is present in the binary.

This allows "imgverify" to transparently use either DER or PEM
signature files.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2016-07-29 15:40:39 +01:00
parent b7e43b0335
commit 942b798c8d
5 changed files with 83 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/config/config.c
View File

@@ -188,12 +188,6 @@ REQUIRE_OBJECT ( pnm );
#ifdef IMAGE_PNG
REQUIRE_OBJECT ( png );
#endif
#ifdef IMAGE_DER
REQUIRE_OBJECT ( der );
#endif
#ifdef IMAGE_PEM
REQUIRE_OBJECT ( pem );
#endif
/*
* Drag in all requested commands

39
src/config/config_asn1.c Normal file
View File

@@ -0,0 +1,39 @@
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*
* You can also choose to distribute this program under the terms of
* the Unmodified Binary Distribution Licence (as given in the file
* COPYING.UBDL), provided that you have satisfied its requirements.
*/
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include <config/general.h>
/** @file
*
* ASN.1 file format configuration
*
*/
PROVIDE_REQUIRING_SYMBOL();
#ifdef IMAGE_DER
REQUIRE_OBJECT ( der );
#endif
#ifdef IMAGE_PEM
REQUIRE_OBJECT ( pem );
#endif

4
src/config/general.h
View File

@@ -112,8 +112,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
//#define IMAGE_SDI /* SDI image support */
//#define IMAGE_PNM /* PNM image support */
//#define IMAGE_PNG /* PNG image support */
//#define IMAGE_DER /* DER image support */
//#define IMAGE_PEM /* PEM image support */
#define IMAGE_DER /* DER image support */
#define IMAGE_PEM /* PEM image support */
/*
* Command-line commands to include