Implement Camellia_set_key properly for FIPS builds. (e6b88d02) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/camellia/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,9 +23,9 @@ APPS=

		LIB=$(TOP)/libcrypto.a
		LIBSRC=camellia.c cmll_misc.c cmll_ecb.c cmll_cbc.c cmll_ofb.c \
		cmll_cfb.c cmll_ctr.c
		cmll_cfb.c cmll_ctr.c cmll_utl.c

		LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o $(CMLL_ENC)
		LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o cmll_utl.o $(CMLL_ENC)

		SRC= $(LIBSRC)

crypto/camellia/asm/cmll-x86.pl

+3 −3

Original line number	Diff line number	Diff line
		@@ -723,11 +723,11 @@ my $bias=int(@T[0])?shift(@T):0;
		&function_end("Camellia_Ekeygen");

		if ($OPENSSL) {
		# int Camellia_set_key (
		# int private_Camellia_set_key (
		# const unsigned char *userKey,
		# int bits,
		# CAMELLIA_KEY *key)
		&function_begin_B("Camellia_set_key");
		&function_begin_B("private_Camellia_set_key");
		&push ("ebx");
		&mov ("ecx",&wparam(0)); # pull arguments
		&mov ("ebx",&wparam(1));
		@@ -760,7 +760,7 @@ if ($OPENSSL) {
		&set_label("done",4);
		&pop ("ebx");
		&ret ();
		&function_end_B("Camellia_set_key");
		&function_end_B("private_Camellia_set_key");
		}

		@SBOX=(

crypto/camellia/cmll_misc.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -56,16 +56,8 @@

		const char CAMELLIA_version[]="CAMELLIA" OPENSSL_VERSION_PTEXT;

		int Camellia_set_key(const unsigned char *userKey, const int bits,
		CAMELLIA_KEY *key)
		#ifdef OPENSSL_FIPS
		{
		fips_cipher_abort(Camellia);
		return private_Camellia_set_key(userKey, bits, key);
		}
		int private_Camellia_set_key(const unsigned char *userKey, const int bits,
		CAMELLIA_KEY *key)
		#endif
		{
		if(!userKey \|\| !key)
		return -1;

crypto/camellia/cmll_utl.c

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		/* crypto/camellia/cmll_utl.c -- mode:C; c-file-style: "eay" -- */
		/* ====================================================================
		* Copyright (c) 2011 The OpenSSL Project. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		*
		* 1. Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		*
		* 2. Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		*
		* 3. All advertising materials mentioning features or use of this
		* software must display the following acknowledgment:
		* "This product includes software developed by the OpenSSL Project
		* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
		*
		* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
		* endorse or promote products derived from this software without
		* prior written permission. For written permission, please contact
		* openssl-core@openssl.org.
		*
		* 5. Products derived from this software may not be called "OpenSSL"
		* nor may "OpenSSL" appear in their names without prior written
		* permission of the OpenSSL Project.
		*
		* 6. Redistributions of any form whatsoever must retain the following
		* acknowledgment:
		* "This product includes software developed by the OpenSSL Project
		* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
		*
		* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
		* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
		* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
		* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
		* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
		* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
		* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
		* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
		* OF THE POSSIBILITY OF SUCH DAMAGE.
		* ====================================================================
		*
		*/

		#include <openssl/opensslv.h>
		#include <openssl/crypto.h>
		#include <openssl/camellia.h>
		#include "cmll_locl.h"

		const char CAMELLIA_version[]="CAMELLIA" OPENSSL_VERSION_PTEXT;

		int Camellia_set_key(const unsigned char *userKey, const int bits,
		CAMELLIA_KEY *key)
		{
		#ifdef OPENSSL_FIPS
		fips_cipher_abort(Camellia);
		#endif
		return private_Camellia_set_key(userKey, bits, key);
		}