From bb756eebdac6fd24e8919e2c43f7d2c8c4091f59 Mon Sep 17 00:00:00 2001 From: RajithaY Date: Tue, 25 Apr 2017 03:31:15 -0700 Subject: Adding qemu as a submodule of KVMFORNFV This Patch includes the changes to add qemu as a submodule to kvmfornfv repo and make use of the updated latest qemu for the execution of all testcase Change-Id: I1280af507a857675c7f81d30c95255635667bdd7 Signed-off-by:RajithaY --- qemu/roms/ipxe/src/crypto/privkey.c | 122 ------------------------------------ 1 file changed, 122 deletions(-) delete mode 100644 qemu/roms/ipxe/src/crypto/privkey.c (limited to 'qemu/roms/ipxe/src/crypto/privkey.c') diff --git a/qemu/roms/ipxe/src/crypto/privkey.c b/qemu/roms/ipxe/src/crypto/privkey.c deleted file mode 100644 index a6043bd1e..000000000 --- a/qemu/roms/ipxe/src/crypto/privkey.c +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright (C) 2012 Michael Brown . - * - * 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 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 -#include -#include -#include -#include -#include -#include - -/** @file - * - * Private key - * - * Life would in theory be easier if we could use a single file to - * hold both the certificate and corresponding private key. - * Unfortunately, the only common format which supports this is - * PKCS#12 (aka PFX), which is too ugly to be allowed anywhere near my - * codebase. See, for reference and amusement: - * - * http://www.cs.auckland.ac.nz/~pgut001/pubs/pfx.html - */ - -/* Allow private key to be overridden if not explicitly specified */ -#ifdef PRIVATE_KEY -#define ALLOW_KEY_OVERRIDE 0 -#else -#define ALLOW_KEY_OVERRIDE 1 -#endif - -/* Raw private key data */ -extern char private_key_data[]; -extern char private_key_len[]; -__asm__ ( ".section \".rodata\", \"a\", @progbits\n\t" - "\nprivate_key_data:\n\t" -#ifdef PRIVATE_KEY - ".incbin \"" PRIVATE_KEY "\"\n\t" -#endif /* PRIVATE_KEY */ - ".size private_key_data, ( . - private_key_data )\n\t" - ".equ private_key_len, ( . - private_key_data )\n\t" - ".previous\n\t" ); - -/** Private key */ -struct asn1_cursor private_key = { - .data = private_key_data, - .len = ( ( size_t ) private_key_len ), -}; - -/** Private key setting */ -static struct setting privkey_setting __setting ( SETTING_CRYPTO, privkey ) = { - .name = "privkey", - .description = "Private key", - .tag = DHCP_EB_KEY, - .type = &setting_type_hex, -}; - -/** - * Apply private key configuration settings - * - * @ret rc Return status code - */ -static int privkey_apply_settings ( void ) { - static void *key_data = NULL; - int len; - - /* Allow private key to be overridden only if not explicitly - * specified at build time. - */ - if ( ALLOW_KEY_OVERRIDE ) { - - /* Restore default private key */ - private_key.data = private_key_data; - private_key.len = ( ( size_t ) private_key_len ); - - /* Fetch new private key, if any */ - free ( key_data ); - if ( ( len = fetch_raw_setting_copy ( NULL, &privkey_setting, - &key_data ) ) >= 0 ) { - private_key.data = key_data; - private_key.len = len; - } - } - - /* Debug */ - if ( private_key.len ) { - DBGC ( &private_key, "PRIVKEY using %s private key:\n", - ( key_data ? "external" : "built-in" ) ); - DBGC_HDA ( &private_key, 0, private_key.data, private_key.len ); - } else { - DBGC ( &private_key, "PRIVKEY has no private key\n" ); - } - - return 0; -} - -/** Private key settings applicator */ -struct settings_applicator privkey_applicator __settings_applicator = { - .apply = privkey_apply_settings, -}; -- cgit 1.2.3-korg