Commit 03e389cf authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Allow for dynamic base in Win64 FIPS module.

parent 93256bf5

crypto/aes/aes_core.c

+10 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ Td3[x] = Si[x].[09, 0d, 0b, 0e]; 
Td4[x] = Si[x].[01];

*/



__fips_constseg

static const u32 Te0[256] = {

    0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,

    0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
@@ -120,6 +121,7 @@ static const u32 Te0[256] = { 
    0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,

    0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,

};

__fips_constseg

static const u32 Te1[256] = {

    0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,

    0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
@@ -186,6 +188,7 @@ static const u32 Te1[256] = { 
    0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,

    0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,

};

__fips_constseg

static const u32 Te2[256] = {

    0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,

    0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
@@ -252,6 +255,7 @@ static const u32 Te2[256] = { 
    0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,

    0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,

};

__fips_constseg

static const u32 Te3[256] = {

    0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,

    0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
@@ -319,6 +323,7 @@ static const u32 Te3[256] = { 
    0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,

};



__fips_constseg

static const u32 Td0[256] = {

    0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,

    0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
@@ -385,6 +390,7 @@ static const u32 Td0[256] = { 
    0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,

    0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,

};

__fips_constseg

static const u32 Td1[256] = {

    0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,

    0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
@@ -451,6 +457,7 @@ static const u32 Td1[256] = { 
    0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,

    0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,

};

__fips_constseg

static const u32 Td2[256] = {

    0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,

    0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
@@ -517,6 +524,7 @@ static const u32 Td2[256] = { 
    0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,

    0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,

};

__fips_constseg

static const u32 Td3[256] = {

    0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,

    0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
@@ -583,6 +591,7 @@ static const u32 Td3[256] = { 
    0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,

    0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,

};

__fips_constseg

static const u8 Td4[256] = {

    0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,

    0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
@@ -617,6 +626,7 @@ static const u8 Td4[256] = { 
    0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,

    0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU,

};

__fips_constseg

static const u32 rcon[] = {

	0x01000000, 0x02000000, 0x04000000, 0x08000000,

	0x10000000, 0x20000000, 0x40000000, 0x80000000,

crypto/bn/bn_gf2m.c

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
/* Maximum number of iterations before BN_GF2m_mod_solve_quad_arr should fail. */

#define MAX_ITERATIONS 50



__fips_constseg

static const BN_ULONG SQR_tb[16] =

  {     0,     1,     4,     5,    16,    17,    20,    21,

       64,    65,    68,    69,    80,    81,    84,    85 };

crypto/bn/bn_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
#include "cryptlib.h"

#include "bn_lcl.h"



__fips_constseg

const char BN_version[]="Big Number" OPENSSL_VERSION_PTEXT;



/* This stuff appears to be completely unused, so is deprecated */
@@ -143,6 +144,7 @@ const BIGNUM *BN_value_one(void) 


int BN_num_bits_word(BN_ULONG l)

	{

	__fips_constseg

	static const unsigned char bits[256]={

		0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,

		5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,

crypto/bn/bn_nist.c

+20 −0
Original line number Diff line number Diff line
@@ -68,27 +68,32 @@ 


/* pre-computed tables are "carry-less" values of modulus*(i+1) */

#if BN_BITS2 == 64

__fips_constseg

static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = {

	{0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFFULL},

	{0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFDULL,0xFFFFFFFFFFFFFFFFULL},

	{0xFFFFFFFFFFFFFFFDULL,0xFFFFFFFFFFFFFFFCULL,0xFFFFFFFFFFFFFFFFULL}

	};

__fips_constseg

static const BN_ULONG _nist_p_192_sqr[] = {

	0x0000000000000001ULL,0x0000000000000002ULL,0x0000000000000001ULL,

	0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFDULL,0xFFFFFFFFFFFFFFFFULL

	};

__fips_constseg

static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = {

	{0x0000000000000001ULL,0xFFFFFFFF00000000ULL,

	 0xFFFFFFFFFFFFFFFFULL,0x00000000FFFFFFFFULL},

	{0x0000000000000002ULL,0xFFFFFFFE00000000ULL,

	 0xFFFFFFFFFFFFFFFFULL,0x00000001FFFFFFFFULL} /* this one is "carry-full" */

	};

__fips_constseg

static const BN_ULONG _nist_p_224_sqr[] = {

	0x0000000000000001ULL,0xFFFFFFFE00000000ULL,

	0xFFFFFFFFFFFFFFFFULL,0x0000000200000000ULL,

	0x0000000000000000ULL,0xFFFFFFFFFFFFFFFEULL,

	0xFFFFFFFFFFFFFFFFULL

	};

__fips_constseg

static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {

	{0xFFFFFFFFFFFFFFFFULL,0x00000000FFFFFFFFULL,

	 0x0000000000000000ULL,0xFFFFFFFF00000001ULL},
@@ -101,12 +106,14 @@ static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = { 
	{0xFFFFFFFFFFFFFFFBULL,0x00000004FFFFFFFFULL,

	 0x0000000000000000ULL,0xFFFFFFFB00000005ULL},

	};

__fips_constseg

static const BN_ULONG _nist_p_256_sqr[] = {

	0x0000000000000001ULL,0xFFFFFFFE00000000ULL,

	0xFFFFFFFFFFFFFFFFULL,0x00000001FFFFFFFEULL,

	0x00000001FFFFFFFEULL,0x00000001FFFFFFFEULL,

	0xFFFFFFFE00000001ULL,0xFFFFFFFE00000002ULL

	};

__fips_constseg

static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {

	{0x00000000FFFFFFFFULL,0xFFFFFFFF00000000ULL,0xFFFFFFFFFFFFFFFEULL,

	 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL},
@@ -119,18 +126,21 @@ static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = { 
	{0x00000004FFFFFFFBULL,0xFFFFFFFB00000000ULL,0xFFFFFFFFFFFFFFFAULL,

	 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL},

	};

__fips_constseg

static const BN_ULONG _nist_p_384_sqr[] = {

	0xFFFFFFFE00000001ULL,0x0000000200000000ULL,0xFFFFFFFE00000000ULL,

	0x0000000200000000ULL,0x0000000000000001ULL,0x0000000000000000ULL,

	0x00000001FFFFFFFEULL,0xFFFFFFFE00000000ULL,0xFFFFFFFFFFFFFFFDULL,

	0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL

	};

__fips_constseg

static const BN_ULONG _nist_p_521[] =

	{0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,

	0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,

	0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,

	0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,

	0x00000000000001FFULL};

__fips_constseg

static const BN_ULONG _nist_p_521_sqr[] = {

	0x0000000000000001ULL,0x0000000000000000ULL,0x0000000000000000ULL,

	0x0000000000000000ULL,0x0000000000000000ULL,0x0000000000000000ULL,
@@ -140,27 +150,32 @@ static const BN_ULONG _nist_p_521_sqr[] = { 
	0xFFFFFFFFFFFFFFFFULL,0x000000000003FFFFULL

	};

#elif BN_BITS2 == 32

__fips_constseg

static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = {

	{0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},

	{0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},

	{0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFC,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}

	};

__fips_constseg

static const BN_ULONG _nist_p_192_sqr[] = {

	0x00000001,0x00000000,0x00000002,0x00000000,0x00000001,0x00000000,

	0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF

	};

__fips_constseg

static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = {

	{0x00000001,0x00000000,0x00000000,0xFFFFFFFF,

	 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},

	{0x00000002,0x00000000,0x00000000,0xFFFFFFFE,

	 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}

	};

__fips_constseg

static const BN_ULONG _nist_p_224_sqr[] = {

	0x00000001,0x00000000,0x00000000,0xFFFFFFFE,

	0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000002,

	0x00000000,0x00000000,0xFFFFFFFE,0xFFFFFFFF,

	0xFFFFFFFF,0xFFFFFFFF

	};

__fips_constseg

static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {

	{0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0x00000000,

	 0x00000000,0x00000000,0x00000001,0xFFFFFFFF},
@@ -173,12 +188,14 @@ static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = { 
	{0xFFFFFFFB,0xFFFFFFFF,0xFFFFFFFF,0x00000004,

	 0x00000000,0x00000000,0x00000005,0xFFFFFFFB},

	};

__fips_constseg

static const BN_ULONG _nist_p_256_sqr[] = {

	0x00000001,0x00000000,0x00000000,0xFFFFFFFE,

	0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFE,0x00000001,

	0xFFFFFFFE,0x00000001,0xFFFFFFFE,0x00000001,

	0x00000001,0xFFFFFFFE,0x00000002,0xFFFFFFFE

	};

__fips_constseg

static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {

	{0xFFFFFFFF,0x00000000,0x00000000,0xFFFFFFFF,0xFFFFFFFE,0xFFFFFFFF,

	 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},
@@ -191,16 +208,19 @@ static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = { 
	{0xFFFFFFFB,0x00000004,0x00000000,0xFFFFFFFB,0xFFFFFFFA,0xFFFFFFFF,

	 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},

	};

__fips_constseg

static const BN_ULONG _nist_p_384_sqr[] = {

	0x00000001,0xFFFFFFFE,0x00000000,0x00000002,0x00000000,0xFFFFFFFE,

	0x00000000,0x00000002,0x00000001,0x00000000,0x00000000,0x00000000,

	0xFFFFFFFE,0x00000001,0x00000000,0xFFFFFFFE,0xFFFFFFFD,0xFFFFFFFF,

	0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF

	};

__fips_constseg

static const BN_ULONG _nist_p_521[] = {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,

	0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,

	0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,

	0xFFFFFFFF,0x000001FF};

__fips_constseg

static const BN_ULONG _nist_p_521_sqr[] = {

	0x00000001,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,

	0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,

crypto/bn/bn_prime.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ typedef unsigned short prime_t; 
#define NUMPRIMES 54

typedef unsigned char prime_t;

#endif

__fips_constseg

static const prime_t primes[NUMPRIMES]=

	{

	   2,   3,   5,   7,  11,  13,  17,  19,