Compare commits
13 Commits
OpenSSL-fi
...
OpenSSL-fi
| Author | SHA1 | Date | |
|---|---|---|---|
|
7447e65fcc | ||
|
|
60cd2b7206 | ||
|
|
7fb7844f3b | ||
|
|
005563bbce | ||
|
|
3b43568d5b | ||
|
|
2659a2aa7c | ||
|
|
200f249b8c | ||
|
|
4089bd6080 | ||
|
|
baab0cf780 | ||
|
|
7e98d95f56 | ||
|
|
b0ee17ad47 | ||
|
|
4f6c4c1896 | ||
|
|
2d183e4c44 |
@@ -356,6 +356,7 @@ my %table=(
|
||||
"linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
"linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
|
||||
"linux-x86_64-cross", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DFIPS_REF_POINT_IS_CROSS_COMPILER_AWARE::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
|
||||
"linux64-s390x", "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
|
||||
#### So called "highgprs" target for z/Architecture CPUs
|
||||
# "Highgprs" is kernel feature first implemented in Linux 2.6.32, see
|
||||
@@ -397,6 +398,8 @@ my %table=(
|
||||
"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
"linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
|
||||
"linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
|
||||
# eCos ARMv4/5
|
||||
"ecos-armv4", "gcc:-D__ECOS__ -I\$(ECOSCFG)/include -Wall -Wpointer-arith -Wstrict-prototypes -Wundef -Wno-write-strings -mno-thumb-interwork -mcpu=arm926ej-s -g -O2 -fno-exceptions::-D_REENTRANT::-nostartfiles -L\$(ECOSCFG)/lib -Ttarget.ld::".eval{my $asm=$armv4_asm;$asm=~s/armcap.o//;$asm},
|
||||
|
||||
# Android: linux-* but without -DTERMIO and pointers to headers and libs.
|
||||
"android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
@@ -409,6 +412,8 @@ my %table=(
|
||||
"BSD-x86-elf", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
"debug-BSD-x86-elf", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
"BSD-sparcv8", "gcc:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
"BSD-ppc85xx","gcc:-DTERMIOS -O3 -fomit-frame-pointer -msoft-float -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
"debug-BSD-ppc85xx","gcc:-DTERMIOS -O0 -fomit-frame-pointer -msoft-float -Wall -g::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
|
||||
"BSD-generic64","gcc:-DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
# -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
|
||||
@@ -429,6 +434,7 @@ my %table=(
|
||||
# QNX
|
||||
"qnx4", "cc:-DL_ENDIAN -DTERMIO::(unknown):::${x86_gcc_des} ${x86_gcc_opts}:",
|
||||
"QNX6", "gcc:-DTERMIOS::::-lsocket::${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
"QNX6-armv4", "gcc:-DTERMIOS -O2 -Wall:::::BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
"QNX6-i386", "gcc:-DL_ENDIAN -DTERMIOS -O2 -Wall::::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
|
||||
# BeOS
|
||||
@@ -580,6 +586,7 @@ my %table=(
|
||||
"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
# iPhoneOS/iOS
|
||||
"iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
"ios64-cross","clang:-O3 -arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR -RC4_CHUNK DES_INT DES_UNROLL -BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
|
||||
##### A/UX
|
||||
"aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
|
||||
|
||||
48
config
48
config
@@ -134,6 +134,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
|
||||
echo "${MACHINE}-dg-dgux"; exit 0
|
||||
;;
|
||||
|
||||
ecos:*)
|
||||
echo "${MACHINE}-whatever-ecos"; exit 0
|
||||
;;
|
||||
|
||||
HI-UX:*)
|
||||
echo "${MACHINE}-hi-hiux"; exit 0
|
||||
;;
|
||||
@@ -162,6 +166,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
|
||||
echo "mips4-sgi-irix64"; exit 0
|
||||
;;
|
||||
|
||||
Linux:[2-9].*:cross:x86_64)
|
||||
echo "${MACHINE}-cross-linux"; exit 0
|
||||
;;
|
||||
|
||||
Linux:[2-9].*)
|
||||
echo "${MACHINE}-whatever-linux2"; exit 0
|
||||
;;
|
||||
@@ -219,7 +227,11 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
|
||||
;;
|
||||
|
||||
NetBSD:*:*:*386*)
|
||||
echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
|
||||
if [ -z ${CROSS_COMPILE} ]; then
|
||||
echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
|
||||
else
|
||||
echo "${MACHINE}-whatever-netbsd"; exit 0
|
||||
fi
|
||||
;;
|
||||
|
||||
NetBSD:*)
|
||||
@@ -572,6 +584,9 @@ case "$GUESSOS" in
|
||||
*-*-iphoneos)
|
||||
options="$options -arch%20${MACHINE}"
|
||||
OUT="iphoneos-cross" ;;
|
||||
arm64-*-ios64)
|
||||
options="$options -arch%20${MACHINE}"
|
||||
OUT="ios64-cross" ;;
|
||||
alpha-*-linux2)
|
||||
ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
|
||||
case ${ISA:-generic} in
|
||||
@@ -641,6 +656,7 @@ case "$GUESSOS" in
|
||||
|
||||
options="$options -DB_ENDIAN -mschedule=$CPUSCHEDULE -march=$CPUARCH"
|
||||
OUT="linux-generic32" ;;
|
||||
armv[45]*-*-ecos) OUT="ecos-armv4" ;;
|
||||
armv[1-3]*-*-linux2) OUT="linux-generic32" ;;
|
||||
armv[7-9]*-*-linux2) OUT="linux-armv4"; options="$options -march=armv7-a" ;;
|
||||
arm*-*-linux2) OUT="linux-armv4" ;;
|
||||
@@ -675,6 +691,7 @@ case "$GUESSOS" in
|
||||
fi ;;
|
||||
*-*-linux1) OUT="linux-aout" ;;
|
||||
*-*-linux2) OUT="linux-generic32" ;;
|
||||
*-cross-linux) OUT="linux-x86_64-cross" ;;
|
||||
sun4[uv]*-*-solaris2)
|
||||
OUT="solaris-sparcv9-$CC"
|
||||
ISA64=`(isalist) 2>/dev/null | grep sparcv9`
|
||||
@@ -734,17 +751,23 @@ case "$GUESSOS" in
|
||||
sparc64-*-*bsd*) OUT="BSD-sparc64" ;;
|
||||
ia64-*-*bsd*) OUT="BSD-ia64" ;;
|
||||
amd64-*-*bsd*) OUT="BSD-x86_64" ;;
|
||||
*86*-*-*bsd*) # mimic ld behaviour when it's looking for libc...
|
||||
if [ -L /usr/lib/libc.so ]; then # [Free|Net]BSD
|
||||
libc=/usr/lib/libc.so
|
||||
else # OpenBSD
|
||||
# ld searches for highest libc.so.* and so do we
|
||||
libc=`(ls /usr/lib/libc.so.* | tail -1) 2>/dev/null`
|
||||
fi
|
||||
case "`(file -L $libc) 2>/dev/null`" in
|
||||
*ELF*) OUT="BSD-x86-elf" ;;
|
||||
*) OUT="BSD-x86"; options="$options no-sse2" ;;
|
||||
esac ;;
|
||||
*86*-*-*bsd*) if [ -z ${CROSS_COMPILE} ]; then
|
||||
# mimic ld behaviour when it's looking for libc...
|
||||
if [ -L /usr/lib/libc.so ]; then # [Free|Net]BSD
|
||||
libc=/usr/lib/libc.so
|
||||
else # OpenBSD
|
||||
# ld searches for highest libc.so.* and so do we
|
||||
libc=`(ls /usr/lib/libc.so.* | tail -1) 2>/dev/null`
|
||||
fi
|
||||
echo "libc = $libc"
|
||||
case "`(file -L $libc) 2>/dev/null`" in
|
||||
*ELF*) OUT="BSD-x86-elf" ;;
|
||||
*) OUT="BSD-x86"; options="$options no-sse2" ;;
|
||||
esac
|
||||
else
|
||||
OUT="BSD-x86-elf"
|
||||
fi;;
|
||||
ppc85xx-*-*bsd*) OUT="BSD-ppc85xx" ;; # MPC85XX has no hardware FP accelerator
|
||||
*-*-*bsd*) OUT="BSD-generic32" ;;
|
||||
|
||||
*-*-osf) OUT="osf1-alpha-cc" ;;
|
||||
@@ -838,6 +861,7 @@ case "$GUESSOS" in
|
||||
j90-cray-unicos) OUT="cray-j90" ;;
|
||||
nsr-tandem-nsk) OUT="tandem-c89" ;;
|
||||
beos-*) OUT="$GUESSOS" ;;
|
||||
armv4-*-qnx6) OUT="QNX6-armv4" ;;
|
||||
x86pc-*-qnx6) OUT="QNX6-i386" ;;
|
||||
*-*-qnx6) OUT="QNX6" ;;
|
||||
x86-*-android|i?86-*-android) OUT="android-x86" ;;
|
||||
|
||||
@@ -956,8 +956,6 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
|
||||
|
||||
if (!gctx->iv_set)
|
||||
return -1;
|
||||
if (!ctx->encrypt && gctx->taglen < 0)
|
||||
return -1;
|
||||
if (in)
|
||||
{
|
||||
if (out == NULL)
|
||||
@@ -999,6 +997,8 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
|
||||
{
|
||||
if (!ctx->encrypt)
|
||||
{
|
||||
if (gctx->taglen < 0)
|
||||
return -1;
|
||||
if (CRYPTO_gcm128_finish(&gctx->gcm,
|
||||
ctx->buf, gctx->taglen) != 0)
|
||||
return -1;
|
||||
|
||||
@@ -177,6 +177,7 @@ for($i=0;$i<5;$i++) {
|
||||
$code.=<<___;
|
||||
teq $Xi,sp
|
||||
bne .L_00_15 @ [((11+4)*5+2)*3]
|
||||
sub sp,sp,#25*4
|
||||
___
|
||||
&BODY_00_15(@V); unshift(@V,pop(@V));
|
||||
&BODY_16_19(@V); unshift(@V,pop(@V));
|
||||
@@ -186,7 +187,6 @@ ___
|
||||
$code.=<<___;
|
||||
|
||||
ldr $K,.LK_20_39 @ [+15+16*4]
|
||||
sub sp,sp,#25*4
|
||||
cmn sp,#0 @ [+3], clear carry to denote 20_39
|
||||
.L_20_39_or_60_79:
|
||||
___
|
||||
|
||||
@@ -46,7 +46,8 @@ static int parse_mod(char *line, int *pdsa2, int *pL, int *pN,
|
||||
if (strcmp(keyword, "L"))
|
||||
return 0;
|
||||
*pL = atoi(value);
|
||||
strcpy(line, p + 1);
|
||||
strcpy(lbuf, p + 1);
|
||||
strcpy(line, lbuf);
|
||||
if (pmd)
|
||||
p = strchr(line, ',');
|
||||
else
|
||||
|
||||
@@ -32,11 +32,15 @@ const void *FIPS_text_end(void);
|
||||
defined(__i386__)|| defined(__i386))) || \
|
||||
(defined(__vxworks) && (defined(__ppc__) || defined(__ppc) || \
|
||||
defined(__mips__)|| defined(__mips))) || \
|
||||
(defined(__NetBSD__) && (defined(__powerpc__) || defined(__i386))) || \
|
||||
(defined(__linux) && ((defined(__PPC__) && !defined(__PPC64__)) || \
|
||||
defined(__arm__) || defined(__arm))) || \
|
||||
defined(__arm__) || defined(__arm)) || \
|
||||
defined(__mips__)) || \
|
||||
(defined(__APPLE__) /* verified on all MacOS X & iOS flavors */)|| \
|
||||
(defined(_TMS320C6X)) || \
|
||||
(defined(_WIN32) && defined(_MSC_VER))
|
||||
(defined(__ECOS__)) || \
|
||||
(defined(_WIN32) && defined(_MSC_VER)) || \
|
||||
(defined(__QNX__) && defined(__ARM__))
|
||||
# define FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE
|
||||
# endif
|
||||
#endif
|
||||
|
||||
@@ -714,18 +714,6 @@ static int do_drbg_all(void)
|
||||
{NID_aes_128_ctr, DRBG_FLAG_CTR_USE_DF},
|
||||
{NID_aes_192_ctr, DRBG_FLAG_CTR_USE_DF},
|
||||
{NID_aes_256_ctr, DRBG_FLAG_CTR_USE_DF},
|
||||
{(NID_X9_62_prime256v1 << 16)|NID_sha1, 0},
|
||||
{(NID_X9_62_prime256v1 << 16)|NID_sha224, 0},
|
||||
{(NID_X9_62_prime256v1 << 16)|NID_sha256, 0},
|
||||
{(NID_X9_62_prime256v1 << 16)|NID_sha384, 0},
|
||||
{(NID_X9_62_prime256v1 << 16)|NID_sha512, 0},
|
||||
{(NID_secp384r1 << 16)|NID_sha224, 0},
|
||||
{(NID_secp384r1 << 16)|NID_sha256, 0},
|
||||
{(NID_secp384r1 << 16)|NID_sha384, 0},
|
||||
{(NID_secp384r1 << 16)|NID_sha512, 0},
|
||||
{(NID_secp521r1 << 16)|NID_sha256, 0},
|
||||
{(NID_secp521r1 << 16)|NID_sha384, 0},
|
||||
{(NID_secp521r1 << 16)|NID_sha512, 0},
|
||||
{0, 0}
|
||||
};
|
||||
DRBG_LIST *lst;
|
||||
|
||||
@@ -20,8 +20,8 @@ my @fips_dsa_test_list = (
|
||||
);
|
||||
|
||||
my @fips_dsa_pqgver_test_list = (
|
||||
|
||||
[ "PQGVer", "fips_dssvs pqgver", "path:[^C]DSA/.*PQGVer" ]
|
||||
"DSA",
|
||||
[ "PQGVer", "fips_dssvs pqgver"]
|
||||
|
||||
);
|
||||
|
||||
@@ -34,7 +34,7 @@ my @fips_dsa2_test_list = (
|
||||
[ "KeyPair", "fips_dssvs keypair", "path:[^C]DSA2/.*KeyPair" ],
|
||||
[ "SigGen", "fips_dssvs siggen", "path:[^C]DSA2/.*SigGen" ],
|
||||
[ "SigVer", "fips_dssvs sigver", "path:[^C]DSA2/.*SigVer" ],
|
||||
[ "PQGVer", "fips_dssvs pqgver", "path:[^C]DSA2/.*PQGVer" ]
|
||||
[ "PQGVer", "fips_dssvs pqgver", "file:L\\s*=.*N\\s*=" ]
|
||||
|
||||
);
|
||||
|
||||
@@ -47,7 +47,9 @@ my @fips_ecdsa_test_list = (
|
||||
[ "PKV", "fips_ecdsavs PKV", "path:/ECDSA/.*PKV" ],
|
||||
[ "SigGen", "fips_ecdsavs SigGen", "path:/ECDSA/.*SigGen" ],
|
||||
[ "SigVer", "fips_ecdsavs SigVer", "path:/ECDSA/.*SigVer" ],
|
||||
);
|
||||
|
||||
my @fips_ecdsa2_test_list = (
|
||||
"ECDSA2",
|
||||
|
||||
[ "KeyPair", "fips_ecdsavs KeyPair", "path:/ECDSA2/.*KeyPair" ],
|
||||
@@ -65,9 +67,9 @@ my @fips_rsa_test_list = (
|
||||
|
||||
[ "SigGen15", "fips_rsastest" ],
|
||||
[ "SigVer15", "fips_rsavtest" ],
|
||||
[ "SigVerRSA", "fips_rsavtest -x931" ],
|
||||
[ "SigVer(X9.31)", "fips_rsavtest -x931", 'file:9\.31' ],
|
||||
[ "KeyGenRSA", "fips_rsagtest" ],
|
||||
[ "SigGenRSA", "fips_rsastest -x931" ]
|
||||
[ "SigGen(X9.31)", "fips_rsastest -x931" , 'file:9\.31']
|
||||
|
||||
);
|
||||
|
||||
@@ -79,21 +81,22 @@ my @fips_rsa_test_list = (
|
||||
# RSA PSS salt length 0 tests
|
||||
|
||||
my @fips_rsa_pss0_test_list = (
|
||||
|
||||
"RSA",
|
||||
[ "SigGenPSS(0)", "fips_rsastest -saltlen 0",
|
||||
'file:^\s*#\s*salt\s+len:\s+0\s*$' ],
|
||||
'file:salt\s+len:\s+0' ],
|
||||
[ "SigVerPSS(0)", "fips_rsavtest -saltlen 0",
|
||||
'file:^\s*#\s*salt\s+len:\s+0\s*$' ],
|
||||
'file:salt\s+len:\s+0' ],
|
||||
|
||||
);
|
||||
|
||||
# RSA PSS salt length 62 tests
|
||||
|
||||
my @fips_rsa_pss62_test_list = (
|
||||
"RSA",
|
||||
[ "SigGenPSS(62)", "fips_rsastest -saltlen 62",
|
||||
'file:^\s*#\s*salt\s+len:\s+62\s*$' ],
|
||||
'file:salt\s+len:\s+62' ],
|
||||
[ "SigVerPSS(62)", "fips_rsavtest -saltlen 62",
|
||||
'file:^\s*#\s*salt\s+len:\s+62\s*$' ],
|
||||
'file:salt\s+len:\s+62' ],
|
||||
);
|
||||
|
||||
# SHA tests
|
||||
@@ -434,7 +437,6 @@ my @fips_drbg_test_list = (
|
||||
# SP800-90 DRBG tests
|
||||
"SP800-90 DRBG",
|
||||
[ "CTR_DRBG", "fips_drbgvs" ],
|
||||
[ "Dual_EC_DRBG", "fips_drbgvs" ],
|
||||
[ "Hash_DRBG", "fips_drbgvs" ],
|
||||
[ "HMAC_DRBG", "fips_drbgvs" ]
|
||||
|
||||
@@ -512,12 +514,14 @@ my $no_warn_bogus = 0;
|
||||
my $rmcmd = "rm -rf";
|
||||
my $mkcmd = "mkdir";
|
||||
my $cmpall = 0;
|
||||
my $info = 0;
|
||||
|
||||
my %fips_enabled = (
|
||||
"dsa" => 1,
|
||||
"dsa2" => 2,
|
||||
"dsa-pqgver" => 2,
|
||||
"ecdsa" => 2,
|
||||
"ecdsa2" => 2,
|
||||
"rsa" => 1,
|
||||
"rsa-pss0" => 2,
|
||||
"rsa-pss62" => 1,
|
||||
@@ -578,6 +582,12 @@ foreach (@ARGV) {
|
||||
elsif ( $_ eq "--notest" ) {
|
||||
$notest = 1;
|
||||
}
|
||||
elsif ( $_ eq "--debug-detect" ) {
|
||||
$notest = 1;
|
||||
$ignore_missing = 1;
|
||||
$ignore_bogus = 1;
|
||||
$info = 1;
|
||||
}
|
||||
elsif ( $_ eq "--quiet" ) {
|
||||
$quiet = 1;
|
||||
}
|
||||
@@ -641,13 +651,15 @@ if (!$fips_enabled{"v2"}) {
|
||||
}
|
||||
|
||||
push @fips_test_list, @fips_dsa_test_list if $fips_enabled{"dsa"};
|
||||
push @fips_test_list, @fips_dsa_pqgver_test_list if $fips_enabled{"dsa-pqgver"};
|
||||
push @fips_test_list, @fips_dsa2_test_list if $fips_enabled{"dsa2"};
|
||||
push @fips_test_list, @fips_dsa_pqgver_test_list if $fips_enabled{"dsa-pqgver"};
|
||||
push @fips_test_list, @fips_ecdsa_test_list if $fips_enabled{"ecdsa"};
|
||||
push @fips_test_list, @fips_ecdsa2_test_list if $fips_enabled{"ecdsa2"};
|
||||
push @fips_test_list, @fips_rsa_test_list if $fips_enabled{"rsa"};
|
||||
push @fips_test_list, @fips_rsa_pss0_test_list if $fips_enabled{"rsa-pss0"};
|
||||
push @fips_test_list, @fips_rsa_pss62_test_list if $fips_enabled{"rsa-pss62"};
|
||||
push @fips_test_list, @fips_sha_test_list if $fips_enabled{"sha"};
|
||||
push @fips_test_list, @fips_drbg_test_list if $fips_enabled{"drbg"};
|
||||
push @fips_test_list, @fips_hmac_test_list if $fips_enabled{"hmac"};
|
||||
push @fips_test_list, @fips_cmac_test_list if $fips_enabled{"cmac"};
|
||||
push @fips_test_list, @fips_rand_aes_test_list if $fips_enabled{"rand-aes"};
|
||||
@@ -656,7 +668,6 @@ push @fips_test_list, @fips_aes_test_list if $fips_enabled{"aes"};
|
||||
push @fips_test_list, @fips_aes_cfb1_test_list if $fips_enabled{"aes-cfb1"};
|
||||
push @fips_test_list, @fips_des3_test_list if $fips_enabled{"des3"};
|
||||
push @fips_test_list, @fips_des3_cfb1_test_list if $fips_enabled{"des3-cfb1"};
|
||||
push @fips_test_list, @fips_drbg_test_list if $fips_enabled{"drbg"};
|
||||
push @fips_test_list, @fips_aes_ccm_test_list if $fips_enabled{"aes-ccm"};
|
||||
push @fips_test_list, @fips_aes_gcm_test_list if $fips_enabled{"aes-gcm"};
|
||||
push @fips_test_list, @fips_aes_xts_test_list if $fips_enabled{"aes-xts"};
|
||||
@@ -711,9 +722,9 @@ sanity_check_files();
|
||||
my ( $runerr, $cmperr, $cmpok, $scheckrunerr, $scheckerr, $scheckok, $skipcnt )
|
||||
= ( 0, 0, 0, 0, 0, 0, 0 );
|
||||
|
||||
exit(0) if $notest;
|
||||
print "Outputting commands to $outfile\n" if $outfile ne "";
|
||||
run_tests( $verify, $win32, $tprefix, $filter, $tvdir, $outfile );
|
||||
exit(0) if $notest;
|
||||
|
||||
if ($verify) {
|
||||
print "ALGORITHM TEST VERIFY SUMMARY REPORT:\n";
|
||||
@@ -779,7 +790,7 @@ EOF
|
||||
while (my ($key, $value) = each %fips_enabled)
|
||||
{
|
||||
printf "\t\t%-20s(%s by default)\n", $key ,
|
||||
$value == 1 ? "enabled" : "disabled";
|
||||
$value != 0 ? "enabled" : "disabled";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -818,13 +829,14 @@ sub sanity_check_exe {
|
||||
sub find_files {
|
||||
my ( $filter, $dir ) = @_;
|
||||
my ( $dirh, $testname, $tref );
|
||||
my $ttype;
|
||||
opendir( $dirh, $dir );
|
||||
while ( $_ = readdir($dirh) ) {
|
||||
next if ( $_ eq "." || $_ eq ".." );
|
||||
$_ = "$dir/$_";
|
||||
if ( -f "$_" ) {
|
||||
if (/\/([^\/]*)\.rsp$/) {
|
||||
$tref = find_test($1, $_);
|
||||
$tref = find_test($1, $_, \$ttype);
|
||||
if ( defined $tref ) {
|
||||
$testname = $$tref[0];
|
||||
if ( $$tref[4] eq "" ) {
|
||||
@@ -832,7 +844,7 @@ sub find_files {
|
||||
}
|
||||
else {
|
||||
print STDERR
|
||||
"WARNING: duplicate response file $_ for test $testname\n";
|
||||
"WARNING: duplicate response file $_ for $ttype test $testname\n";
|
||||
$nbogus++;
|
||||
}
|
||||
}
|
||||
@@ -843,21 +855,28 @@ sub find_files {
|
||||
}
|
||||
next unless /$filter.*\.req$/i;
|
||||
if (/\/([^\/]*)\.req$/) {
|
||||
$tref = find_test($1, $_);
|
||||
$tref = find_test($1, $_, \$ttype);
|
||||
if ( defined $tref ) {
|
||||
$testname = $$tref[0];
|
||||
if ( $$tref[3] eq "" ) {
|
||||
my $tfname = $$tref[3];
|
||||
if ( $tfname eq "" ) {
|
||||
$$tref[3] = $_;
|
||||
}
|
||||
else {
|
||||
print STDERR
|
||||
"WARNING: duplicate request file $_ for test $testname\n";
|
||||
"WARNING: duplicate request file $_ for $ttype test $testname\n";
|
||||
if ($info) {
|
||||
print_file_start($_, \*STDERR);
|
||||
print STDERR "Original filename $tfname\n";
|
||||
print_file_start($tfname, \*STDERR);
|
||||
}
|
||||
$nbogus++;
|
||||
}
|
||||
|
||||
}
|
||||
elsif ( !/SHAmix\.req$/ ) {
|
||||
print STDERR "WARNING: unrecognized filename $_\n" unless $no_warn_bogus;
|
||||
print_file_start($_, \*STDERR) if $info;
|
||||
$nbogus++;
|
||||
}
|
||||
}
|
||||
@@ -874,13 +893,15 @@ sub find_files {
|
||||
#
|
||||
|
||||
sub find_test {
|
||||
my ( $test, $path ) = @_;
|
||||
my ( $test, $path, $type ) = @_;
|
||||
foreach $tref (@fips_test_list) {
|
||||
next unless ref($tref);
|
||||
if (!ref($tref)) {
|
||||
$$type = $tref;
|
||||
next;
|
||||
}
|
||||
my ( $tst, $cmd, $excmd, $req, $resp ) = @$tref;
|
||||
my $regexp;
|
||||
$tst =~ s/\(.*$//;
|
||||
$test =~ s/_186-2//;
|
||||
if (defined $excmd) {
|
||||
if ($excmd =~ /^path:(.*)$/) {
|
||||
my $fmatch = $1;
|
||||
@@ -891,7 +912,7 @@ sub find_test {
|
||||
$regexp = $1;
|
||||
}
|
||||
}
|
||||
if ($test eq $tst) {
|
||||
if ($test =~ /^$tst/) {
|
||||
return $tref if (!defined $regexp);
|
||||
my $found = 0;
|
||||
my $line;
|
||||
@@ -911,22 +932,26 @@ sub find_test {
|
||||
|
||||
sub sanity_check_files {
|
||||
my $bad = 0;
|
||||
my $ttype;
|
||||
foreach (@fips_test_list) {
|
||||
next unless ref($_);
|
||||
if (!ref($_)) {
|
||||
$ttype = $_;
|
||||
next;
|
||||
}
|
||||
my ( $tst, $cmd, $regexp, $req, $resp ) = @$_;
|
||||
|
||||
#print STDERR "FILES $tst, $cmd, $req, $resp\n";
|
||||
if ( $req eq "" ) {
|
||||
print STDERR "WARNING: missing request file for $tst\n" unless $no_warn_missing;
|
||||
print STDERR "WARNING: missing request file for $ttype test $tst\n" unless $no_warn_missing;
|
||||
$bad = 1;
|
||||
next;
|
||||
}
|
||||
if ( $verify && $resp eq "" ) {
|
||||
print STDERR "WARNING: no response file for test $tst\n";
|
||||
print STDERR "WARNING: no response file for $ttype test test $tst\n";
|
||||
$bad = 1;
|
||||
}
|
||||
elsif ( !$verify && $resp ne "" ) {
|
||||
print STDERR "WARNING: response file $resp will be overwritten\n";
|
||||
print STDERR "WARNING: response file $resp for $ttype test $tst will be overwritten\n";
|
||||
}
|
||||
}
|
||||
if ($bad) {
|
||||
@@ -989,26 +1014,37 @@ END
|
||||
if ($outfile ne "") {
|
||||
print "Generating script for $_ tests\n";
|
||||
print OUT "\n\n\necho \"Running $_ tests\"\n" unless $minimal_script;
|
||||
} else {
|
||||
} elsif ($notest) {
|
||||
print "Info for $_ tests:\n";
|
||||
} else {
|
||||
print "Running $_ tests\n" unless $quiet;
|
||||
}
|
||||
$ttype = $_;
|
||||
next;
|
||||
}
|
||||
my ( $tname, $tcmd, $regexp, $req, $rsp ) = @$_;
|
||||
if ($notest) {
|
||||
if ($req ne "") {
|
||||
print "Test $ttype, $tname: $req\n";
|
||||
print_file_start($req, \*STDOUT) if ($info);
|
||||
} else {
|
||||
print "$tname: not found\n";
|
||||
}
|
||||
next;
|
||||
}
|
||||
my $out = $rsp;
|
||||
if ($verify) {
|
||||
$out =~ s/\.rsp$/.tst/;
|
||||
}
|
||||
if ( $req eq "" ) {
|
||||
print STDERR
|
||||
"WARNING: Request file for $tname missing: test skipped\n" unless $no_warn_missing;
|
||||
"WARNING: Request file for $ttype test $tname missing: test skipped\n" unless $no_warn_missing;
|
||||
$skipcnt++;
|
||||
next;
|
||||
}
|
||||
if ( $verify && $rsp eq "" ) {
|
||||
print STDERR
|
||||
"WARNING: Response file for $tname missing: test skipped\n";
|
||||
"WARNING: Response file for $ttype test $tname missing: test skipped\n";
|
||||
$skipcnt++;
|
||||
next;
|
||||
}
|
||||
@@ -1212,3 +1248,22 @@ sub next_line {
|
||||
}
|
||||
return undef;
|
||||
}
|
||||
|
||||
sub print_file_start {
|
||||
my ($fname, $fh) = @_;
|
||||
print $fh "======\n";
|
||||
open IN, $fname;
|
||||
while (<IN>) {
|
||||
my $line = $_;
|
||||
s/#.*$//;
|
||||
last unless (/^\s*$/);
|
||||
print $fh $line;
|
||||
}
|
||||
my $lines = 0;
|
||||
while (<IN>) {
|
||||
print $fh $_;
|
||||
last if $lines++ > 10;
|
||||
}
|
||||
close IN;
|
||||
print $fh "======\n";
|
||||
}
|
||||
|
||||
@@ -23,10 +23,10 @@ APPS=
|
||||
|
||||
LIB=$(TOP)/libcrypto.a
|
||||
LIBSRC= fips_rand.c fips_rand_selftest.c fips_drbg_lib.c \
|
||||
fips_drbg_hash.c fips_drbg_hmac.c fips_drbg_ctr.c fips_drbg_ec.c \
|
||||
fips_drbg_hash.c fips_drbg_hmac.c fips_drbg_ctr.c \
|
||||
fips_drbg_selftest.c fips_drbg_rand.c fips_rand_lib.c
|
||||
LIBOBJ= fips_rand.o fips_rand_selftest.o fips_drbg_lib.o \
|
||||
fips_drbg_hash.o fips_drbg_hmac.o fips_drbg_ctr.o fips_drbg_ec.o \
|
||||
fips_drbg_hash.o fips_drbg_hmac.o fips_drbg_ctr.o \
|
||||
fips_drbg_selftest.o fips_drbg_rand.o fips_rand_lib.o
|
||||
|
||||
SRC= $(LIBSRC)
|
||||
@@ -105,18 +105,6 @@ fips_drbg_ctr.o: ../../include/openssl/ossl_typ.h
|
||||
fips_drbg_ctr.o: ../../include/openssl/safestack.h
|
||||
fips_drbg_ctr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
fips_drbg_ctr.o: fips_drbg_ctr.c fips_rand_lcl.h
|
||||
fips_drbg_ec.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
|
||||
fips_drbg_ec.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
|
||||
fips_drbg_ec.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
|
||||
fips_drbg_ec.o: ../../include/openssl/ec.h ../../include/openssl/evp.h
|
||||
fips_drbg_ec.o: ../../include/openssl/fips.h ../../include/openssl/fips_rand.h
|
||||
fips_drbg_ec.o: ../../include/openssl/hmac.h ../../include/openssl/obj_mac.h
|
||||
fips_drbg_ec.o: ../../include/openssl/objects.h
|
||||
fips_drbg_ec.o: ../../include/openssl/opensslconf.h
|
||||
fips_drbg_ec.o: ../../include/openssl/opensslv.h
|
||||
fips_drbg_ec.o: ../../include/openssl/ossl_typ.h
|
||||
fips_drbg_ec.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
|
||||
fips_drbg_ec.o: ../../include/openssl/symhacks.h fips_drbg_ec.c fips_rand_lcl.h
|
||||
fips_drbg_hash.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
|
||||
fips_drbg_hash.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
|
||||
fips_drbg_hash.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
|
||||
|
||||
@@ -1,542 +0,0 @@
|
||||
/* fips/rand/fips_drbg_ec.c */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* 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
|
||||
* licensing@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.
|
||||
* ====================================================================
|
||||
*/
|
||||
|
||||
#define OPENSSL_FIPSAPI
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <openssl/crypto.h>
|
||||
#include <openssl/fips.h>
|
||||
#include <openssl/fips_rand.h>
|
||||
#include <openssl/bn.h>
|
||||
#include "fips_rand_lcl.h"
|
||||
|
||||
/*#define EC_DRBG_TRACE*/
|
||||
|
||||
#ifdef EC_DRBG_TRACE
|
||||
static void hexprint(FILE *out, const unsigned char *buf, int buflen)
|
||||
{
|
||||
int i;
|
||||
fprintf(out, "\t");
|
||||
for (i = 0; i < buflen; i++)
|
||||
fprintf(out, "%02X", buf[i]);
|
||||
fprintf(out, "\n");
|
||||
}
|
||||
static void bnprint(FILE *out, const char *name, const BIGNUM *b)
|
||||
{
|
||||
unsigned char *tmp;
|
||||
int len;
|
||||
len = BN_num_bytes(b);
|
||||
tmp = OPENSSL_malloc(len);
|
||||
BN_bn2bin(b, tmp);
|
||||
fprintf(out, "%s\n", name);
|
||||
hexprint(out, tmp, len);
|
||||
OPENSSL_free(tmp);
|
||||
}
|
||||
#if 0
|
||||
static void ecprint(FILE *out, EC_GROUP *grp, EC_POINT *pt)
|
||||
{
|
||||
BIGNUM *x, *y;
|
||||
x = BN_new();
|
||||
y = BN_new();
|
||||
EC_POINT_get_affine_coordinates_GFp(grp, pt, x, y, NULL);
|
||||
bnprint(out, "\tPoint X: ", x);
|
||||
bnprint(out, "\tPoint Y: ", y);
|
||||
BN_free(x);
|
||||
BN_free(y);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* This is Hash_df from SP 800-90 10.4.1 */
|
||||
|
||||
static int hash_df(DRBG_CTX *dctx, unsigned char *out,
|
||||
const unsigned char *in1, size_t in1len,
|
||||
const unsigned char *in2, size_t in2len,
|
||||
const unsigned char *in3, size_t in3len)
|
||||
{
|
||||
DRBG_EC_CTX *ectx = &dctx->d.ec;
|
||||
EVP_MD_CTX *mctx = &ectx->mctx;
|
||||
unsigned char *vtmp = ectx->vtmp;
|
||||
unsigned char tmp[6];
|
||||
size_t mdlen = M_EVP_MD_size(ectx->md);
|
||||
/* Standard only ever needs seedlen bytes which is always less than
|
||||
* maximum permitted so no need to check length.
|
||||
*/
|
||||
size_t outlen = dctx->seedlen;
|
||||
size_t nbits = (outlen << 3) - ectx->exbits;
|
||||
tmp[0] = 1;
|
||||
tmp[1] = (nbits >> 24) & 0xff;
|
||||
tmp[2] = (nbits >> 16) & 0xff;
|
||||
tmp[3] = (nbits >> 8) & 0xff;
|
||||
tmp[4] = nbits & 0xff;
|
||||
if (!in1)
|
||||
{
|
||||
tmp[5] = (unsigned char)in1len;
|
||||
in1 = tmp + 5;
|
||||
in1len = 1;
|
||||
}
|
||||
for (;;)
|
||||
{
|
||||
if (!FIPS_digestinit(mctx, ectx->md))
|
||||
return 0;
|
||||
if (!FIPS_digestupdate(mctx, tmp, 5))
|
||||
return 0;
|
||||
if (in1 && !FIPS_digestupdate(mctx, in1, in1len))
|
||||
return 0;
|
||||
if (in2 && !FIPS_digestupdate(mctx, in2, in2len))
|
||||
return 0;
|
||||
if (in3 && !FIPS_digestupdate(mctx, in3, in3len))
|
||||
return 0;
|
||||
if (outlen < mdlen)
|
||||
{
|
||||
if (!FIPS_digestfinal(mctx, vtmp, NULL))
|
||||
return 0;
|
||||
memcpy(out, vtmp, outlen);
|
||||
OPENSSL_cleanse(vtmp, mdlen);
|
||||
return 1;
|
||||
}
|
||||
else if(!FIPS_digestfinal(mctx, out, NULL))
|
||||
return 0;
|
||||
|
||||
outlen -= mdlen;
|
||||
if (outlen == 0)
|
||||
return 1;
|
||||
tmp[0]++;
|
||||
out += mdlen;
|
||||
}
|
||||
}
|
||||
|
||||
static int bn2binpad(unsigned char *to, size_t tolen, BIGNUM *b)
|
||||
{
|
||||
size_t blen;
|
||||
blen = BN_num_bytes(b);
|
||||
/* If BIGNUM length greater than buffer, mask to get rightmost
|
||||
* bytes. NB: modifies b but this doesn't matter for our purposes.
|
||||
*/
|
||||
if (blen > tolen)
|
||||
{
|
||||
BN_mask_bits(b, tolen << 3);
|
||||
/* Update length because mask operation might create leading
|
||||
* zeroes.
|
||||
*/
|
||||
blen = BN_num_bytes(b);
|
||||
}
|
||||
/* If b length smaller than buffer pad with zeroes */
|
||||
if (blen < tolen)
|
||||
{
|
||||
memset(to, 0, tolen - blen);
|
||||
to += tolen - blen;
|
||||
}
|
||||
|
||||
/* This call cannot fail */
|
||||
BN_bn2bin(b, to);
|
||||
return 1;
|
||||
}
|
||||
/* Convert buffer to a BIGNUM discarding extra bits if necessary */
|
||||
static int bin2bnbits(DRBG_CTX *dctx, BIGNUM *r, const unsigned char *buf)
|
||||
{
|
||||
DRBG_EC_CTX *ectx = &dctx->d.ec;
|
||||
if (!BN_bin2bn(buf, dctx->seedlen, r))
|
||||
return 0;
|
||||
/* If we have extra bits right shift off the end of r */
|
||||
if (ectx->exbits)
|
||||
{
|
||||
if (!BN_rshift(r, r, ectx->exbits))
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Calculate r = phi(s * P) or r= phi(s * Q) */
|
||||
|
||||
static int drbg_ec_mul(DRBG_EC_CTX *ectx, BIGNUM *r, const BIGNUM *s, int use_q)
|
||||
{
|
||||
if (use_q)
|
||||
{
|
||||
if (!EC_POINT_mul(ectx->curve, ectx->ptmp,
|
||||
NULL, ectx->Q, s, ectx->bctx))
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!EC_POINT_mul(ectx->curve, ectx->ptmp,
|
||||
s, NULL, NULL, ectx->bctx))
|
||||
return 0;
|
||||
}
|
||||
/* Get x coordinate of result */
|
||||
if (!EC_POINT_get_affine_coordinates_GFp(ectx->curve, ectx->ptmp, r,
|
||||
NULL, ectx->bctx))
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int drbg_ec_instantiate(DRBG_CTX *dctx,
|
||||
const unsigned char *ent, size_t ent_len,
|
||||
const unsigned char *nonce, size_t nonce_len,
|
||||
const unsigned char *pstr, size_t pstr_len)
|
||||
{
|
||||
DRBG_EC_CTX *ectx = &dctx->d.ec;
|
||||
if (!hash_df(dctx, ectx->sbuf,
|
||||
ent, ent_len, nonce, nonce_len, pstr, pstr_len))
|
||||
return 0;
|
||||
if (!bin2bnbits(dctx, ectx->s, ectx->sbuf))
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
static int drbg_ec_reseed(DRBG_CTX *dctx,
|
||||
const unsigned char *ent, size_t ent_len,
|
||||
const unsigned char *adin, size_t adin_len)
|
||||
{
|
||||
DRBG_EC_CTX *ectx = &dctx->d.ec;
|
||||
/* Convert s value to a binary buffer. Save it to tbuf as we are
|
||||
* about to overwrite it.
|
||||
*/
|
||||
if (ectx->exbits)
|
||||
BN_lshift(ectx->s, ectx->s, ectx->exbits);
|
||||
bn2binpad(ectx->tbuf, dctx->seedlen, ectx->s);
|
||||
if (!hash_df(dctx, ectx->sbuf, ectx->tbuf, dctx->seedlen,
|
||||
ent, ent_len, adin, adin_len))
|
||||
return 0;
|
||||
if (!bin2bnbits(dctx, ectx->s, ectx->sbuf))
|
||||
return 0;
|
||||
dctx->reseed_counter = 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int drbg_ec_generate(DRBG_CTX *dctx,
|
||||
unsigned char *out, size_t outlen,
|
||||
const unsigned char *adin, size_t adin_len)
|
||||
{
|
||||
DRBG_EC_CTX *ectx = &dctx->d.ec;
|
||||
BIGNUM *t, *r;
|
||||
BIGNUM *s = ectx->s;
|
||||
/* special case: check reseed interval */
|
||||
if (out == NULL)
|
||||
{
|
||||
size_t nb = (outlen + dctx->blocklength - 1)/dctx->blocklength;
|
||||
if (dctx->reseed_counter + nb > dctx->reseed_interval)
|
||||
dctx->status = DRBG_STATUS_RESEED;
|
||||
return 1;
|
||||
}
|
||||
|
||||
BN_CTX_start(ectx->bctx);
|
||||
r = BN_CTX_get(ectx->bctx);
|
||||
if (!r)
|
||||
goto err;
|
||||
if (adin && adin_len)
|
||||
{
|
||||
size_t i;
|
||||
t = BN_CTX_get(ectx->bctx);
|
||||
if (!t)
|
||||
goto err;
|
||||
/* Convert s to buffer */
|
||||
if (ectx->exbits)
|
||||
BN_lshift(s, s, ectx->exbits);
|
||||
bn2binpad(ectx->sbuf, dctx->seedlen, s);
|
||||
/* Step 2 */
|
||||
if (!hash_df(dctx, ectx->tbuf, adin, adin_len,
|
||||
NULL, 0, NULL, 0))
|
||||
goto err;
|
||||
/* Step 5 */
|
||||
for (i = 0; i < dctx->seedlen; i++)
|
||||
ectx->tbuf[i] ^= ectx->sbuf[i];
|
||||
if (!bin2bnbits(dctx, t, ectx->tbuf))
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
/* Note if no additional input the algorithm never
|
||||
* needs separate values for t and s.
|
||||
*/
|
||||
t = s;
|
||||
|
||||
#ifdef EC_DRBG_TRACE
|
||||
bnprint(stderr, "s at start of generate: ", s);
|
||||
#endif
|
||||
|
||||
for (;;)
|
||||
{
|
||||
/* Step #6, calculate s = t * P */
|
||||
if (!drbg_ec_mul(ectx, s, t, 0))
|
||||
goto err;
|
||||
#ifdef EC_DRBG_TRACE
|
||||
bnprint(stderr, "s in generate: ", ectx->s);
|
||||
#endif
|
||||
/* Step #7, calculate r = s * Q */
|
||||
if (!drbg_ec_mul(ectx, r, s, 1))
|
||||
goto err;
|
||||
#ifdef EC_DRBG_TRACE
|
||||
bnprint(stderr, "r in generate is: ", r);
|
||||
#endif
|
||||
dctx->reseed_counter++;
|
||||
/* Get rightmost bits of r to output buffer */
|
||||
|
||||
if (!(dctx->xflags & DRBG_FLAG_TEST) && !dctx->lb_valid)
|
||||
{
|
||||
if (!bn2binpad(dctx->lb, dctx->blocklength, r))
|
||||
goto err;
|
||||
dctx->lb_valid = 1;
|
||||
continue;
|
||||
}
|
||||
if (outlen < dctx->blocklength)
|
||||
{
|
||||
if (!bn2binpad(ectx->vtmp, dctx->blocklength, r))
|
||||
goto err;
|
||||
if (!fips_drbg_cprng_test(dctx, ectx->vtmp))
|
||||
goto err;
|
||||
memcpy(out, ectx->vtmp, outlen);
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!bn2binpad(out, dctx->blocklength, r))
|
||||
goto err;
|
||||
if (!fips_drbg_cprng_test(dctx, out))
|
||||
goto err;
|
||||
}
|
||||
outlen -= dctx->blocklength;
|
||||
if (!outlen)
|
||||
break;
|
||||
out += dctx->blocklength;
|
||||
/* Step #5 after first pass */
|
||||
t = s;
|
||||
#ifdef EC_DRBG_TRACE
|
||||
fprintf(stderr, "Random bits written:\n");
|
||||
hexprint(stderr, out, dctx->blocklength);
|
||||
#endif
|
||||
}
|
||||
if (!drbg_ec_mul(ectx, ectx->s, ectx->s, 0))
|
||||
return 0;
|
||||
#ifdef EC_DRBG_TRACE
|
||||
bnprint(stderr, "s after generate is: ", s);
|
||||
#endif
|
||||
BN_CTX_end(ectx->bctx);
|
||||
return 1;
|
||||
err:
|
||||
BN_CTX_end(ectx->bctx);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int drbg_ec_uninstantiate(DRBG_CTX *dctx)
|
||||
{
|
||||
DRBG_EC_CTX *ectx = &dctx->d.ec;
|
||||
EVP_MD_CTX_cleanup(&ectx->mctx);
|
||||
EC_GROUP_free(ectx->curve);
|
||||
EC_POINT_free(ectx->Q);
|
||||
EC_POINT_free(ectx->ptmp);
|
||||
BN_clear_free(ectx->s);
|
||||
BN_CTX_free(ectx->bctx);
|
||||
OPENSSL_cleanse(&dctx->d.ec, sizeof(DRBG_EC_CTX));
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Q points from SP 800-90 A.1, P is generator */
|
||||
|
||||
__fips_constseg
|
||||
static const unsigned char p_256_qx[] = {
|
||||
0xc9,0x74,0x45,0xf4,0x5c,0xde,0xf9,0xf0,0xd3,0xe0,0x5e,0x1e,
|
||||
0x58,0x5f,0xc2,0x97,0x23,0x5b,0x82,0xb5,0xbe,0x8f,0xf3,0xef,
|
||||
0xca,0x67,0xc5,0x98,0x52,0x01,0x81,0x92
|
||||
};
|
||||
__fips_constseg
|
||||
static const unsigned char p_256_qy[] = {
|
||||
0xb2,0x8e,0xf5,0x57,0xba,0x31,0xdf,0xcb,0xdd,0x21,0xac,0x46,
|
||||
0xe2,0xa9,0x1e,0x3c,0x30,0x4f,0x44,0xcb,0x87,0x05,0x8a,0xda,
|
||||
0x2c,0xb8,0x15,0x15,0x1e,0x61,0x00,0x46
|
||||
};
|
||||
|
||||
__fips_constseg
|
||||
static const unsigned char p_384_qx[] = {
|
||||
0x8e,0x72,0x2d,0xe3,0x12,0x5b,0xdd,0xb0,0x55,0x80,0x16,0x4b,
|
||||
0xfe,0x20,0xb8,0xb4,0x32,0x21,0x6a,0x62,0x92,0x6c,0x57,0x50,
|
||||
0x2c,0xee,0xde,0x31,0xc4,0x78,0x16,0xed,0xd1,0xe8,0x97,0x69,
|
||||
0x12,0x41,0x79,0xd0,0xb6,0x95,0x10,0x64,0x28,0x81,0x50,0x65
|
||||
};
|
||||
__fips_constseg
|
||||
static const unsigned char p_384_qy[] = {
|
||||
0x02,0x3b,0x16,0x60,0xdd,0x70,0x1d,0x08,0x39,0xfd,0x45,0xee,
|
||||
0xc3,0x6f,0x9e,0xe7,0xb3,0x2e,0x13,0xb3,0x15,0xdc,0x02,0x61,
|
||||
0x0a,0xa1,0xb6,0x36,0xe3,0x46,0xdf,0x67,0x1f,0x79,0x0f,0x84,
|
||||
0xc5,0xe0,0x9b,0x05,0x67,0x4d,0xbb,0x7e,0x45,0xc8,0x03,0xdd
|
||||
};
|
||||
|
||||
__fips_constseg
|
||||
static const unsigned char p_521_qx[] = {
|
||||
0x01,0xb9,0xfa,0x3e,0x51,0x8d,0x68,0x3c,0x6b,0x65,0x76,0x36,
|
||||
0x94,0xac,0x8e,0xfb,0xae,0xc6,0xfa,0xb4,0x4f,0x22,0x76,0x17,
|
||||
0x1a,0x42,0x72,0x65,0x07,0xdd,0x08,0xad,0xd4,0xc3,0xb3,0xf4,
|
||||
0xc1,0xeb,0xc5,0xb1,0x22,0x2d,0xdb,0xa0,0x77,0xf7,0x22,0x94,
|
||||
0x3b,0x24,0xc3,0xed,0xfa,0x0f,0x85,0xfe,0x24,0xd0,0xc8,0xc0,
|
||||
0x15,0x91,0xf0,0xbe,0x6f,0x63
|
||||
};
|
||||
__fips_constseg
|
||||
static const unsigned char p_521_qy[] = {
|
||||
0x01,0xf3,0xbd,0xba,0x58,0x52,0x95,0xd9,0xa1,0x11,0x0d,0x1d,
|
||||
0xf1,0xf9,0x43,0x0e,0xf8,0x44,0x2c,0x50,0x18,0x97,0x6f,0xf3,
|
||||
0x43,0x7e,0xf9,0x1b,0x81,0xdc,0x0b,0x81,0x32,0xc8,0xd5,0xc3,
|
||||
0x9c,0x32,0xd0,0xe0,0x04,0xa3,0x09,0x2b,0x7d,0x32,0x7c,0x0e,
|
||||
0x7a,0x4d,0x26,0xd2,0xc7,0xb6,0x9b,0x58,0xf9,0x06,0x66,0x52,
|
||||
0x91,0x1e,0x45,0x77,0x79,0xde
|
||||
};
|
||||
|
||||
int fips_drbg_ec_init(DRBG_CTX *dctx)
|
||||
{
|
||||
const EVP_MD *md;
|
||||
const unsigned char *Q_x, *Q_y;
|
||||
BIGNUM *x, *y;
|
||||
size_t ptlen;
|
||||
int md_nid = dctx->type & 0xffff;
|
||||
int curve_nid = dctx->type >> 16;
|
||||
DRBG_EC_CTX *ectx = &dctx->d.ec;
|
||||
md = FIPS_get_digestbynid(md_nid);
|
||||
if (!md)
|
||||
return -2;
|
||||
|
||||
/* These are taken from SP 800-90 10.3.1 table 4 */
|
||||
switch (curve_nid)
|
||||
{
|
||||
case NID_X9_62_prime256v1:
|
||||
dctx->strength = 128;
|
||||
dctx->seedlen = 32;
|
||||
dctx->blocklength = 30;
|
||||
ectx->exbits = 0;
|
||||
Q_x = p_256_qx;
|
||||
Q_y = p_256_qy;
|
||||
ptlen = sizeof(p_256_qx);
|
||||
break;
|
||||
|
||||
case NID_secp384r1:
|
||||
if (md_nid == NID_sha1)
|
||||
return -2;
|
||||
dctx->strength = 192;
|
||||
dctx->seedlen = 48;
|
||||
dctx->blocklength = 46;
|
||||
ectx->exbits = 0;
|
||||
Q_x = p_384_qx;
|
||||
Q_y = p_384_qy;
|
||||
ptlen = sizeof(p_384_qx);
|
||||
break;
|
||||
|
||||
case NID_secp521r1:
|
||||
if (md_nid == NID_sha1 || md_nid == NID_sha224)
|
||||
return -2;
|
||||
dctx->strength = 256;
|
||||
dctx->seedlen = 66;
|
||||
dctx->blocklength = 63;
|
||||
ectx->exbits = 7;
|
||||
Q_x = p_521_qx;
|
||||
Q_y = p_521_qy;
|
||||
ptlen = sizeof(p_521_qx);
|
||||
break;
|
||||
|
||||
default:
|
||||
return -2;
|
||||
}
|
||||
|
||||
dctx->iflags |= DRBG_CUSTOM_RESEED;
|
||||
dctx->reseed_counter = 0;
|
||||
dctx->instantiate = drbg_ec_instantiate;
|
||||
dctx->reseed = drbg_ec_reseed;
|
||||
dctx->generate = drbg_ec_generate;
|
||||
dctx->uninstantiate = drbg_ec_uninstantiate;
|
||||
|
||||
ectx->md = md;
|
||||
EVP_MD_CTX_init(&ectx->mctx);
|
||||
|
||||
dctx->min_entropy = dctx->strength / 8;
|
||||
dctx->max_entropy = 2 << 10;
|
||||
|
||||
dctx->min_nonce = dctx->min_entropy / 2;
|
||||
dctx->max_nonce = 2 << 10;
|
||||
|
||||
dctx->max_pers = 2 << 10;
|
||||
dctx->max_adin = 2 << 10;
|
||||
|
||||
dctx->reseed_interval = 1<<24;
|
||||
dctx->max_request = dctx->reseed_interval * dctx->blocklength;
|
||||
|
||||
/* Setup internal structures */
|
||||
ectx->bctx = BN_CTX_new();
|
||||
if (!ectx->bctx)
|
||||
return 0;
|
||||
BN_CTX_start(ectx->bctx);
|
||||
|
||||
ectx->s = BN_new();
|
||||
|
||||
ectx->curve = EC_GROUP_new_by_curve_name(curve_nid);
|
||||
|
||||
ectx->Q = EC_POINT_new(ectx->curve);
|
||||
ectx->ptmp = EC_POINT_new(ectx->curve);
|
||||
|
||||
x = BN_CTX_get(ectx->bctx);
|
||||
y = BN_CTX_get(ectx->bctx);
|
||||
|
||||
if (!ectx->s || !ectx->curve || !ectx->Q || !y)
|
||||
goto err;
|
||||
|
||||
if (!BN_bin2bn(Q_x, ptlen, x) || !BN_bin2bn(Q_y, ptlen, y))
|
||||
goto err;
|
||||
if (!EC_POINT_set_affine_coordinates_GFp(ectx->curve, ectx->Q,
|
||||
x, y, ectx->bctx))
|
||||
goto err;
|
||||
|
||||
BN_CTX_end(ectx->bctx);
|
||||
|
||||
return 1;
|
||||
err:
|
||||
BN_CTX_end(ectx->bctx);
|
||||
drbg_ec_uninstantiate(dctx);
|
||||
return 0;
|
||||
}
|
||||
@@ -79,8 +79,6 @@ int FIPS_drbg_init(DRBG_CTX *dctx, int type, unsigned int flags)
|
||||
rv = fips_drbg_ctr_init(dctx);
|
||||
if (rv == -2)
|
||||
rv = fips_drbg_hmac_init(dctx);
|
||||
if (rv == -2)
|
||||
rv = fips_drbg_ec_init(dctx);
|
||||
|
||||
if (rv <= 0)
|
||||
{
|
||||
|
||||
@@ -133,9 +133,6 @@ typedef struct {
|
||||
#define make_drbg_test_data_df(nid, pr, p) \
|
||||
make_drbg_test_data(nid, DRBG_FLAG_CTR_USE_DF, pr, p)
|
||||
|
||||
#define make_drbg_test_data_ec(curve, md, pr, p) \
|
||||
make_drbg_test_data((curve << 16) | md , 0, pr, p)
|
||||
|
||||
static DRBG_SELFTEST_DATA drbg_test[] = {
|
||||
make_drbg_test_data_df(NID_aes_128_ctr, aes_128_use_df, 0),
|
||||
make_drbg_test_data_df(NID_aes_192_ctr, aes_192_use_df, 0),
|
||||
@@ -153,18 +150,6 @@ static DRBG_SELFTEST_DATA drbg_test[] = {
|
||||
make_drbg_test_data(NID_hmacWithSHA256, 0, hmac_sha256, 1),
|
||||
make_drbg_test_data(NID_hmacWithSHA384, 0, hmac_sha384, 0),
|
||||
make_drbg_test_data(NID_hmacWithSHA512, 0, hmac_sha512, 0),
|
||||
make_drbg_test_data_ec(NID_X9_62_prime256v1, NID_sha1, p_256_sha1, 0),
|
||||
make_drbg_test_data_ec(NID_X9_62_prime256v1, NID_sha224, p_256_sha224, 0),
|
||||
make_drbg_test_data_ec(NID_X9_62_prime256v1, NID_sha256, p_256_sha256, 1),
|
||||
make_drbg_test_data_ec(NID_X9_62_prime256v1, NID_sha384, p_256_sha384, 0),
|
||||
make_drbg_test_data_ec(NID_X9_62_prime256v1, NID_sha512, p_256_sha512, 0),
|
||||
make_drbg_test_data_ec(NID_secp384r1, NID_sha224, p_384_sha224, 0),
|
||||
make_drbg_test_data_ec(NID_secp384r1, NID_sha256, p_384_sha256, 0),
|
||||
make_drbg_test_data_ec(NID_secp384r1, NID_sha384, p_384_sha384, 0),
|
||||
make_drbg_test_data_ec(NID_secp384r1, NID_sha512, p_384_sha512, 0),
|
||||
make_drbg_test_data_ec(NID_secp521r1, NID_sha256, p_521_sha256, 0),
|
||||
make_drbg_test_data_ec(NID_secp521r1, NID_sha384, p_521_sha384, 0),
|
||||
make_drbg_test_data_ec(NID_secp521r1, NID_sha512, p_521_sha512, 0),
|
||||
{0,0,0}
|
||||
};
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -236,6 +236,5 @@ struct drbg_ctx_st
|
||||
int fips_drbg_ctr_init(DRBG_CTX *dctx);
|
||||
int fips_drbg_hash_init(DRBG_CTX *dctx);
|
||||
int fips_drbg_hmac_init(DRBG_CTX *dctx);
|
||||
int fips_drbg_ec_init(DRBG_CTX *dctx);
|
||||
int fips_drbg_kat(DRBG_CTX *dctx, int nid, unsigned int flags);
|
||||
int fips_drbg_cprng_test(DRBG_CTX *dctx, const unsigned char *out);
|
||||
|
||||
@@ -127,8 +127,14 @@ elsif ($FLAVOR =~ /CE/)
|
||||
$base_cflags.=" $wcecdefs";
|
||||
$base_cflags.=' -I$(WCECOMPAT)/include' if (defined($ENV{'WCECOMPAT'}));
|
||||
$base_cflags.=' -I$(PORTSDK_LIBPATH)/../../include' if (defined($ENV{'PORTSDK_LIBPATH'}));
|
||||
$opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics...
|
||||
$dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
|
||||
if ($ENV{PLATFORM} =~ /wce7/i) {
|
||||
$opt_cflags=' /MT /O1i'; # optimize for space, but with intrinsics...
|
||||
$dbg_cflags=' /MT /Od -DDEBUG -D_DEBUG';
|
||||
} else {
|
||||
$opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics...
|
||||
$dbg_cflags=' /MC /Od -DDEBUG -D_DEBUG';
|
||||
}
|
||||
|
||||
$lflags="/nologo /opt:ref $wcelflag";
|
||||
}
|
||||
else # Win32
|
||||
|
||||
Reference in New Issue
Block a user