diff --git a/MINFO b/MINFO index c6102169..c37dac80 100644 --- a/MINFO +++ b/MINFO @@ -1,27 +1,27 @@ RELATIVE_DIRECTORY=. -AES_ENC=aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o +AES_ENC=aes-586.o vpaes-x86.o aesni-x86.o AR=ar r ARFLAGS= AS=cc -c -ASFLAG=-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch x86_64 -O3 -DL_ENDIAN -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM +ASFLAG=-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DRMD160_ASM -DAES_ASM -DVPAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM BASEADDR=0xFB00000 -BASENAME=openssl -BF_ENC=bf_enc.o -BN_ASM=x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o -BUILDENV=PLATFORM='darwin64-x86_64-cc' PROCESSOR='' CC='cc' CFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch x86_64 -O3 -DL_ENDIAN -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM' AS='cc' ASFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch x86_64 -O3 -DL_ENDIAN -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM -c' AR='ar r' NM='nm' RANLIB='/opt/local/bin/ranlib' CROSS_COMPILE='' PERL='/opt/local/bin/perl5' ENGDIRS='ccgost' SDIRS='objects md4 md5 sha mdc2 hmac ripemd whrlpool sm3 des aes rc2 rc4 idea bf cast camellia seed modes sms4 zuc bn ec rsa dsa ecdsa dh ecdh ecies dso engine buffer bio stack lhash rand err evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 cms pqueue ts srp cmac' LIBRPATH='/usr/local/lib' INSTALL_PREFIX='' INSTALLTOP='/usr/local' OPENSSLDIR='/usr/local/openssl' LIBDIR='lib' MAKEDEPEND='$$$./util/domd $$$. -MD makedepend' DEPFLAG='-DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST' MAKEDEPPROG='makedepend' SHARED_LDFLAGS='-arch x86_64 -dynamiclib' KRB5_INCLUDES='' LIBKRB5='' ZLIB_INCLUDE='' LIBZLIB='' EXE_EXT='' SHARED_LIBS='' SHLIB_EXT='.1.0.0.dylib' SHLIB_TARGET='darwin-shared' PEX_LIBS='-Wl,-search_paths_first' EX_LIBS='' CPUID_OBJ='x86_64cpuid.o' BN_ASM='x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o' EC_ASM='ecp_nistz256.o ecp_nistz256-x86_64.o' DES_ENC='des_enc.o fcrypt_b.o' AES_ENC='aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o' CMLL_ENC='cmll-x86_64.o cmll_misc.o' BF_ENC='bf_enc.o' CAST_ENC='c_enc.o' RC4_ENC='rc4_enc.o rc4_skey.o' RC5_ENC='rc5_enc.o' SHA1_ASM_OBJ='sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o' MD5_ASM_OBJ='md5-x86_64.o' RMD160_ASM_OBJ='' WP_ASM_OBJ='wp-x86_64.o' MODES_ASM_OBJ='ghash-x86_64.o aesni-gcm-x86_64.o' ENGINES_ASM_OBJ='' PERLASM_SCHEME='macosx' FIPSLIBDIR='' FIPSDIR='/usr/local/ssl/fips-2.0' FIPSCANLIB="$}" THIS=$ MAKEFILE=Makefile MAKEOVERRIDES= -BUILD_CMD=if [ -d "$$dir" ]; then ( cd $$dir && echo "making $$target in $$dir..." && TOP= && unset TOP $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ && -e PLATFORM='darwin64-x86_64-cc' PROCESSOR='' CC='cc' CFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch x86_64 -O3 -DL_ENDIAN -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM' AS='cc' ASFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch x86_64 -O3 -DL_ENDIAN -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM -c' AR='ar r' NM='nm' RANLIB='/opt/local/bin/ranlib' CROSS_COMPILE='' PERL='/opt/local/bin/perl5' ENGDIRS='ccgost' SDIRS='objects md4 md5 sha mdc2 hmac ripemd whrlpool sm3 des aes rc2 rc4 idea bf cast camellia seed modes sms4 zuc bn ec rsa dsa ecdsa dh ecdh ecies dso engine buffer bio stack lhash rand err evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 cms pqueue ts srp cmac' LIBRPATH='/usr/local/lib' INSTALL_PREFIX='' INSTALLTOP='/usr/local' OPENSSLDIR='/usr/local/openssl' LIBDIR='lib' MAKEDEPEND='$$$./util/domd $$$. -MD makedepend' DEPFLAG='-DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST' MAKEDEPPROG='makedepend' SHARED_LDFLAGS='-arch x86_64 -dynamiclib' KRB5_INCLUDES='' LIBKRB5='' ZLIB_INCLUDE='' LIBZLIB='' EXE_EXT='' SHARED_LIBS='' SHLIB_EXT='.1.0.0.dylib' SHLIB_TARGET='darwin-shared' PEX_LIBS='-Wl,-search_paths_first' EX_LIBS='' CPUID_OBJ='x86_64cpuid.o' BN_ASM='x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o' EC_ASM='ecp_nistz256.o ecp_nistz256-x86_64.o' DES_ENC='des_enc.o fcrypt_b.o' AES_ENC='aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o' CMLL_ENC='cmll-x86_64.o cmll_misc.o' BF_ENC='bf_enc.o' CAST_ENC='c_enc.o' RC4_ENC='rc4_enc.o rc4_skey.o' RC5_ENC='rc5_enc.o' SHA1_ASM_OBJ='sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o' MD5_ASM_OBJ='md5-x86_64.o' RMD160_ASM_OBJ='' WP_ASM_OBJ='wp-x86_64.o' MODES_ASM_OBJ='ghash-x86_64.o aesni-gcm-x86_64.o' ENGINES_ASM_OBJ='' PERLASM_SCHEME='macosx' FIPSLIBDIR='' FIPSDIR='/usr/local/ssl/fips-2.0' FIPSCANLIB="$}" THIS=$ MAKEFILE=Makefile MAKEOVERRIDES= TOP=.. DIR=$$dir $$target ) || exit 1; fi -BUILD_ONE_CMD=if expr " crypto ssl engines apps test tools " : ".* $$dir " >/dev/null 2>&1; then if [ -d "$$dir" ]; then ( cd $$dir && echo "making $$target in $$dir..." && TOP= && unset TOP $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ && -e PLATFORM='darwin64-x86_64-cc' PROCESSOR='' CC='cc' CFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch x86_64 -O3 -DL_ENDIAN -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM' AS='cc' ASFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch x86_64 -O3 -DL_ENDIAN -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM -c' AR='ar r' NM='nm' RANLIB='/opt/local/bin/ranlib' CROSS_COMPILE='' PERL='/opt/local/bin/perl5' ENGDIRS='ccgost' SDIRS='objects md4 md5 sha mdc2 hmac ripemd whrlpool sm3 des aes rc2 rc4 idea bf cast camellia seed modes sms4 zuc bn ec rsa dsa ecdsa dh ecdh ecies dso engine buffer bio stack lhash rand err evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 cms pqueue ts srp cmac' LIBRPATH='/usr/local/lib' INSTALL_PREFIX='' INSTALLTOP='/usr/local' OPENSSLDIR='/usr/local/openssl' LIBDIR='lib' MAKEDEPEND='$$$./util/domd $$$. -MD makedepend' DEPFLAG='-DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST' MAKEDEPPROG='makedepend' SHARED_LDFLAGS='-arch x86_64 -dynamiclib' KRB5_INCLUDES='' LIBKRB5='' ZLIB_INCLUDE='' LIBZLIB='' EXE_EXT='' SHARED_LIBS='' SHLIB_EXT='.1.0.0.dylib' SHLIB_TARGET='darwin-shared' PEX_LIBS='-Wl,-search_paths_first' EX_LIBS='' CPUID_OBJ='x86_64cpuid.o' BN_ASM='x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o' EC_ASM='ecp_nistz256.o ecp_nistz256-x86_64.o' DES_ENC='des_enc.o fcrypt_b.o' AES_ENC='aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o' CMLL_ENC='cmll-x86_64.o cmll_misc.o' BF_ENC='bf_enc.o' CAST_ENC='c_enc.o' RC4_ENC='rc4_enc.o rc4_skey.o' RC5_ENC='rc5_enc.o' SHA1_ASM_OBJ='sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o' MD5_ASM_OBJ='md5-x86_64.o' RMD160_ASM_OBJ='' WP_ASM_OBJ='wp-x86_64.o' MODES_ASM_OBJ='ghash-x86_64.o aesni-gcm-x86_64.o' ENGINES_ASM_OBJ='' PERLASM_SCHEME='macosx' FIPSLIBDIR='' FIPSDIR='/usr/local/ssl/fips-2.0' FIPSCANLIB="$}" THIS=$ MAKEFILE=Makefile MAKEOVERRIDES= TOP=.. DIR=$$dir $$target ) || exit 1; fi; fi +BASENAME=gmssl +BF_ENC=bf-586.o +BN_ASM=bn-586.o co-586.o x86-mont.o x86-gf2m.o +BUILDENV=PLATFORM='darwin-i386-cc' PROCESSOR='' CC='cc' CFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DRMD160_ASM -DAES_ASM -DVPAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM' AS='cc' ASFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DRMD160_ASM -DAES_ASM -DVPAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -c' AR='ar r' NM='nm' RANLIB='/usr/bin/ranlib' CROSS_COMPILE='' PERL='/usr/bin/perl' ENGDIRS='ccgost' SDIRS='objects md4 md5 sha mdc2 hmac ripemd whrlpool des aes rc2 rc4 idea bf cast camellia seed modes bn ec rsa dsa ecdsa dh ecdh ecies dso engine buffer bio stack lhash rand err evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 cms pqueue ts srp cmac sm2 sm3 sms4 ecies cpk zuc cbcmac otp skf kdf' LIBRPATH='/usr/local/ssl/lib' INSTALL_PREFIX='' INSTALLTOP='/usr/local/ssl' OPENSSLDIR='/usr/local/ssl' LIBDIR='lib' MAKEDEPEND='$$$./util/domd $$$. -MD makedepend' DEPFLAG='-DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST' MAKEDEPPROG='makedepend' SHARED_LDFLAGS='-arch i386 -dynamiclib' KRB5_INCLUDES='' LIBKRB5='' ZLIB_INCLUDE='' LIBZLIB='' EXE_EXT='' SHARED_LIBS='' SHLIB_EXT='.1.0.0.dylib' SHLIB_TARGET='darwin-shared' PEX_LIBS='-Wl,-search_paths_first' EX_LIBS='' CPUID_OBJ='x86cpuid.o' BN_ASM='bn-586.o co-586.o x86-mont.o x86-gf2m.o' EC_ASM='' DES_ENC='des-586.o crypt586.o' AES_ENC='aes-586.o vpaes-x86.o aesni-x86.o' CMLL_ENC='cmll-x86.o' BF_ENC='bf-586.o' CAST_ENC='c_enc.o' RC4_ENC='rc4-586.o' RC5_ENC='rc5-586.o' SHA1_ASM_OBJ='sha1-586.o sha256-586.o sha512-586.o' MD5_ASM_OBJ='md5-586.o' RMD160_ASM_OBJ='rmd-586.o' WP_ASM_OBJ='wp_block.o wp-mmx.o' MODES_ASM_OBJ='ghash-x86.o' ENGINES_ASM_OBJ='' PERLASM_SCHEME='macosx' FIPSLIBDIR='' FIPSDIR='/usr/local/ssl/fips-2.0' FIPSCANLIB="$}" THIS=$ MAKEFILE=Makefile MAKEOVERRIDES= +BUILD_CMD=if [ -d "$$dir" ]; then ( cd $$dir && echo "making $$target in $$dir..." && TOP= && unset TOP $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ && -e PLATFORM='darwin-i386-cc' PROCESSOR='' CC='cc' CFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DRMD160_ASM -DAES_ASM -DVPAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM' AS='cc' ASFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DRMD160_ASM -DAES_ASM -DVPAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -c' AR='ar r' NM='nm' RANLIB='/usr/bin/ranlib' CROSS_COMPILE='' PERL='/usr/bin/perl' ENGDIRS='ccgost' SDIRS='objects md4 md5 sha mdc2 hmac ripemd whrlpool des aes rc2 rc4 idea bf cast camellia seed modes bn ec rsa dsa ecdsa dh ecdh ecies dso engine buffer bio stack lhash rand err evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 cms pqueue ts srp cmac sm2 sm3 sms4 ecies cpk zuc cbcmac otp skf kdf' LIBRPATH='/usr/local/ssl/lib' INSTALL_PREFIX='' INSTALLTOP='/usr/local/ssl' OPENSSLDIR='/usr/local/ssl' LIBDIR='lib' MAKEDEPEND='$$$./util/domd $$$. -MD makedepend' DEPFLAG='-DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST' MAKEDEPPROG='makedepend' SHARED_LDFLAGS='-arch i386 -dynamiclib' KRB5_INCLUDES='' LIBKRB5='' ZLIB_INCLUDE='' LIBZLIB='' EXE_EXT='' SHARED_LIBS='' SHLIB_EXT='.1.0.0.dylib' SHLIB_TARGET='darwin-shared' PEX_LIBS='-Wl,-search_paths_first' EX_LIBS='' CPUID_OBJ='x86cpuid.o' BN_ASM='bn-586.o co-586.o x86-mont.o x86-gf2m.o' EC_ASM='' DES_ENC='des-586.o crypt586.o' AES_ENC='aes-586.o vpaes-x86.o aesni-x86.o' CMLL_ENC='cmll-x86.o' BF_ENC='bf-586.o' CAST_ENC='c_enc.o' RC4_ENC='rc4-586.o' RC5_ENC='rc5-586.o' SHA1_ASM_OBJ='sha1-586.o sha256-586.o sha512-586.o' MD5_ASM_OBJ='md5-586.o' RMD160_ASM_OBJ='rmd-586.o' WP_ASM_OBJ='wp_block.o wp-mmx.o' MODES_ASM_OBJ='ghash-x86.o' ENGINES_ASM_OBJ='' PERLASM_SCHEME='macosx' FIPSLIBDIR='' FIPSDIR='/usr/local/ssl/fips-2.0' FIPSCANLIB="$}" THIS=$ MAKEFILE=Makefile MAKEOVERRIDES= TOP=.. DIR=$$dir $$target ) || exit 1; fi +BUILD_ONE_CMD=if expr " crypto ssl engines apps test tools " : ".* $$dir " >/dev/null 2>&1; then if [ -d "$$dir" ]; then ( cd $$dir && echo "making $$target in $$dir..." && TOP= && unset TOP $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ && -e PLATFORM='darwin-i386-cc' PROCESSOR='' CC='cc' CFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DRMD160_ASM -DAES_ASM -DVPAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM' AS='cc' ASFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DRMD160_ASM -DAES_ASM -DVPAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -c' AR='ar r' NM='nm' RANLIB='/usr/bin/ranlib' CROSS_COMPILE='' PERL='/usr/bin/perl' ENGDIRS='ccgost' SDIRS='objects md4 md5 sha mdc2 hmac ripemd whrlpool des aes rc2 rc4 idea bf cast camellia seed modes bn ec rsa dsa ecdsa dh ecdh ecies dso engine buffer bio stack lhash rand err evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 cms pqueue ts srp cmac sm2 sm3 sms4 ecies cpk zuc cbcmac otp skf kdf' LIBRPATH='/usr/local/ssl/lib' INSTALL_PREFIX='' INSTALLTOP='/usr/local/ssl' OPENSSLDIR='/usr/local/ssl' LIBDIR='lib' MAKEDEPEND='$$$./util/domd $$$. -MD makedepend' DEPFLAG='-DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST' MAKEDEPPROG='makedepend' SHARED_LDFLAGS='-arch i386 -dynamiclib' KRB5_INCLUDES='' LIBKRB5='' ZLIB_INCLUDE='' LIBZLIB='' EXE_EXT='' SHARED_LIBS='' SHLIB_EXT='.1.0.0.dylib' SHLIB_TARGET='darwin-shared' PEX_LIBS='-Wl,-search_paths_first' EX_LIBS='' CPUID_OBJ='x86cpuid.o' BN_ASM='bn-586.o co-586.o x86-mont.o x86-gf2m.o' EC_ASM='' DES_ENC='des-586.o crypt586.o' AES_ENC='aes-586.o vpaes-x86.o aesni-x86.o' CMLL_ENC='cmll-x86.o' BF_ENC='bf-586.o' CAST_ENC='c_enc.o' RC4_ENC='rc4-586.o' RC5_ENC='rc5-586.o' SHA1_ASM_OBJ='sha1-586.o sha256-586.o sha512-586.o' MD5_ASM_OBJ='md5-586.o' RMD160_ASM_OBJ='rmd-586.o' WP_ASM_OBJ='wp_block.o wp-mmx.o' MODES_ASM_OBJ='ghash-x86.o' ENGINES_ASM_OBJ='' PERLASM_SCHEME='macosx' FIPSLIBDIR='' FIPSDIR='/usr/local/ssl/fips-2.0' FIPSCANLIB="$}" THIS=$ MAKEFILE=Makefile MAKEOVERRIDES= TOP=.. DIR=$$dir $$target ) || exit 1; fi; fi CAST_ENC=c_enc.o CC=cc -CFLAG=-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch x86_64 -O3 -DL_ENDIAN -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM +CFLAG=-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DRMD160_ASM -DAES_ASM -DVPAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM CLEARENV=TOP= && unset TOP $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ -CMLL_ENC=cmll-x86_64.o cmll_misc.o -CONFIGURE_ARGS=darwin64-x86_64-cc --prefix=/usr/local --openssldir=/usr/local/openssl -CPUID_OBJ=x86_64cpuid.o +CMLL_ENC=cmll-x86.o +CONFIGURE_ARGS=darwin-i386-cc +CPUID_OBJ=x86cpuid.o DEPFLAG=-DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST -DES_ENC=des_enc.o fcrypt_b.o +DES_ENC=des-586.o crypt586.o DIRS=crypto ssl engines apps test tools -EC_ASM=ecp_nistz256.o ecp_nistz256-x86_64.o +EC_ASM= EDIRS=times doc bugs util include certs ms shlib mt demos perl sf dep VMS ENGDIRS=ccgost ENGINES_ASM_OBJ= @@ -34,9 +34,9 @@ FIPSLIBDIR= GENERAL=Makefile HEADER=e_os.h HERE=. -HTMLDIR=/usr/local/openssl/html +HTMLDIR=/usr/local/ssl/html HTMLSUFFIX=html -INSTALLTOP=/usr/local +INSTALLTOP=/usr/local/ssl INSTALL_PREFIX= KRB5_INCLUDES= LIBDIR=lib @@ -48,30 +48,30 @@ MAKEDEPPROG=makedepend MAKEFILE=Makefile MAN1=1 MAN3=3 -MANDIR=/usr/local/openssl/man +MANDIR=/usr/local/ssl/man MANSUFFIX= -MD5_ASM_OBJ=md5-x86_64.o +MD5_ASM_OBJ=md5-586.o MINOR=0.2 -MODES_ASM_OBJ=ghash-x86_64.o aesni-gcm-x86_64.o -NAME=openssl-1.0.2d +MODES_ASM_OBJ=ghash-x86.o +NAME=gmssl-1.0.2d-fips NM=nm ONEDIRS=out tmp -OPENSSLDIR=/usr/local/openssl -OPTIONS=--prefix=/usr/local --openssldir=/usr/local/openssl no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-libunbound no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-ssl-trace no-store no-unit-test no-zlib no-zlib-dynamic static-engine -PERL=/opt/local/bin/perl5 +OPENSSLDIR=/usr/local/ssl +OPTIONS=no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-libunbound no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-ssl-trace no-store no-unit-test no-zlib no-zlib-dynamic static-engine +PERL=/usr/bin/perl PERLASM_SCHEME=macosx PEX_LIBS=-Wl,-search_paths_first -PLATFORM=darwin64-x86_64-cc +PLATFORM=darwin-i386-cc PROCESSOR= -RANLIB=/opt/local/bin/ranlib -RC4_ENC=rc4_enc.o rc4_skey.o -RC5_ENC=rc5_enc.o -RECURSIVE_BUILD_CMD=for dir in crypto ssl engines apps test tools; do if [ -d "$$dir" ]; then ( cd $$dir && echo "making $$target in $$dir..." && TOP= && unset TOP $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ && -e PLATFORM='darwin64-x86_64-cc' PROCESSOR='' CC='cc' CFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch x86_64 -O3 -DL_ENDIAN -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM' AS='cc' ASFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch x86_64 -O3 -DL_ENDIAN -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM -c' AR='ar r' NM='nm' RANLIB='/opt/local/bin/ranlib' CROSS_COMPILE='' PERL='/opt/local/bin/perl5' ENGDIRS='ccgost' SDIRS='objects md4 md5 sha mdc2 hmac ripemd whrlpool sm3 des aes rc2 rc4 idea bf cast camellia seed modes sms4 zuc bn ec rsa dsa ecdsa dh ecdh ecies dso engine buffer bio stack lhash rand err evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 cms pqueue ts srp cmac' LIBRPATH='/usr/local/lib' INSTALL_PREFIX='' INSTALLTOP='/usr/local' OPENSSLDIR='/usr/local/openssl' LIBDIR='lib' MAKEDEPEND='$$$./util/domd $$$. -MD makedepend' DEPFLAG='-DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST' MAKEDEPPROG='makedepend' SHARED_LDFLAGS='-arch x86_64 -dynamiclib' KRB5_INCLUDES='' LIBKRB5='' ZLIB_INCLUDE='' LIBZLIB='' EXE_EXT='' SHARED_LIBS='' SHLIB_EXT='.1.0.0.dylib' SHLIB_TARGET='darwin-shared' PEX_LIBS='-Wl,-search_paths_first' EX_LIBS='' CPUID_OBJ='x86_64cpuid.o' BN_ASM='x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o' EC_ASM='ecp_nistz256.o ecp_nistz256-x86_64.o' DES_ENC='des_enc.o fcrypt_b.o' AES_ENC='aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o' CMLL_ENC='cmll-x86_64.o cmll_misc.o' BF_ENC='bf_enc.o' CAST_ENC='c_enc.o' RC4_ENC='rc4_enc.o rc4_skey.o' RC5_ENC='rc5_enc.o' SHA1_ASM_OBJ='sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o' MD5_ASM_OBJ='md5-x86_64.o' RMD160_ASM_OBJ='' WP_ASM_OBJ='wp-x86_64.o' MODES_ASM_OBJ='ghash-x86_64.o aesni-gcm-x86_64.o' ENGINES_ASM_OBJ='' PERLASM_SCHEME='macosx' FIPSLIBDIR='' FIPSDIR='/usr/local/ssl/fips-2.0' FIPSCANLIB="$}" THIS=$ MAKEFILE=Makefile MAKEOVERRIDES= TOP=.. DIR=$$dir $$target ) || exit 1; fi; done -RMD160_ASM_OBJ= -SDIRS=objects md4 md5 sha mdc2 hmac ripemd whrlpool sm3 des aes rc2 rc4 idea bf cast camellia seed modes sms4 zuc bn ec rsa dsa ecdsa dh ecdh ecies dso engine buffer bio stack lhash rand err evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 cms pqueue ts srp cmac -SHA1_ASM_OBJ=sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o +RANLIB=/usr/bin/ranlib +RC4_ENC=rc4-586.o +RC5_ENC=rc5-586.o +RECURSIVE_BUILD_CMD=for dir in crypto ssl engines apps test tools; do if [ -d "$$dir" ]; then ( cd $$dir && echo "making $$target in $$dir..." && TOP= && unset TOP $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ && -e PLATFORM='darwin-i386-cc' PROCESSOR='' CC='cc' CFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DRMD160_ASM -DAES_ASM -DVPAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM' AS='cc' ASFLAG='-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DRMD160_ASM -DAES_ASM -DVPAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -c' AR='ar r' NM='nm' RANLIB='/usr/bin/ranlib' CROSS_COMPILE='' PERL='/usr/bin/perl' ENGDIRS='ccgost' SDIRS='objects md4 md5 sha mdc2 hmac ripemd whrlpool des aes rc2 rc4 idea bf cast camellia seed modes bn ec rsa dsa ecdsa dh ecdh ecies dso engine buffer bio stack lhash rand err evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 cms pqueue ts srp cmac sm2 sm3 sms4 ecies cpk zuc cbcmac otp skf kdf' LIBRPATH='/usr/local/ssl/lib' INSTALL_PREFIX='' INSTALLTOP='/usr/local/ssl' OPENSSLDIR='/usr/local/ssl' LIBDIR='lib' MAKEDEPEND='$$$./util/domd $$$. -MD makedepend' DEPFLAG='-DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST' MAKEDEPPROG='makedepend' SHARED_LDFLAGS='-arch i386 -dynamiclib' KRB5_INCLUDES='' LIBKRB5='' ZLIB_INCLUDE='' LIBZLIB='' EXE_EXT='' SHARED_LIBS='' SHLIB_EXT='.1.0.0.dylib' SHLIB_TARGET='darwin-shared' PEX_LIBS='-Wl,-search_paths_first' EX_LIBS='' CPUID_OBJ='x86cpuid.o' BN_ASM='bn-586.o co-586.o x86-mont.o x86-gf2m.o' EC_ASM='' DES_ENC='des-586.o crypt586.o' AES_ENC='aes-586.o vpaes-x86.o aesni-x86.o' CMLL_ENC='cmll-x86.o' BF_ENC='bf-586.o' CAST_ENC='c_enc.o' RC4_ENC='rc4-586.o' RC5_ENC='rc5-586.o' SHA1_ASM_OBJ='sha1-586.o sha256-586.o sha512-586.o' MD5_ASM_OBJ='md5-586.o' RMD160_ASM_OBJ='rmd-586.o' WP_ASM_OBJ='wp_block.o wp-mmx.o' MODES_ASM_OBJ='ghash-x86.o' ENGINES_ASM_OBJ='' PERLASM_SCHEME='macosx' FIPSLIBDIR='' FIPSDIR='/usr/local/ssl/fips-2.0' FIPSCANLIB="$}" THIS=$ MAKEFILE=Makefile MAKEOVERRIDES= TOP=.. DIR=$$dir $$target ) || exit 1; fi; done +RMD160_ASM_OBJ=rmd-586.o +SDIRS=objects md4 md5 sha mdc2 hmac ripemd whrlpool des aes rc2 rc4 idea bf cast camellia seed modes bn ec rsa dsa ecdsa dh ecdh ecies dso engine buffer bio stack lhash rand err evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 cms pqueue ts srp cmac sm2 sm3 sms4 ecies cpk zuc cbcmac otp skf kdf +SHA1_ASM_OBJ=sha1-586.o sha256-586.o sha512-586.o SHARED_CRYPTO=libcrypto.1.0.0.dylib -SHARED_LDFLAGS=-arch x86_64 -dynamiclib +SHARED_LDFLAGS=-arch i386 -dynamiclib SHARED_LIBS= SHARED_LIBS_LINK_EXTS=.1.dylib .dylib SHARED_SSL=libssl.1.0.0.dylib @@ -84,14 +84,14 @@ SHLIB_TARGET=darwin-shared SHLIB_VERSION_HISTORY= SHLIB_VERSION_NUMBER=1.0.0 TAR=tar -TARFILE=openssl-1.0.2d.tar +TARFILE=gmssl-1.0.2d-fips.tar TARFLAGS=--no-recursion TESTS=alltests TOP=. -VERSION=1.0.2d +VERSION=1.0.2d-fips WDIRS=windows -WP_ASM_OBJ=wp-x86_64.o -WTARFILE=openssl-1.0.2d-win.tar +WP_ASM_OBJ=wp_block.o wp-mmx.o +WTARFILE=gmssl-1.0.2d-fips-win.tar ZLIB_INCLUDE= RELATIVE_DIRECTORY= RELATIVE_DIRECTORY=crypto @@ -102,7 +102,7 @@ ASFLAGS=-I. -I.. -I../include CC=cc CFLAG=-g CFLAGS=-I. -I.. -I../include -g -CPUID_OBJ=x86_64cpuid.o +CPUID_OBJ=x86cpuid.o DIR=crypto EXHEADER=crypto.h opensslv.h opensslconf.h ebcdic.h symhacks.h ossl_typ.h EX_LIBS= @@ -111,7 +111,7 @@ HEADER=cryptlib.h buildinf.h md32_common.h o_time.h o_str.h o_dir.h constant_tim INCLUDE=-I. -I.. -I../include INCLUDES=-I.. -I../.. -I../modes -I../asn1 -I../evp -I../../include LIB=../libcrypto.a -LIBOBJ=cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o o_dir.o o_fips.o o_init.o fips_ers.o x86_64cpuid.o +LIBOBJ=cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o o_dir.o o_fips.o o_init.o fips_ers.o x86cpuid.o LIBS= LIBSRC=cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fips.c o_init.c fips_ers.c MAKEDEPEND=../util/domd .. -MD makedepend @@ -303,30 +303,6 @@ TEST=wp_test.c TOP=../.. WP_ASM_OBJ=wp_block.o RELATIVE_DIRECTORY= -RELATIVE_DIRECTORY=crypto/sm3 -AFLAGS=-I.. -I../.. -I../../include -ALL=Makefile sm3.c byteorder.h sm3.h -APPS= -AR=ar r -ASFLAGS=-I.. -I../.. -I../../include -CC=cc -CFLAG=-g -CFLAGS=-I.. -I../.. -I../../include -g -CPP=cc -E -DIR=sm3 -EXHEADER=sm3.h -GENERAL=Makefile -HEADER=byteorder.h sm3.h -INCLUDES=-I.. -I../.. -I../../include -LIB=../../libcrypto.a -LIBOBJ=sm3.o -LIBSRC=sm3.c -MAKEFILE=Makefile -SM3_ASM_OBJ= -SRC=sm3.c -TEST=sm3test.c -TOP=../.. -RELATIVE_DIRECTORY= RELATIVE_DIRECTORY=crypto/des AFLAGS=-I../.. -I../../include ALL=Makefile cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c qud_cksm.c rand_key.c rpc_enc.c set_key.c des_enc.c fcrypt_b.c xcbc_enc.c str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c des_old.c des_old2.c read2pwd.c des_locl.h rpc_des.h spr.h des_ver.h des.h des_old.h @@ -353,7 +329,7 @@ TEST=destest.c TOP=../.. RELATIVE_DIRECTORY= RELATIVE_DIRECTORY=crypto/aes -AES_ENC=aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o +AES_ENC=aes-586.o vpaes-x86.o aesni-x86.o AFLAGS= ALL=Makefile aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c aes_ctr.c aes_ige.c aes_wrap.c aes_locl.h aes.h APPS= @@ -369,7 +345,7 @@ GENERAL=Makefile HEADER=aes_locl.h aes.h INCLUDES= LIB=../../libcrypto.a -LIBOBJ=aes_misc.o aes_ecb.o aes_cfb.o aes_ofb.o aes_ctr.o aes_ige.o aes_wrap.o aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o +LIBOBJ=aes_misc.o aes_ecb.o aes_cfb.o aes_ofb.o aes_ctr.o aes_ige.o aes_wrap.o aes-586.o vpaes-x86.o aesni-x86.o LIBSRC=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c aes_ctr.c aes_ige.c aes_wrap.c MAKEFILE=Makefile SRC=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c aes_ctr.c aes_ige.c aes_wrap.c @@ -412,9 +388,9 @@ GENERAL=Makefile HEADER=rc4.h rc4_locl.h INCLUDES= LIB=../../libcrypto.a -LIBOBJ=rc4_enc.o rc4_skey.o rc4_utl.o +LIBOBJ=rc4-586.o rc4_utl.o LIBSRC=rc4_skey.c rc4_enc.c rc4_utl.c -RC4_ENC=rc4_enc.o rc4_skey.o +RC4_ENC=rc4-586.o SRC=rc4_skey.c rc4_enc.c rc4_utl.c TEST=rc4test.c TOP=../.. @@ -554,50 +530,6 @@ SRC=cbc128.c ctr128.c cts128.c cfb128.c ofb128.c gcm128.c ccm128.c xts128.c wrap TEST= TOP=../.. RELATIVE_DIRECTORY= -RELATIVE_DIRECTORY=crypto/sms4 -ALL=Makefile sms4_cbc.c sms4_cfb.c sms4_ecb.c sms4_ofb.c sms4.c ../../include/openssl/modes.h sms4.h -APPS= -AR=ar r -CC=cc -CFLAG=-g -CFLAGS= -g -DIR=sms4 -EXHEADER=sms4.h -GENERAL=Makefile -HEADER=../../include/openssl/modes.h sms4.h -INCLUDES= -LIB=../../libcrypto.a -LIBOBJ=sms4_cbc.o sms4_cfb.o sms4_ecb.o sms4_ofb.o sms4.o -LIBSRC=sms4_cbc.c sms4_cfb.c sms4_ecb.c sms4_ofb.c sms4.c -MAKEFILE=Makefile -SRC=sms4_cbc.c sms4_cfb.c sms4_ecb.c sms4_ofb.c sms4.c -TEST= -TOP=../.. -RELATIVE_DIRECTORY= -RELATIVE_DIRECTORY=crypto/zuc -AFLAGS= -ALL=Makefile zuc.c zuc.h -APPS= -AR=ar r -ASFLAGS= -CC=cc -CFLAG=-g -CFLAGS= -g -CPP=cc -E -DIR=zuc -EXHEADER=zuc.h -GENERAL=Makefile -HEADER=zuc.h -INCLUDES= -LIB=../../libcrypto.a -LIBOBJ=zuc.o -LIBSRC=zuc.c -RC4_ENC=rc4_enc.o rc4_skey.o -SRC=zuc.c -TEST= -TOP=../.. -ZUC_ENC=zuc.o -RELATIVE_DIRECTORY= RELATIVE_DIRECTORY=crypto/bn AFLAGS=-I.. -I../.. -I../../include ALL=Makefile bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c bn_asm.c bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c bn_depr.c bn_const.c bn_x931p.c bn_lcl.h bn_prime.h bn.h @@ -745,22 +677,22 @@ TEST=ecdhtest.c TOP=../.. RELATIVE_DIRECTORY= RELATIVE_DIRECTORY=crypto/ecies -ALL=Makefile ecies_lib.c ecies_asn1.c ecies_err.c kdf_x9_63.c ecies_locl.h ecies.h kdf.h +ALL=Makefile ecies_lib.c ecies_asn1.c ecies_err.c ecies_locl.h ecies.h APPS= AR=ar r CC=cc CFLAG=-g -Wall CFLAGS=-I.. -I../.. -I../../include -g -Wall DIR=ecies -EXHEADER=ecies.h kdf.h +EXHEADER=ecies.h GENERAL=Makefile -HEADER=ecies_locl.h ecies.h kdf.h +HEADER=ecies_locl.h ecies.h INCLUDES=-I.. -I../.. -I../../include LIB=../../libcrypto.a -LIBOBJ=ecies_lib.o ecies_asn1.o ecies_err.o kdf_x9_63.o -LIBSRC=ecies_lib.c ecies_asn1.c ecies_err.c kdf_x9_63.c +LIBOBJ=ecies_lib.o ecies_asn1.o ecies_err.o +LIBSRC=ecies_lib.c ecies_asn1.c ecies_err.c MAKEFILE=Makefile -SRC=ecies_lib.c ecies_asn1.c ecies_err.c kdf_x9_63.c +SRC=ecies_lib.c ecies_asn1.c ecies_err.c TEST=eciestest.c TOP=../.. RELATIVE_DIRECTORY= @@ -966,7 +898,7 @@ TEST= TOP=../.. RELATIVE_DIRECTORY= RELATIVE_DIRECTORY=crypto/pem -ALL=Makefile pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c pem.h pem2.h +ALL=Makefile pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c pem_sm2.c pem.h pem2.h APPS= AR=ar r CC=cc @@ -978,10 +910,10 @@ GENERAL=Makefile HEADER=pem.h pem2.h INCLUDES=-I.. -I../.. -I../../include LIB=../../libcrypto.a -LIBOBJ=pem_sign.o pem_seal.o pem_info.o pem_lib.o pem_all.o pem_err.o pem_x509.o pem_xaux.o pem_oth.o pem_pk8.o pem_pkey.o pvkfmt.o -LIBSRC=pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c +LIBOBJ=pem_sign.o pem_seal.o pem_info.o pem_lib.o pem_all.o pem_err.o pem_x509.o pem_xaux.o pem_oth.o pem_pk8.o pem_pkey.o pvkfmt.o pem_sm2.o +LIBSRC=pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c pem_sm2.c MAKEFILE=Makefile -SRC=pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c +SRC=pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c pem_sm2.c TEST= TOP=../.. RELATIVE_DIRECTORY= @@ -1301,25 +1233,237 @@ SRC=cmac.c cm_ameth.c cm_pmeth.c TEST= TOP=../.. RELATIVE_DIRECTORY= +RELATIVE_DIRECTORY=crypto/sm2 +ALL=Makefile sm2_lib.c sm2_asn1.c sm2_err.c sm2_sign.c sm2_enc.c sm2_kap.c sm2.h +APPS= +AR=ar r +CC=cc +CFLAG=-g -Wall +CFLAGS=-I.. -I../.. -I../../include -g -Wall +DIR=sm2 +EXHEADER=sm2.h +GENERAL=Makefile +HEADER=sm2.h +INCLUDES=-I.. -I../.. -I../../include +LIB=../../libcrypto.a +LIBOBJ=sm2_lib.o sm2_asn1.o sm2_err.o sm2_sign.o sm2_enc.o sm2_kap.o +LIBSRC=sm2_lib.c sm2_asn1.c sm2_err.c sm2_sign.c sm2_enc.c sm2_kap.c +MAKEFILE=Makefile +SRC=sm2_lib.c sm2_asn1.c sm2_err.c sm2_sign.c sm2_enc.c sm2_kap.c +TEST=sm2test.c +TOP=../.. +RELATIVE_DIRECTORY= +RELATIVE_DIRECTORY=crypto/sm3 +AFLAGS=-I.. -I../.. -I../../include +ALL=Makefile sm3.c byteorder.h sm3.h +APPS= +AR=ar r +ASFLAGS=-I.. -I../.. -I../../include +CC=cc +CFLAG=-g +CFLAGS=-I.. -I../.. -I../../include -g +CPP=cc -E +DIR=sm3 +EXHEADER=sm3.h +GENERAL=Makefile +HEADER=byteorder.h sm3.h +INCLUDES=-I.. -I../.. -I../../include +LIB=../../libcrypto.a +LIBOBJ=sm3.o +LIBSRC=sm3.c +MAKEFILE=Makefile +SM3_ASM_OBJ= +SRC=sm3.c +TEST=sm3test.c +TOP=../.. +RELATIVE_DIRECTORY= +RELATIVE_DIRECTORY=crypto/sms4 +ALL=Makefile sms4_cbc.c sms4_cfb.c sms4_ecb.c sms4_ofb.c sms4_ctr.c sms4_wrap.c sms4_common.c sms4_setkey.c sms4_enc.c ../../include/openssl/modes.h sms4_lcl.h sms4.h +APPS= +AR=ar r +CC=cc +CFLAG=-g +CFLAGS= -g +DIR=sms4 +EXHEADER=sms4.h +GENERAL=Makefile +HEADER=../../include/openssl/modes.h sms4_lcl.h sms4.h +INCLUDES= +LIB=../../libcrypto.a +LIBOBJ=sms4_cbc.o sms4_cfb.o sms4_ecb.o sms4_ofb.o sms4_ctr.o sms4_wrap.o sms4_common.o sms4_setkey.o sms4_enc.o +LIBSRC=sms4_cbc.c sms4_cfb.c sms4_ecb.c sms4_ofb.c sms4_ctr.c sms4_wrap.c sms4_common.c sms4_setkey.c sms4_enc.c +MAKEFILE=Makefile +SRC=sms4_cbc.c sms4_cfb.c sms4_ecb.c sms4_ofb.c sms4_ctr.c sms4_wrap.c sms4_common.c sms4_setkey.c sms4_enc.c +TEST= +TOP=../.. +RELATIVE_DIRECTORY= +RELATIVE_DIRECTORY=crypto/ecies +ALL=Makefile ecies_lib.c ecies_asn1.c ecies_err.c ecies_locl.h ecies.h +APPS= +AR=ar r +CC=cc +CFLAG=-g -Wall +CFLAGS=-I.. -I../.. -I../../include -g -Wall +DIR=ecies +EXHEADER=ecies.h +GENERAL=Makefile +HEADER=ecies_locl.h ecies.h +INCLUDES=-I.. -I../.. -I../../include +LIB=../../libcrypto.a +LIBOBJ=ecies_lib.o ecies_asn1.o ecies_err.o +LIBSRC=ecies_lib.c ecies_asn1.c ecies_err.c +MAKEFILE=Makefile +SRC=ecies_lib.c ecies_asn1.c ecies_err.c +TEST=eciestest.c +TOP=../.. +RELATIVE_DIRECTORY= +RELATIVE_DIRECTORY=crypto/cpk +ALL=Makefile cpk_lib.c cpk_map.c cpk_kap.c cpk_asn1.c cpk_prn.c cpk_err.c cpk.h +APPS= +AR=ar r +CC=cc +CFLAG=-g -Wall +CFLAGS=-I.. -I../.. -I../../include -g -Wall +DIR=cpk +EXHEADER=cpk.h +GENERAL=Makefile +HEADER=cpk.h +INCLUDES=-I.. -I../.. -I../../include +LIB=../../libcrypto.a +LIBOBJ=cpk_lib.o cpk_map.o cpk_kap.o cpk_asn1.o cpk_prn.o cpk_err.o +LIBSRC=cpk_lib.c cpk_map.c cpk_kap.c cpk_asn1.c cpk_prn.c cpk_err.c +MAKEFILE=Makefile +SRC=cpk_lib.c cpk_map.c cpk_kap.c cpk_asn1.c cpk_prn.c cpk_err.c +TEST=cpktest.c +TOP=../.. +RELATIVE_DIRECTORY= +RELATIVE_DIRECTORY=crypto/zuc +AFLAGS= +ALL=Makefile zuc.c zuc.h +APPS= +AR=ar r +ASFLAGS= +CC=cc +CFLAG=-g +CFLAGS= -g +CPP=cc -E +DIR=zuc +EXHEADER=zuc.h +GENERAL=Makefile +HEADER=zuc.h +INCLUDES= +LIB=../../libcrypto.a +LIBOBJ=zuc.o +LIBSRC=zuc.c +RC4_ENC=rc4-586.o +SRC=zuc.c +TEST= +TOP=../.. +ZUC_ENC=zuc.o +RELATIVE_DIRECTORY= +RELATIVE_DIRECTORY=crypto/cbcmac +ALL=Makefile cbcmac.c cbcmac_err.c cbcm_ameth.c cbcm_pmeth.c cbcmac.h +APPS= +AR=ar r +CC=cc +CFLAG=-g +CFLAGS= -g +DIR=cbcmac +EXHEADER=cbcmac.h +GENERAL=Makefile +HEADER=cbcmac.h +INCLUDES= +LIB=../../libcrypto.a +LIBOBJ=cbcmac.o cbcmac_err.o cbcm_ameth.o cbcm_pmeth.o +LIBSRC=cbcmac.c cbcmac_err.c cbcm_ameth.c cbcm_pmeth.c +MAKEFILE=Makefile +SRC=cbcmac.c cbcmac_err.c cbcm_ameth.c cbcm_pmeth.c +TEST= +TOP=../.. +RELATIVE_DIRECTORY= +RELATIVE_DIRECTORY=crypto/otp +AFLAGS=-I.. -I../.. -I../../include +ALL=Makefile otp.c otp.h +APPS= +AR=ar r +ASFLAGS=-I.. -I../.. -I../../include +CC=cc +CFLAG=-g +CFLAGS=-I.. -I../.. -I../../include -g +CPP=cc -E +DIR=otp +EXHEADER=otp.h +GENERAL=Makefile +HEADER=otp.h +INCLUDES=-I.. -I../.. -I../../include +LIB=../../libcrypto.a +LIBOBJ=otp.o +LIBSRC=otp.c +MAKEFILE=Makefile +SM3_ASM_OBJ= +SRC=otp.c +TEST=otptest.c +TOP=../.. +RELATIVE_DIRECTORY= +RELATIVE_DIRECTORY=crypto/skf +ALL=Makefile skf_dev.c skf_token.c skf_dgst.c skf_ec.c skf_enc.c skf_err.c skf_errstr.c skf_handle.c skf_mac.c skf_rand.c skf_rsa.c skf_sesskey.c skf_types.c skf_lcl.h skf.h +APPS= +AR=ar r +CC=cc +CFLAG=-g +CFLAGS= -g +DIR=skf +EXHEADER=skf.h +GENERAL=Makefile +HEADER=skf_lcl.h skf.h +INCLUDES= +LIB=../../libcrypto.a +LIBOBJ=skf_dev.o skf_token.o skf_dgst.o skf_ec.o skf_enc.o skf_err.o skf_errstr.o skf_handle.o skf_mac.o skf_rand.o skf_rsa.o skf_sesskey.o skf_types.o +LIBSRC=skf_dev.c skf_token.c skf_dgst.c skf_ec.c skf_enc.c skf_err.c skf_errstr.c skf_handle.c skf_mac.c skf_rand.c skf_rsa.c skf_sesskey.c skf_types.c +MAKEFILE=Makefile +SRC=skf_dev.c skf_token.c skf_dgst.c skf_ec.c skf_enc.c skf_err.c skf_errstr.c skf_handle.c skf_mac.c skf_rand.c skf_rsa.c skf_sesskey.c skf_types.c +TEST= +TOP=../.. +RELATIVE_DIRECTORY= +RELATIVE_DIRECTORY=crypto/kdf +ALL=Makefile kdf_x9_63.c kdf.h +APPS= +AR=ar r +CC=cc +CFLAG=-g -Wall +CFLAGS=-I.. -I../.. -I../../include -g -Wall +DIR=kdf +EXHEADER=kdf.h +GENERAL=Makefile +HEADER=kdf.h +INCLUDES=-I.. -I../.. -I../../include +LIB=../../libcrypto.a +LIBOBJ=kdf_x9_63.o +LIBSRC=kdf_x9_63.c +MAKEFILE=Makefile +SRC=kdf_x9_63.c +TEST=kdftest.c +TOP=../.. +RELATIVE_DIRECTORY= RELATIVE_DIRECTORY=ssl -ALL=Makefile README ssl-lib.com install.com s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c s3_cbc.c s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c t1_ext.c d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c d1_both.c d1_srtp.c ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c ssl_ciph.c ssl_stat.c ssl_rsa.c ssl_asn1.c ssl_txt.c ssl_algs.c ssl_conf.c bio_ssl.c ssl_err.c kssl.c t1_reneg.c tls_srp.c t1_trce.c ssl_utst.c ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h srtp.h ssl_locl.h kssl_lcl.h +ALL=Makefile README ssl-lib.com install.com s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c s3_cbc.c s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c t1_ext.c d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c d1_both.c d1_srtp.c gm_meth.c gm_srvr.c gm_clnt.c gm_lib.c gm_enc.c ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c ssl_ciph.c ssl_stat.c ssl_rsa.c ssl_asn1.c ssl_txt.c ssl_algs.c ssl_conf.c bio_ssl.c ssl_err.c kssl.c t1_reneg.c tls_srp.c t1_trce.c ssl_utst.c ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h gmssl1.h kssl.h srtp.h ssl_locl.h kssl_lcl.h APPS= AR=ar r CC=cc CFLAG=-g CFLAGS=-I../crypto -I.. -I../include -g DIR=ssl -EXHEADER=ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h srtp.h +EXHEADER=ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h gmssl1.h kssl.h srtp.h GENERAL=Makefile README ssl-lib.com install.com -HEADER=ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h srtp.h ssl_locl.h kssl_lcl.h +HEADER=ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h gmssl1.h kssl.h srtp.h ssl_locl.h kssl_lcl.h INCLUDES=-I../crypto -I.. -I../include KRB5_INCLUDES= LIB=../libssl.a -LIBOBJ=s2_meth.o s2_srvr.o s2_clnt.o s2_lib.o s2_enc.o s2_pkt.o s3_meth.o s3_srvr.o s3_clnt.o s3_lib.o s3_enc.o s3_pkt.o s3_both.o s3_cbc.o s23_meth.o s23_srvr.o s23_clnt.o s23_lib.o s23_pkt.o t1_meth.o t1_srvr.o t1_clnt.o t1_lib.o t1_enc.o t1_ext.o d1_meth.o d1_srvr.o d1_clnt.o d1_lib.o d1_pkt.o d1_both.o d1_srtp.o ssl_lib.o ssl_err2.o ssl_cert.o ssl_sess.o ssl_ciph.o ssl_stat.o ssl_rsa.o ssl_asn1.o ssl_txt.o ssl_algs.o ssl_conf.o bio_ssl.o ssl_err.o kssl.o t1_reneg.o tls_srp.o t1_trce.o ssl_utst.o -LIBSRC=s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c s3_cbc.c s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c t1_ext.c d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c d1_both.c d1_srtp.c ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c ssl_ciph.c ssl_stat.c ssl_rsa.c ssl_asn1.c ssl_txt.c ssl_algs.c ssl_conf.c bio_ssl.c ssl_err.c kssl.c t1_reneg.c tls_srp.c t1_trce.c ssl_utst.c +LIBOBJ=s2_meth.o s2_srvr.o s2_clnt.o s2_lib.o s2_enc.o s2_pkt.o s3_meth.o s3_srvr.o s3_clnt.o s3_lib.o s3_enc.o s3_pkt.o s3_both.o s3_cbc.o s23_meth.o s23_srvr.o s23_clnt.o s23_lib.o s23_pkt.o t1_meth.o t1_srvr.o t1_clnt.o t1_lib.o t1_enc.o t1_ext.o d1_meth.o d1_srvr.o d1_clnt.o d1_lib.o d1_pkt.o d1_both.o d1_srtp.o gm_meth.o gm_srvr.o gm_clnt.o gm_lib.o gm_enc.o ssl_lib.o ssl_err2.o ssl_cert.o ssl_sess.o ssl_ciph.o ssl_stat.o ssl_rsa.o ssl_asn1.o ssl_txt.o ssl_algs.o ssl_conf.o bio_ssl.o ssl_err.o kssl.o t1_reneg.o tls_srp.o t1_trce.o ssl_utst.o +LIBSRC=s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c s3_cbc.c s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c t1_ext.c d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c d1_both.c d1_srtp.c gm_meth.c gm_srvr.c gm_clnt.c gm_lib.c gm_enc.c ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c ssl_ciph.c ssl_stat.c ssl_rsa.c ssl_asn1.c ssl_txt.c ssl_algs.c ssl_conf.c bio_ssl.c ssl_err.c kssl.c t1_reneg.c tls_srp.c t1_trce.c ssl_utst.c MAKEFILE=Makefile SHARED_LIB=libssl -SRC=s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c s3_cbc.c s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c t1_ext.c d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c d1_both.c d1_srtp.c ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c ssl_ciph.c ssl_stat.c ssl_rsa.c ssl_asn1.c ssl_txt.c ssl_algs.c ssl_conf.c bio_ssl.c ssl_err.c kssl.c t1_reneg.c tls_srp.c t1_trce.c ssl_utst.c +SRC=s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c s3_cbc.c s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c t1_ext.c d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c d1_both.c d1_srtp.c gm_meth.c gm_srvr.c gm_clnt.c gm_lib.c gm_enc.c ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c ssl_ciph.c ssl_stat.c ssl_rsa.c ssl_asn1.c ssl_txt.c ssl_algs.c ssl_conf.c bio_ssl.c ssl_err.c kssl.c t1_reneg.c tls_srp.c t1_trce.c ssl_utst.c TEST=ssltest.c heartbeat_test.c TOP=.. RELATIVE_DIRECTORY= diff --git a/Makefile b/Makefile index ba331f45..508b92a3 100644 --- a/Makefile +++ b/Makefile @@ -151,7 +151,7 @@ SDIRS= \ buffer bio stack lhash rand err \ evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \ cms pqueue ts srp cmac \ - sm2 sm3 sms4 ecies cpk zuc cbcmac otp + sm2 sm3 sms4 sm9 ecies cpk zuc cbcmac otp skf kdf # keep in mind that the above list is adjusted by ./Configure # according to no-xxx arguments... diff --git a/Makefile.bak b/Makefile.bak deleted file mode 100644 index 3b155926..00000000 --- a/Makefile.bak +++ /dev/null @@ -1,681 +0,0 @@ -### Generated automatically from Makefile.org by Configure. - -## -## Makefile for OpenSSL -## - -VERSION=1.0.2d-fips -MAJOR=1 -MINOR=0.2 -SHLIB_VERSION_NUMBER=1.0.0 -SHLIB_VERSION_HISTORY= -SHLIB_MAJOR=1 -SHLIB_MINOR=0.0 -SHLIB_EXT= -PLATFORM=dist -OPTIONS= no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-libunbound no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-ssl-trace no-store no-unit-test no-zlib no-zlib-dynamic static-engine -CONFIGURE_ARGS=dist -SHLIB_TARGET= - -# HERE indicates where this Makefile lives. This can be used to indicate -# where sub-Makefiles are expected to be. Currently has very limited usage, -# and should probably not be bothered with at all. -HERE=. - -# INSTALL_PREFIX is for package builders so that they can configure -# for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/. -# Normally it is left empty. -INSTALL_PREFIX= -INSTALLTOP=/usr/local/ssl - -# Do not edit this manually. Use Configure --openssldir=DIR do change this! -OPENSSLDIR=/usr/local/ssl - -# NO_IDEA - Define to build without the IDEA algorithm -# NO_RC4 - Define to build without the RC4 algorithm -# NO_RC2 - Define to build without the RC2 algorithm -# THREADS - Define when building with threads, you will probably also need any -# system defines as well, i.e. _REENTERANT for Solaris 2.[34] -# TERMIO - Define the termio terminal subsystem, needed if sgtty is missing. -# TERMIOS - Define the termios terminal subsystem, Silicon Graphics. -# LONGCRYPT - Define to use HPUX 10.x's long password modification to crypt(3). -# DEVRANDOM - Give this the value of the 'random device' if your OS supports -# one. 32 bytes will be read from this when the random -# number generator is initalised. -# SSL_FORBID_ENULL - define if you want the server to be not able to use the -# NULL encryption ciphers. -# -# LOCK_DEBUG - turns on lots of lock debug output :-) -# REF_CHECK - turn on some xyz_free() assertions. -# REF_PRINT - prints some stuff on structure free. -# CRYPTO_MDEBUG - turns on my 'memory leak' detecting stuff -# MFUNC - Make all Malloc/Free/Realloc calls call -# CRYPTO_malloc/CRYPTO_free/CRYPTO_realloc which can be setup to -# call application defined callbacks via CRYPTO_set_mem_functions() -# MD5_ASM needs to be defined to use the x86 assembler for MD5 -# SHA1_ASM needs to be defined to use the x86 assembler for SHA1 -# RMD160_ASM needs to be defined to use the x86 assembler for RIPEMD160 -# Do not define B_ENDIAN or L_ENDIAN if 'unsigned long' == 8. It must -# equal 4. -# PKCS1_CHECK - pkcs1 tests. - -CC= cc -CFLAG= -O -DEPFLAG= -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST -PEX_LIBS= -EX_LIBS= -EXE_EXT= -ARFLAGS= -AR= ar $(ARFLAGS) r -RANLIB= /usr/bin/ranlib -NM= nm -PERL= /usr/bin/perl -TAR= tar -TARFLAGS= --no-recursion -MAKEDEPPROG=makedepend -LIBDIR=lib - -# We let the C compiler driver to take care of .s files. This is done in -# order to be excused from maintaining a separate set of architecture -# dependent assembler flags. E.g. if you throw -mcpu=ultrasparc at SPARC -# gcc, then the driver will automatically translate it to -xarch=v8plus -# and pass it down to assembler. -AS=$(CC) -c -ASFLAG=$(CFLAG) - -# For x86 assembler: Set PROCESSOR to 386 if you want to support -# the 80386. -PROCESSOR= - -# CPUID module collects small commonly used assembler snippets -CPUID_OBJ= mem_clr.o -BN_ASM= bn_asm.o -EC_ASM= -DES_ENC= des_enc.o fcrypt_b.o -AES_ENC= aes_core.o aes_cbc.o -BF_ENC= bf_enc.o -CAST_ENC= c_enc.o -RC4_ENC= rc4_enc.o rc4_skey.o -RC5_ENC= rc5_enc.o -MD5_ASM_OBJ= -SHA1_ASM_OBJ= -RMD160_ASM_OBJ= -WP_ASM_OBJ= wp_block.o -CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o -MODES_ASM_OBJ= -ENGINES_ASM_OBJ= -PERLASM_SCHEME= - -# KRB5 stuff -KRB5_INCLUDES= -LIBKRB5= - -# Zlib stuff -ZLIB_INCLUDE= -LIBZLIB= - -# TOP level FIPS install directory. -FIPSDIR=/usr/local/ssl/fips-2.0 - -# This is the location of fipscanister.o and friends. -# The FIPS module build will place it $(INSTALLTOP)/lib -# but since $(INSTALLTOP) can only take the default value -# when the module is built it will be in /usr/local/ssl/lib -# $(INSTALLTOP) for this build may be different so hard -# code the path. - -FIPSLIBDIR= - -# The location of the library which contains fipscanister.o -# normally it will be libcrypto unless fipsdso is set in which -# case it will be libfips. If not compiling in FIPS mode at all -# this is empty making it a useful test for a FIPS compile. - -FIPSCANLIB= - -# Shared library base address. Currently only used on Windows. -# - -BASEADDR=0xFB00000 - -DIRS= crypto ssl engines apps test tools -ENGDIRS= ccgost -SHLIBDIRS= crypto ssl - -# dirs in crypto to build -SDIRS= \ - objects \ - md4 md5 sha mdc2 hmac ripemd whrlpool \ - des aes rc2 rc4 idea bf cast camellia seed modes \ - bn ec rsa dsa ecdsa dh ecdh ecies dso engine \ - buffer bio stack lhash rand err \ - evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \ - cms pqueue ts srp cmac \ - sm2 sm3 sms4 ecies cpk zuc cbcmac otp - -# keep in mind that the above list is adjusted by ./Configure -# according to no-xxx arguments... - -# tests to perform. "alltests" is a special word indicating that all tests -# should be performed. -TESTS = alltests - -MAKEFILE= Makefile - -MANDIR=$(OPENSSLDIR)/man -MAN1=1 -MAN3=3 -MANSUFFIX= -HTMLSUFFIX=html -HTMLDIR=$(OPENSSLDIR)/html -SHELL=/bin/sh - -TOP= . -ONEDIRS=out tmp -EDIRS= times doc bugs util include certs ms shlib mt demos perl sf dep VMS -WDIRS= windows -LIBS= libcrypto.a libssl.a -SHARED_CRYPTO=libcrypto$(SHLIB_EXT) -SHARED_SSL=libssl$(SHLIB_EXT) -SHARED_LIBS= -SHARED_LIBS_LINK_EXTS= -SHARED_LDFLAGS= - -GENERAL= Makefile -BASENAME= gmssl -NAME= $(BASENAME)-$(VERSION) -TARFILE= $(NAME).tar -WTARFILE= $(NAME)-win.tar -EXHEADER= e_os2.h -HEADER= e_os.h - -all: Makefile build_all - -# as we stick to -e, CLEARENV ensures that local variables in lower -# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn -# shell, which [annoyingly enough] terminates unset with error if VAR -# is not present:-( TOP= && unset TOP is tribute to HP-UX /bin/sh, -# which terminates unset with error if no variable was present:-( -CLEARENV= TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS} \ - $${INCLUDE+INCLUDE} $${INCLUDES+INCLUDES} \ - $${DIR+DIR} $${DIRS+DIRS} $${SRC+SRC} \ - $${LIBSRC+LIBSRC} $${LIBOBJ+LIBOBJ} $${ALL+ALL} \ - $${EXHEADER+EXHEADER} $${HEADER+HEADER} \ - $${GENERAL+GENERAL} $${CFLAGS+CFLAGS} \ - $${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS} \ - $${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS} $${SCRIPTS+SCRIPTS} \ - $${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS} \ - $${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS} - -BUILDENV= PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \ - CC='$(CC)' CFLAG='$(CFLAG)' \ - AS='$(CC)' ASFLAG='$(CFLAG) -c' \ - AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \ - CROSS_COMPILE='$(CROSS_COMPILE)' \ - PERL='$(PERL)' ENGDIRS='$(ENGDIRS)' \ - SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)' \ - INSTALL_PREFIX='$(INSTALL_PREFIX)' \ - INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)' \ - LIBDIR='$(LIBDIR)' \ - MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \ - DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)' \ - MAKEDEPPROG='$(MAKEDEPPROG)' \ - SHARED_LDFLAGS='$(SHARED_LDFLAGS)' \ - KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)' \ - ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \ - EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)' \ - SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)' \ - PEX_LIBS='$(PEX_LIBS)' EX_LIBS='$(EX_LIBS)' \ - CPUID_OBJ='$(CPUID_OBJ)' BN_ASM='$(BN_ASM)' \ - EC_ASM='$(EC_ASM)' DES_ENC='$(DES_ENC)' \ - AES_ENC='$(AES_ENC)' CMLL_ENC='$(CMLL_ENC)' \ - BF_ENC='$(BF_ENC)' CAST_ENC='$(CAST_ENC)' \ - RC4_ENC='$(RC4_ENC)' RC5_ENC='$(RC5_ENC)' \ - SHA1_ASM_OBJ='$(SHA1_ASM_OBJ)' \ - MD5_ASM_OBJ='$(MD5_ASM_OBJ)' \ - RMD160_ASM_OBJ='$(RMD160_ASM_OBJ)' \ - WP_ASM_OBJ='$(WP_ASM_OBJ)' \ - MODES_ASM_OBJ='$(MODES_ASM_OBJ)' \ - ENGINES_ASM_OBJ='$(ENGINES_ASM_OBJ)' \ - PERLASM_SCHEME='$(PERLASM_SCHEME)' \ - FIPSLIBDIR='${FIPSLIBDIR}' \ - FIPSDIR='${FIPSDIR}' \ - FIPSCANLIB="$${FIPSCANLIB:-$(FIPSCANLIB)}" \ - THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES= -# MAKEOVERRIDES= effectively "equalizes" GNU-ish and SysV-ish make flavors, -# which in turn eliminates ambiguities in variable treatment with -e. - -# BUILD_CMD is a generic macro to build a given target in a given -# subdirectory. The target must be given through the shell variable -# `target' and the subdirectory to build in must be given through `dir'. -# This macro shouldn't be used directly, use RECURSIVE_BUILD_CMD or -# BUILD_ONE_CMD instead. -# -# BUILD_ONE_CMD is a macro to build a given target in a given -# subdirectory if that subdirectory is part of $(DIRS). It requires -# exactly the same shell variables as BUILD_CMD. -# -# RECURSIVE_BUILD_CMD is a macro to build a given target in all -# subdirectories defined in $(DIRS). It requires that the target -# is given through the shell variable `target'. -BUILD_CMD= if [ -d "$$dir" ]; then \ - ( cd $$dir && echo "making $$target in $$dir..." && \ - $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. DIR=$$dir $$target \ - ) || exit 1; \ - fi -RECURSIVE_BUILD_CMD=for dir in $(DIRS); do $(BUILD_CMD); done -BUILD_ONE_CMD=\ - if expr " $(DIRS) " : ".* $$dir " >/dev/null 2>&1; then \ - $(BUILD_CMD); \ - fi - -reflect: - @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV) - -sub_all: build_all - -build_all: build_libs build_apps build_tests build_tools - -build_libs: build_libcrypto build_libssl openssl.pc - -build_libcrypto: build_crypto build_engines libcrypto.pc -build_libssl: build_ssl libssl.pc - -build_crypto: - @dir=crypto; target=all; $(BUILD_ONE_CMD) -build_ssl: build_crypto - @dir=ssl; target=all; $(BUILD_ONE_CMD) -build_engines: build_crypto - @dir=engines; target=all; $(BUILD_ONE_CMD) -build_apps: build_libs - @dir=apps; target=all; $(BUILD_ONE_CMD) -build_tests: build_libs - @dir=test; target=all; $(BUILD_ONE_CMD) -build_tools: build_libs - @dir=tools; target=all; $(BUILD_ONE_CMD) - -all_testapps: build_libs build_testapps -build_testapps: - @dir=crypto; target=testapps; $(BUILD_ONE_CMD) - -fips_premain_dso$(EXE_EXT): libcrypto.a - [ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAG) -Iinclude \ - -DFINGERPRINT_PREMAIN_DSO_LOAD -o $@ \ - $(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fipscanister.o \ - libcrypto.a $(EX_LIBS) - -libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT) - @if [ "$(SHLIB_TARGET)" != "" ]; then \ - if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \ - FIPSLD_LIBCRYPTO=libcrypto.a ; \ - FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \ - export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \ - fi; \ - $(MAKE) -e SHLIBDIRS=crypto CC="$${CC:-$(CC)}" build-shared && \ - (touch -c fips_premain_dso$(EXE_EXT) || :); \ - else \ - echo "There's no support for shared libraries on this platform" >&2; \ - exit 1; \ - fi - -libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a - @if [ "$(SHLIB_TARGET)" != "" ]; then \ - $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ - else \ - echo "There's no support for shared libraries on this platform" >&2; \ - exit 1; \ - fi - -clean-shared: - @set -e; for i in $(SHLIBDIRS); do \ - if [ -n "$(SHARED_LIBS_LINK_EXTS)" ]; then \ - tmp="$(SHARED_LIBS_LINK_EXTS)"; \ - for j in $${tmp:-x}; do \ - ( set -x; rm -f lib$$i$$j ); \ - done; \ - fi; \ - ( set -x; rm -f lib$$i$(SHLIB_EXT) ); \ - if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ - ( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \ - fi; \ - done - -link-shared: - @ set -e; for i in $(SHLIBDIRS); do \ - $(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \ - LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \ - LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \ - symlink.$(SHLIB_TARGET); \ - libs="$$libs -l$$i"; \ - done - -build-shared: do_$(SHLIB_TARGET) link-shared - -do_$(SHLIB_TARGET): - @ set -e; libs='-L. $(SHLIBDEPS)'; for i in $(SHLIBDIRS); do \ - if [ "$$i" = "ssl" -a -n "$(LIBKRB5)" ]; then \ - libs="$(LIBKRB5) $$libs"; \ - fi; \ - $(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \ - LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \ - LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \ - LIBDEPS="$$libs $(EX_LIBS)" \ - link_a.$(SHLIB_TARGET); \ - libs="-l$$i $$libs"; \ - done - -libcrypto.pc: Makefile - @ ( echo 'prefix=$(INSTALLTOP)'; \ - echo 'exec_prefix=$${prefix}'; \ - echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ - echo 'includedir=$${prefix}/include'; \ - echo ''; \ - echo 'Name: OpenSSL-libcrypto'; \ - echo 'Description: OpenSSL cryptography library'; \ - echo 'Version: '$(VERSION); \ - echo 'Requires: '; \ - echo 'Libs: -L$${libdir} -lcrypto'; \ - echo 'Libs.private: $(EX_LIBS)'; \ - echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc - -libssl.pc: Makefile - @ ( echo 'prefix=$(INSTALLTOP)'; \ - echo 'exec_prefix=$${prefix}'; \ - echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ - echo 'includedir=$${prefix}/include'; \ - echo ''; \ - echo 'Name: OpenSSL-libssl'; \ - echo 'Description: Secure Sockets Layer and cryptography libraries'; \ - echo 'Version: '$(VERSION); \ - echo 'Requires.private: libcrypto'; \ - echo 'Libs: -L$${libdir} -lssl'; \ - echo 'Libs.private: $(EX_LIBS)'; \ - echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc - -openssl.pc: Makefile - @ ( echo 'prefix=$(INSTALLTOP)'; \ - echo 'exec_prefix=$${prefix}'; \ - echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ - echo 'includedir=$${prefix}/include'; \ - echo ''; \ - echo 'Name: OpenSSL'; \ - echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \ - echo 'Version: '$(VERSION); \ - echo 'Requires: libssl libcrypto' ) > openssl.pc - -Makefile: Makefile.org Configure config - @echo "Makefile is older than Makefile.org, Configure or config." - @echo "Reconfigure the source tree (via './config' or 'perl Configure'), please." - @false - -libclean: - rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so engines/*.dll engines/*.dylib *.a engines/*.a */lib */*/lib - -clean: libclean - rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c - @set -e; target=clean; $(RECURSIVE_BUILD_CMD) - rm -f $(LIBS) - rm -f openssl.pc libssl.pc libcrypto.pc - rm -f speed.* .pure - rm -f $(TARFILE) - @set -e; for i in $(ONEDIRS) ;\ - do \ - rm -fr $$i/*; \ - done - -makefile.one: files - $(PERL) util/mk1mf.pl >makefile.one; \ - sh util/do_ms.sh - -files: - $(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO - @set -e; target=files; $(RECURSIVE_BUILD_CMD) - -links: - @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl - @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER) - @set -e; target=links; $(RECURSIVE_BUILD_CMD) - -gentests: - @(cd test && echo "generating dummy tests (if needed)..." && \ - $(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate ); - -dclean: - rm -rf *.bak include/openssl certs/.0 - @set -e; target=dclean; $(RECURSIVE_BUILD_CMD) - -rehash: rehash.time -rehash.time: certs apps - @if [ -z "$(CROSS_COMPILE)" ]; then \ - (OPENSSL="`pwd`/util/opensslwrap.sh"; \ - [ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \ - OPENSSL_DEBUG_MEMORY=on; \ - export OPENSSL OPENSSL_DEBUG_MEMORY; \ - $(PERL) tools/c_rehash certs/demo) && \ - touch rehash.time; \ - else :; fi - -test: tests - -tests: rehash - @(cd test && echo "testing..." && \ - $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests ); - OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a - -report: - @$(PERL) util/selftest.pl - -update: errors stacks util/libeay.num util/ssleay.num TABLE - @set -e; target=update; $(RECURSIVE_BUILD_CMD) - -depend: - @set -e; target=depend; $(RECURSIVE_BUILD_CMD) - -lint: - @set -e; target=lint; $(RECURSIVE_BUILD_CMD) - -tags: - rm -f TAGS - find . -name '[^.]*.[ch]' | xargs etags -a - -errors: - $(PERL) util/ck_errf.pl -strict */*.c */*/*.c - $(PERL) util/mkerr.pl -recurse -write - (cd engines; $(MAKE) PERL=$(PERL) errors) - -stacks: - $(PERL) util/mkstack.pl -write - -util/libeay.num:: - $(PERL) util/mkdef.pl crypto update - -util/ssleay.num:: - $(PERL) util/mkdef.pl ssl update - -TABLE: Configure - (echo 'Output of `Configure TABLE'"':"; \ - $(PERL) Configure TABLE) > TABLE - -# Build distribution tar-file. As the list of files returned by "find" is -# pretty long, on several platforms a "too many arguments" error or similar -# would occur. Therefore the list of files is temporarily stored into a file -# and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal -# tar does not support the --files-from option. -tar: - find . -type d -print | xargs chmod 755 - find . -type f -print | xargs chmod a+r - find . -type f -perm -0100 -print | xargs chmod a+x - find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \ - $(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \ - tardy --user_number=0 --user_name=openssl \ - --group_number=0 --group_name=openssl \ - --prefix=openssl-$(VERSION) - |\ - gzip --best >../$(TARFILE).gz; \ - rm -f ../$(TARFILE).list; \ - ls -l ../$(TARFILE).gz - -tar-snap: - @$(TAR) $(TARFLAGS) -cvf - \ - `find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*' \! -name 'openssl' \! -name '*test' \! -name '.#*' \! -name '*~' | sort` |\ - tardy --user_number=0 --user_name=openssl \ - --group_number=0 --group_name=openssl \ - --prefix=openssl-$(VERSION) - > ../$(TARFILE);\ - ls -l ../$(TARFILE) - -dist: - $(PERL) Configure dist - @$(MAKE) dist_pem_h - @$(MAKE) SDIRS='$(SDIRS)' clean - @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' tar - -dist_pem_h: - (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) - -install: all install_docs install_sw - -install_sw: - @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ - $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ - $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \ - $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \ - $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ - $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ - $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ - $(INSTALL_PREFIX)$(OPENSSLDIR)/private - @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - @set -e; target=install; $(RECURSIVE_BUILD_CMD) - @set -e; liblist="$(LIBS)"; for i in $$liblist ;\ - do \ - if [ -f "$$i" ]; then \ - ( echo installing $$i; \ - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ - $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \ - fi; \ - done; - @set -e; if [ -n "$(SHARED_LIBS)" ]; then \ - tmp="$(SHARED_LIBS)"; \ - for i in $${tmp:-x}; \ - do \ - if [ -f "$$i" -o -f "$$i.a" ]; then \ - ( echo installing $$i; \ - if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ - c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \ - cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ - chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \ - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ - else \ - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ - fi ); \ - if expr $(PLATFORM) : 'mingw' > /dev/null; then \ - ( case $$i in \ - *crypto*) i=libeay32.dll;; \ - *ssl*) i=ssleay32.dll;; \ - esac; \ - echo installing $$i; \ - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ - chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \ - fi; \ - fi; \ - done; \ - ( here="`pwd`"; \ - cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \ - $(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \ - if [ "$(INSTALLTOP)" != "/usr" ]; then \ - echo 'OpenSSL shared libraries have been installed in:'; \ - echo ' $(INSTALLTOP)'; \ - echo ''; \ - sed -e '1,/^$$/d' doc/openssl-shared.txt; \ - fi; \ - fi - cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc - cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc - cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc - -install_html_docs: - here="`pwd`"; \ - filecase=; \ - case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \ - filecase=-i; \ - esac; \ - for subdir in apps crypto ssl; do \ - mkdir -p $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \ - for i in doc/$$subdir/*.pod; do \ - fn=`basename $$i .pod`; \ - echo "installing html/$$fn.$(HTMLSUFFIX)"; \ - cat $$i \ - | sed -r 's/L<([^)]*)(\([0-9]\))?\|([^)]*)(\([0-9]\))?>/L<\1|\3>/g' \ - | pod2html --podroot=doc --htmlroot=.. --podpath=apps:crypto:ssl \ - | sed -r 's/ $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \ - $(PERL) util/extract-names.pl < $$i | \ - grep -v $$filecase "^$$fn\$$" | \ - (cd $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \ - while read n; do \ - PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$(HTMLSUFFIX) "$$n".$(HTMLSUFFIX); \ - done); \ - done; \ - done - -install_docs: - @$(PERL) $(TOP)/util/mkdir-p.pl \ - $(INSTALL_PREFIX)$(MANDIR)/man1 \ - $(INSTALL_PREFIX)$(MANDIR)/man3 \ - $(INSTALL_PREFIX)$(MANDIR)/man5 \ - $(INSTALL_PREFIX)$(MANDIR)/man7 - @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \ - here="`pwd`"; \ - filecase=; \ - case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \ - filecase=-i; \ - esac; \ - set -e; for i in doc/apps/*.pod; do \ - fn=`basename $$i .pod`; \ - sec=`$(PERL) util/extract-section.pl 1 < $$i`; \ - echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ - (cd `$(PERL) util/dirname.pl $$i`; \ - sh -c "$$pod2man \ - --section=$$sec --center=OpenSSL \ - --release=$(VERSION) `basename $$i`") \ - > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ - $(PERL) util/extract-names.pl < $$i | \ - (grep -v $$filecase "^$$fn\$$"; true) | \ - (grep -v "[ ]"; true) | \ - (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ - while read n; do \ - PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \ - done); \ - done; \ - set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \ - fn=`basename $$i .pod`; \ - sec=`$(PERL) util/extract-section.pl 3 < $$i`; \ - echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ - (cd `$(PERL) util/dirname.pl $$i`; \ - sh -c "$$pod2man \ - --section=$$sec --center=OpenSSL \ - --release=$(VERSION) `basename $$i`") \ - > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ - $(PERL) util/extract-names.pl < $$i | \ - (grep -v $$filecase "^$$fn\$$"; true) | \ - (grep -v "[ ]"; true) | \ - (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ - while read n; do \ - PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \ - done); \ - done - -# DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/Makefile.org b/Makefile.org index a47bc222..42478f40 100644 --- a/Makefile.org +++ b/Makefile.org @@ -149,7 +149,7 @@ SDIRS= \ buffer bio stack lhash rand err \ evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \ cms pqueue ts jpake srp store cmac \ - sm2 sm3 sms4 ecies cpk zuc cbcmac otp + sm2 sm3 sms4 sm9 ecies cpk zuc cbcmac otp skf kdf # keep in mind that the above list is adjusted by ./Configure # according to no-xxx arguments... diff --git a/apps/Makefile b/apps/Makefile index f1477494..e3bac424 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -177,12 +177,14 @@ app_rand.o: ../include/openssl/buffer.h ../include/openssl/conf.h app_rand.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h app_rand.o: ../include/openssl/ec.h ../include/openssl/ecdh.h app_rand.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -app_rand.o: ../include/openssl/evp.h ../include/openssl/lhash.h +app_rand.o: ../include/openssl/err.h ../include/openssl/evp.h +app_rand.o: ../include/openssl/kdf.h ../include/openssl/lhash.h app_rand.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h app_rand.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h app_rand.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h app_rand.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h app_rand.o: ../include/openssl/safestack.h ../include/openssl/sha.h +app_rand.o: ../include/openssl/sm2.h ../include/openssl/sm3.h app_rand.o: ../include/openssl/stack.h ../include/openssl/symhacks.h app_rand.o: ../include/openssl/txt_db.h ../include/openssl/x509.h app_rand.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h @@ -193,49 +195,53 @@ apps.o: ../include/openssl/conf.h ../include/openssl/crypto.h apps.o: ../include/openssl/e_os2.h ../include/openssl/ec.h apps.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h apps.o: ../include/openssl/engine.h ../include/openssl/err.h -apps.o: ../include/openssl/evp.h ../include/openssl/lhash.h -apps.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -apps.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -apps.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -apps.o: ../include/openssl/pem.h ../include/openssl/pem2.h -apps.o: ../include/openssl/pkcs12.h ../include/openssl/pkcs7.h -apps.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -apps.o: ../include/openssl/sha.h ../include/openssl/stack.h -apps.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -apps.o: ../include/openssl/ui.h ../include/openssl/x509.h -apps.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.c apps.h +apps.o: ../include/openssl/evp.h ../include/openssl/kdf.h +apps.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +apps.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +apps.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +apps.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +apps.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h +apps.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h +apps.o: ../include/openssl/safestack.h ../include/openssl/sha.h +apps.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +apps.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +apps.o: ../include/openssl/txt_db.h ../include/openssl/ui.h +apps.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +apps.o: ../include/openssl/x509v3.h apps.c apps.h asn1pars.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h asn1pars.o: ../include/openssl/buffer.h ../include/openssl/conf.h asn1pars.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h asn1pars.o: ../include/openssl/ec.h ../include/openssl/ecdh.h asn1pars.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h asn1pars.o: ../include/openssl/err.h ../include/openssl/evp.h -asn1pars.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -asn1pars.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -asn1pars.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -asn1pars.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -asn1pars.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -asn1pars.o: ../include/openssl/safestack.h ../include/openssl/sha.h -asn1pars.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -asn1pars.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -asn1pars.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -asn1pars.o: asn1pars.c +asn1pars.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +asn1pars.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +asn1pars.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +asn1pars.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +asn1pars.o: ../include/openssl/pem.h ../include/openssl/pem2.h +asn1pars.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +asn1pars.o: ../include/openssl/sha.h ../include/openssl/sm2.h +asn1pars.o: ../include/openssl/sm3.h ../include/openssl/stack.h +asn1pars.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +asn1pars.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +asn1pars.o: ../include/openssl/x509v3.h apps.h asn1pars.c ca.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h ca.o: ../include/openssl/bn.h ../include/openssl/buffer.h ca.o: ../include/openssl/conf.h ../include/openssl/crypto.h ca.o: ../include/openssl/e_os2.h ../include/openssl/ec.h ca.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h ca.o: ../include/openssl/engine.h ../include/openssl/err.h -ca.o: ../include/openssl/evp.h ../include/openssl/lhash.h -ca.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -ca.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -ca.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ca.o: ../include/openssl/pem.h ../include/openssl/pem2.h -ca.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -ca.o: ../include/openssl/sha.h ../include/openssl/stack.h -ca.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -ca.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -ca.o: ../include/openssl/x509v3.h apps.h ca.c +ca.o: ../include/openssl/evp.h ../include/openssl/kdf.h +ca.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +ca.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +ca.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +ca.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +ca.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +ca.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ca.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +ca.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +ca.o: ../include/openssl/txt_db.h ../include/openssl/x509.h +ca.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ca.c ciphers.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h ciphers.o: ../include/openssl/buffer.h ../include/openssl/comp.h ciphers.o: ../include/openssl/conf.h ../include/openssl/crypto.h @@ -243,14 +249,16 @@ ciphers.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h ciphers.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ciphers.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h ciphers.o: ../include/openssl/err.h ../include/openssl/evp.h -ciphers.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +ciphers.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +ciphers.o: ../include/openssl/kdf.h ../include/openssl/kssl.h ciphers.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h ciphers.o: ../include/openssl/objects.h ../include/openssl/ocsp.h ciphers.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h ciphers.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h ciphers.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h ciphers.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h -ciphers.o: ../include/openssl/sha.h ../include/openssl/srtp.h +ciphers.o: ../include/openssl/sha.h ../include/openssl/sm2.h +ciphers.o: ../include/openssl/sm3.h ../include/openssl/srtp.h ciphers.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h ciphers.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h ciphers.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -263,63 +271,68 @@ cms.o: ../include/openssl/conf.h ../include/openssl/crypto.h cms.o: ../include/openssl/e_os2.h ../include/openssl/ec.h cms.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h cms.o: ../include/openssl/engine.h ../include/openssl/err.h -cms.o: ../include/openssl/evp.h ../include/openssl/lhash.h -cms.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -cms.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -cms.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -cms.o: ../include/openssl/pem.h ../include/openssl/pem2.h -cms.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -cms.o: ../include/openssl/sha.h ../include/openssl/stack.h -cms.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -cms.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -cms.o: ../include/openssl/x509v3.h apps.h cms.c +cms.o: ../include/openssl/evp.h ../include/openssl/kdf.h +cms.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +cms.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +cms.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +cms.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +cms.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +cms.o: ../include/openssl/safestack.h ../include/openssl/sha.h +cms.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +cms.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +cms.o: ../include/openssl/txt_db.h ../include/openssl/x509.h +cms.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h cms.c crl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h crl.o: ../include/openssl/buffer.h ../include/openssl/conf.h crl.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h crl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h crl.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h crl.o: ../include/openssl/err.h ../include/openssl/evp.h -crl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -crl.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -crl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -crl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -crl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -crl.o: ../include/openssl/safestack.h ../include/openssl/sha.h -crl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -crl.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -crl.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h crl.c +crl.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +crl.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +crl.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +crl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +crl.o: ../include/openssl/pem.h ../include/openssl/pem2.h +crl.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +crl.o: ../include/openssl/sha.h ../include/openssl/sm2.h +crl.o: ../include/openssl/sm3.h ../include/openssl/stack.h +crl.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +crl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +crl.o: ../include/openssl/x509v3.h apps.h crl.c crl2p7.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h crl2p7.o: ../include/openssl/buffer.h ../include/openssl/conf.h crl2p7.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h crl2p7.o: ../include/openssl/ec.h ../include/openssl/ecdh.h crl2p7.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h crl2p7.o: ../include/openssl/err.h ../include/openssl/evp.h -crl2p7.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -crl2p7.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -crl2p7.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -crl2p7.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -crl2p7.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -crl2p7.o: ../include/openssl/safestack.h ../include/openssl/sha.h -crl2p7.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -crl2p7.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -crl2p7.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -crl2p7.o: crl2p7.c +crl2p7.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +crl2p7.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +crl2p7.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +crl2p7.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +crl2p7.o: ../include/openssl/pem.h ../include/openssl/pem2.h +crl2p7.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +crl2p7.o: ../include/openssl/sha.h ../include/openssl/sm2.h +crl2p7.o: ../include/openssl/sm3.h ../include/openssl/stack.h +crl2p7.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +crl2p7.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +crl2p7.o: ../include/openssl/x509v3.h apps.h crl2p7.c dgst.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h dgst.o: ../include/openssl/buffer.h ../include/openssl/conf.h dgst.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h dgst.o: ../include/openssl/ec.h ../include/openssl/ecdh.h dgst.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h dgst.o: ../include/openssl/err.h ../include/openssl/evp.h -dgst.o: ../include/openssl/hmac.h ../include/openssl/lhash.h -dgst.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -dgst.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -dgst.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -dgst.o: ../include/openssl/pem.h ../include/openssl/pem2.h -dgst.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -dgst.o: ../include/openssl/sha.h ../include/openssl/stack.h -dgst.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -dgst.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -dgst.o: ../include/openssl/x509v3.h apps.h dgst.c +dgst.o: ../include/openssl/hmac.h ../include/openssl/kdf.h +dgst.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +dgst.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +dgst.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +dgst.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +dgst.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +dgst.o: ../include/openssl/safestack.h ../include/openssl/sha.h +dgst.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +dgst.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +dgst.o: ../include/openssl/txt_db.h ../include/openssl/x509.h +dgst.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h dgst.c dh.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h dh.o: ../include/openssl/bn.h ../include/openssl/buffer.h dh.o: ../include/openssl/conf.h ../include/openssl/crypto.h @@ -327,28 +340,32 @@ dh.o: ../include/openssl/dh.h ../include/openssl/e_os2.h dh.o: ../include/openssl/ec.h ../include/openssl/ecdh.h dh.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h dh.o: ../include/openssl/err.h ../include/openssl/evp.h -dh.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -dh.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -dh.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -dh.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -dh.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -dh.o: ../include/openssl/safestack.h ../include/openssl/sha.h -dh.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -dh.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -dh.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h dh.c +dh.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +dh.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +dh.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +dh.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +dh.o: ../include/openssl/pem.h ../include/openssl/pem2.h +dh.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +dh.o: ../include/openssl/sha.h ../include/openssl/sm2.h +dh.o: ../include/openssl/sm3.h ../include/openssl/stack.h +dh.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +dh.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +dh.o: ../include/openssl/x509v3.h apps.h dh.c dsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h dsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h dsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h -dsa.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h -dsa.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -dsa.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -dsa.o: ../include/openssl/err.h ../include/openssl/evp.h +dsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h +dsa.o: ../include/openssl/e_os2.h ../include/openssl/ec.h +dsa.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h +dsa.o: ../include/openssl/engine.h ../include/openssl/err.h +dsa.o: ../include/openssl/evp.h ../include/openssl/kdf.h dsa.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h dsa.o: ../include/openssl/objects.h ../include/openssl/ocsp.h dsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h dsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h dsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h dsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h +dsa.o: ../include/openssl/sm2.h ../include/openssl/sm3.h dsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h dsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h dsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h dsa.c @@ -359,16 +376,16 @@ dsaparam.o: ../include/openssl/dh.h ../include/openssl/dsa.h dsaparam.o: ../include/openssl/e_os2.h ../include/openssl/ec.h dsaparam.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h dsaparam.o: ../include/openssl/engine.h ../include/openssl/err.h -dsaparam.o: ../include/openssl/evp.h ../include/openssl/lhash.h -dsaparam.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -dsaparam.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -dsaparam.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -dsaparam.o: ../include/openssl/pem.h ../include/openssl/pem2.h -dsaparam.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -dsaparam.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -dsaparam.o: ../include/openssl/sha.h ../include/openssl/stack.h -dsaparam.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -dsaparam.o: ../include/openssl/ui.h ../include/openssl/x509.h +dsaparam.o: ../include/openssl/evp.h ../include/openssl/kdf.h +dsaparam.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +dsaparam.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +dsaparam.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +dsaparam.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +dsaparam.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +dsaparam.o: ../include/openssl/safestack.h ../include/openssl/sha.h +dsaparam.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +dsaparam.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +dsaparam.o: ../include/openssl/txt_db.h ../include/openssl/x509.h dsaparam.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h dsaparam.o: dsaparam.c ec.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h @@ -377,47 +394,53 @@ ec.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h ec.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ec.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h ec.o: ../include/openssl/err.h ../include/openssl/evp.h -ec.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -ec.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -ec.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -ec.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -ec.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -ec.o: ../include/openssl/safestack.h ../include/openssl/sha.h -ec.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -ec.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -ec.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ec.c +ec.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +ec.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +ec.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +ec.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +ec.o: ../include/openssl/pem.h ../include/openssl/pem2.h +ec.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +ec.o: ../include/openssl/sha.h ../include/openssl/sm2.h +ec.o: ../include/openssl/sm3.h ../include/openssl/stack.h +ec.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +ec.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +ec.o: ../include/openssl/x509v3.h apps.h ec.c ecparam.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h ecparam.o: ../include/openssl/bn.h ../include/openssl/buffer.h ecparam.o: ../include/openssl/conf.h ../include/openssl/crypto.h ecparam.o: ../include/openssl/e_os2.h ../include/openssl/ec.h ecparam.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h ecparam.o: ../include/openssl/engine.h ../include/openssl/err.h -ecparam.o: ../include/openssl/evp.h ../include/openssl/lhash.h -ecparam.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -ecparam.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -ecparam.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ecparam.o: ../include/openssl/pem.h ../include/openssl/pem2.h -ecparam.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -ecparam.o: ../include/openssl/sha.h ../include/openssl/stack.h -ecparam.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -ecparam.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -ecparam.o: ../include/openssl/x509v3.h apps.h ecparam.c +ecparam.o: ../include/openssl/evp.h ../include/openssl/kdf.h +ecparam.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +ecparam.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +ecparam.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +ecparam.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +ecparam.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +ecparam.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ecparam.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +ecparam.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +ecparam.o: ../include/openssl/txt_db.h ../include/openssl/x509.h +ecparam.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h +ecparam.o: ecparam.c enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h enc.o: ../include/openssl/buffer.h ../include/openssl/comp.h enc.o: ../include/openssl/conf.h ../include/openssl/crypto.h enc.o: ../include/openssl/e_os2.h ../include/openssl/ec.h enc.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h enc.o: ../include/openssl/engine.h ../include/openssl/err.h -enc.o: ../include/openssl/evp.h ../include/openssl/lhash.h -enc.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -enc.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -enc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h -enc.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h -enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -enc.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -enc.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h enc.c +enc.o: ../include/openssl/evp.h ../include/openssl/kdf.h +enc.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +enc.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +enc.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +enc.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +enc.o: ../include/openssl/rand.h ../include/openssl/safestack.h +enc.o: ../include/openssl/sha.h ../include/openssl/sm2.h +enc.o: ../include/openssl/sm3.h ../include/openssl/stack.h +enc.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +enc.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +enc.o: ../include/openssl/x509v3.h apps.h enc.c engine.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h engine.o: ../include/openssl/buffer.h ../include/openssl/comp.h engine.o: ../include/openssl/conf.h ../include/openssl/crypto.h @@ -425,14 +448,16 @@ engine.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h engine.o: ../include/openssl/ec.h ../include/openssl/ecdh.h engine.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h engine.o: ../include/openssl/err.h ../include/openssl/evp.h -engine.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +engine.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +engine.o: ../include/openssl/kdf.h ../include/openssl/kssl.h engine.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h engine.o: ../include/openssl/objects.h ../include/openssl/ocsp.h engine.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h engine.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h engine.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h engine.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h -engine.o: ../include/openssl/sha.h ../include/openssl/srtp.h +engine.o: ../include/openssl/sha.h ../include/openssl/sm2.h +engine.o: ../include/openssl/sm3.h ../include/openssl/srtp.h engine.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h engine.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h engine.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -446,14 +471,16 @@ errstr.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h errstr.o: ../include/openssl/ec.h ../include/openssl/ecdh.h errstr.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h errstr.o: ../include/openssl/err.h ../include/openssl/evp.h -errstr.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +errstr.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +errstr.o: ../include/openssl/kdf.h ../include/openssl/kssl.h errstr.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h errstr.o: ../include/openssl/objects.h ../include/openssl/ocsp.h errstr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h errstr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h errstr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h errstr.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h -errstr.o: ../include/openssl/sha.h ../include/openssl/srtp.h +errstr.o: ../include/openssl/sha.h ../include/openssl/sm2.h +errstr.o: ../include/openssl/sm3.h ../include/openssl/srtp.h errstr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h errstr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h errstr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -463,35 +490,37 @@ errstr.o: ../include/openssl/x509v3.h apps.h errstr.c gendh.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h gendh.o: ../include/openssl/bn.h ../include/openssl/buffer.h gendh.o: ../include/openssl/conf.h ../include/openssl/crypto.h -gendh.o: ../include/openssl/dh.h ../include/openssl/dsa.h -gendh.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -gendh.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -gendh.o: ../include/openssl/engine.h ../include/openssl/err.h -gendh.o: ../include/openssl/evp.h ../include/openssl/lhash.h +gendh.o: ../include/openssl/dh.h ../include/openssl/e_os2.h +gendh.o: ../include/openssl/ec.h ../include/openssl/ecdh.h +gendh.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h +gendh.o: ../include/openssl/err.h ../include/openssl/evp.h +gendh.o: ../include/openssl/kdf.h ../include/openssl/lhash.h gendh.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h gendh.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h gendh.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h gendh.o: ../include/openssl/pem.h ../include/openssl/pem2.h gendh.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -gendh.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -gendh.o: ../include/openssl/sha.h ../include/openssl/stack.h -gendh.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -gendh.o: ../include/openssl/ui.h ../include/openssl/x509.h +gendh.o: ../include/openssl/safestack.h ../include/openssl/sha.h +gendh.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +gendh.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +gendh.o: ../include/openssl/txt_db.h ../include/openssl/x509.h gendh.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h gendh.o: gendh.c gendsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h gendsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h gendsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h -gendsa.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h -gendsa.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -gendsa.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -gendsa.o: ../include/openssl/err.h ../include/openssl/evp.h +gendsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h +gendsa.o: ../include/openssl/e_os2.h ../include/openssl/ec.h +gendsa.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h +gendsa.o: ../include/openssl/engine.h ../include/openssl/err.h +gendsa.o: ../include/openssl/evp.h ../include/openssl/kdf.h gendsa.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h gendsa.o: ../include/openssl/objects.h ../include/openssl/ocsp.h gendsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h gendsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h gendsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h gendsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h +gendsa.o: ../include/openssl/sm2.h ../include/openssl/sm3.h gendsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h gendsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h gendsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h @@ -502,50 +531,77 @@ genpkey.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h genpkey.o: ../include/openssl/ec.h ../include/openssl/ecdh.h genpkey.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h genpkey.o: ../include/openssl/err.h ../include/openssl/evp.h -genpkey.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -genpkey.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -genpkey.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -genpkey.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -genpkey.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -genpkey.o: ../include/openssl/safestack.h ../include/openssl/sha.h -genpkey.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -genpkey.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -genpkey.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -genpkey.o: genpkey.c +genpkey.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +genpkey.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +genpkey.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +genpkey.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +genpkey.o: ../include/openssl/pem.h ../include/openssl/pem2.h +genpkey.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +genpkey.o: ../include/openssl/sha.h ../include/openssl/sm2.h +genpkey.o: ../include/openssl/sm3.h ../include/openssl/stack.h +genpkey.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +genpkey.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +genpkey.o: ../include/openssl/x509v3.h apps.h genpkey.c genrsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h genrsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h genrsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h -genrsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h genrsa.o: ../include/openssl/e_os2.h ../include/openssl/ec.h genrsa.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h genrsa.o: ../include/openssl/engine.h ../include/openssl/err.h -genrsa.o: ../include/openssl/evp.h ../include/openssl/lhash.h -genrsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -genrsa.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -genrsa.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -genrsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h -genrsa.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -genrsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -genrsa.o: ../include/openssl/sha.h ../include/openssl/stack.h -genrsa.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -genrsa.o: ../include/openssl/ui.h ../include/openssl/x509.h +genrsa.o: ../include/openssl/evp.h ../include/openssl/kdf.h +genrsa.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +genrsa.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +genrsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +genrsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +genrsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +genrsa.o: ../include/openssl/rand.h ../include/openssl/rsa.h +genrsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h +genrsa.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +genrsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +genrsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h genrsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h genrsa.o: genrsa.c +gmssl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h +gmssl.o: ../include/openssl/buffer.h ../include/openssl/comp.h +gmssl.o: ../include/openssl/conf.h ../include/openssl/crypto.h +gmssl.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h +gmssl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h +gmssl.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h +gmssl.o: ../include/openssl/err.h ../include/openssl/evp.h +gmssl.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +gmssl.o: ../include/openssl/kdf.h ../include/openssl/kssl.h +gmssl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +gmssl.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +gmssl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +gmssl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +gmssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +gmssl.o: ../include/openssl/pqueue.h ../include/openssl/rand.h +gmssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h +gmssl.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +gmssl.o: ../include/openssl/srtp.h ../include/openssl/ssl.h +gmssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h +gmssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h +gmssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h +gmssl.o: ../include/openssl/txt_db.h ../include/openssl/x509.h +gmssl.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h +gmssl.o: gmssl.c progs.h s_apps.h nseq.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h nseq.o: ../include/openssl/buffer.h ../include/openssl/conf.h nseq.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h nseq.o: ../include/openssl/ec.h ../include/openssl/ecdh.h nseq.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h nseq.o: ../include/openssl/err.h ../include/openssl/evp.h -nseq.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -nseq.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -nseq.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -nseq.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -nseq.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -nseq.o: ../include/openssl/safestack.h ../include/openssl/sha.h -nseq.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -nseq.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -nseq.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h nseq.c +nseq.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +nseq.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +nseq.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +nseq.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +nseq.o: ../include/openssl/pem.h ../include/openssl/pem2.h +nseq.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +nseq.o: ../include/openssl/sha.h ../include/openssl/sm2.h +nseq.o: ../include/openssl/sm3.h ../include/openssl/stack.h +nseq.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +nseq.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +nseq.o: ../include/openssl/x509v3.h apps.h nseq.c ocsp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h ocsp.o: ../include/openssl/bn.h ../include/openssl/buffer.h ocsp.o: ../include/openssl/comp.h ../include/openssl/conf.h @@ -553,7 +609,8 @@ ocsp.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h ocsp.o: ../include/openssl/e_os2.h ../include/openssl/ec.h ocsp.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h ocsp.o: ../include/openssl/engine.h ../include/openssl/err.h -ocsp.o: ../include/openssl/evp.h ../include/openssl/hmac.h +ocsp.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +ocsp.o: ../include/openssl/hmac.h ../include/openssl/kdf.h ocsp.o: ../include/openssl/kssl.h ../include/openssl/lhash.h ocsp.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h ocsp.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h @@ -561,34 +618,13 @@ ocsp.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h ocsp.o: ../include/openssl/pem.h ../include/openssl/pem2.h ocsp.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h ocsp.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ocsp.o: ../include/openssl/sm2.h ../include/openssl/sm3.h ocsp.o: ../include/openssl/srtp.h ../include/openssl/ssl.h ocsp.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h ocsp.o: ../include/openssl/ssl3.h ../include/openssl/stack.h ocsp.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h ocsp.o: ../include/openssl/txt_db.h ../include/openssl/x509.h ocsp.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ocsp.c -openssl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -openssl.o: ../include/openssl/buffer.h ../include/openssl/comp.h -openssl.o: ../include/openssl/conf.h ../include/openssl/crypto.h -openssl.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -openssl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -openssl.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -openssl.o: ../include/openssl/err.h ../include/openssl/evp.h -openssl.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -openssl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -openssl.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -openssl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -openssl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -openssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -openssl.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -openssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h -openssl.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -openssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -openssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -openssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -openssl.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -openssl.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -openssl.o: openssl.c progs.h s_apps.h passwd.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h passwd.o: ../include/openssl/buffer.h ../include/openssl/conf.h passwd.o: ../include/openssl/crypto.h ../include/openssl/des.h @@ -596,123 +632,135 @@ passwd.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h passwd.o: ../include/openssl/ec.h ../include/openssl/ecdh.h passwd.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h passwd.o: ../include/openssl/err.h ../include/openssl/evp.h -passwd.o: ../include/openssl/lhash.h ../include/openssl/md5.h -passwd.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -passwd.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -passwd.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -passwd.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -passwd.o: ../include/openssl/safestack.h ../include/openssl/sha.h -passwd.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -passwd.o: ../include/openssl/txt_db.h ../include/openssl/ui.h -passwd.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h -passwd.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -passwd.o: passwd.c +passwd.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +passwd.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h +passwd.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +passwd.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +passwd.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h +passwd.o: ../include/openssl/rand.h ../include/openssl/safestack.h +passwd.o: ../include/openssl/sha.h ../include/openssl/sm2.h +passwd.o: ../include/openssl/sm3.h ../include/openssl/stack.h +passwd.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +passwd.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h +passwd.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +passwd.o: ../include/openssl/x509v3.h apps.h passwd.c pkcs12.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h pkcs12.o: ../include/openssl/buffer.h ../include/openssl/conf.h pkcs12.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h pkcs12.o: ../include/openssl/ec.h ../include/openssl/ecdh.h pkcs12.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h pkcs12.o: ../include/openssl/err.h ../include/openssl/evp.h -pkcs12.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -pkcs12.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -pkcs12.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -pkcs12.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -pkcs12.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h -pkcs12.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -pkcs12.o: ../include/openssl/sha.h ../include/openssl/stack.h -pkcs12.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -pkcs12.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -pkcs12.o: ../include/openssl/x509v3.h apps.h pkcs12.c +pkcs12.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +pkcs12.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +pkcs12.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +pkcs12.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +pkcs12.o: ../include/openssl/pem.h ../include/openssl/pem2.h +pkcs12.o: ../include/openssl/pkcs12.h ../include/openssl/pkcs7.h +pkcs12.o: ../include/openssl/safestack.h ../include/openssl/sha.h +pkcs12.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +pkcs12.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +pkcs12.o: ../include/openssl/txt_db.h ../include/openssl/x509.h +pkcs12.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h +pkcs12.o: pkcs12.c pkcs7.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h pkcs7.o: ../include/openssl/buffer.h ../include/openssl/conf.h pkcs7.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h pkcs7.o: ../include/openssl/ec.h ../include/openssl/ecdh.h pkcs7.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h pkcs7.o: ../include/openssl/err.h ../include/openssl/evp.h -pkcs7.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -pkcs7.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -pkcs7.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -pkcs7.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -pkcs7.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -pkcs7.o: ../include/openssl/safestack.h ../include/openssl/sha.h -pkcs7.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -pkcs7.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -pkcs7.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -pkcs7.o: pkcs7.c +pkcs7.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +pkcs7.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +pkcs7.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +pkcs7.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +pkcs7.o: ../include/openssl/pem.h ../include/openssl/pem2.h +pkcs7.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +pkcs7.o: ../include/openssl/sha.h ../include/openssl/sm2.h +pkcs7.o: ../include/openssl/sm3.h ../include/openssl/stack.h +pkcs7.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +pkcs7.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +pkcs7.o: ../include/openssl/x509v3.h apps.h pkcs7.c pkcs8.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h pkcs8.o: ../include/openssl/buffer.h ../include/openssl/conf.h pkcs8.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h pkcs8.o: ../include/openssl/ec.h ../include/openssl/ecdh.h pkcs8.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h pkcs8.o: ../include/openssl/err.h ../include/openssl/evp.h -pkcs8.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -pkcs8.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -pkcs8.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -pkcs8.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -pkcs8.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h -pkcs8.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -pkcs8.o: ../include/openssl/sha.h ../include/openssl/stack.h -pkcs8.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -pkcs8.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -pkcs8.o: ../include/openssl/x509v3.h apps.h pkcs8.c +pkcs8.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +pkcs8.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +pkcs8.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +pkcs8.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +pkcs8.o: ../include/openssl/pem.h ../include/openssl/pem2.h +pkcs8.o: ../include/openssl/pkcs12.h ../include/openssl/pkcs7.h +pkcs8.o: ../include/openssl/safestack.h ../include/openssl/sha.h +pkcs8.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +pkcs8.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +pkcs8.o: ../include/openssl/txt_db.h ../include/openssl/x509.h +pkcs8.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h +pkcs8.o: pkcs8.c pkey.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h pkey.o: ../include/openssl/buffer.h ../include/openssl/conf.h pkey.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h pkey.o: ../include/openssl/ec.h ../include/openssl/ecdh.h pkey.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h pkey.o: ../include/openssl/err.h ../include/openssl/evp.h -pkey.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -pkey.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -pkey.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -pkey.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -pkey.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -pkey.o: ../include/openssl/safestack.h ../include/openssl/sha.h -pkey.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -pkey.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -pkey.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h pkey.c +pkey.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +pkey.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +pkey.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +pkey.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +pkey.o: ../include/openssl/pem.h ../include/openssl/pem2.h +pkey.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +pkey.o: ../include/openssl/sha.h ../include/openssl/sm2.h +pkey.o: ../include/openssl/sm3.h ../include/openssl/stack.h +pkey.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +pkey.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +pkey.o: ../include/openssl/x509v3.h apps.h pkey.c pkeyparam.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h pkeyparam.o: ../include/openssl/buffer.h ../include/openssl/conf.h pkeyparam.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h pkeyparam.o: ../include/openssl/ec.h ../include/openssl/ecdh.h pkeyparam.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h pkeyparam.o: ../include/openssl/err.h ../include/openssl/evp.h -pkeyparam.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -pkeyparam.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -pkeyparam.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -pkeyparam.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -pkeyparam.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -pkeyparam.o: ../include/openssl/safestack.h ../include/openssl/sha.h -pkeyparam.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -pkeyparam.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -pkeyparam.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -pkeyparam.o: pkeyparam.c +pkeyparam.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +pkeyparam.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +pkeyparam.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +pkeyparam.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +pkeyparam.o: ../include/openssl/pem.h ../include/openssl/pem2.h +pkeyparam.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +pkeyparam.o: ../include/openssl/sha.h ../include/openssl/sm2.h +pkeyparam.o: ../include/openssl/sm3.h ../include/openssl/stack.h +pkeyparam.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +pkeyparam.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +pkeyparam.o: ../include/openssl/x509v3.h apps.h pkeyparam.c pkeyutl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h pkeyutl.o: ../include/openssl/buffer.h ../include/openssl/conf.h pkeyutl.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h pkeyutl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h pkeyutl.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h pkeyutl.o: ../include/openssl/err.h ../include/openssl/evp.h -pkeyutl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -pkeyutl.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -pkeyutl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -pkeyutl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -pkeyutl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -pkeyutl.o: ../include/openssl/safestack.h ../include/openssl/sha.h -pkeyutl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -pkeyutl.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -pkeyutl.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -pkeyutl.o: pkeyutl.c +pkeyutl.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +pkeyutl.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +pkeyutl.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +pkeyutl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +pkeyutl.o: ../include/openssl/pem.h ../include/openssl/pem2.h +pkeyutl.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +pkeyutl.o: ../include/openssl/sha.h ../include/openssl/sm2.h +pkeyutl.o: ../include/openssl/sm3.h ../include/openssl/stack.h +pkeyutl.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +pkeyutl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +pkeyutl.o: ../include/openssl/x509v3.h apps.h pkeyutl.c prime.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h prime.o: ../include/openssl/bn.h ../include/openssl/buffer.h prime.o: ../include/openssl/conf.h ../include/openssl/crypto.h prime.o: ../include/openssl/e_os2.h ../include/openssl/ec.h prime.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -prime.o: ../include/openssl/engine.h ../include/openssl/evp.h +prime.o: ../include/openssl/engine.h ../include/openssl/err.h +prime.o: ../include/openssl/evp.h ../include/openssl/kdf.h prime.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h prime.o: ../include/openssl/objects.h ../include/openssl/ocsp.h prime.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h prime.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h prime.o: ../include/openssl/safestack.h ../include/openssl/sha.h +prime.o: ../include/openssl/sm2.h ../include/openssl/sm3.h prime.o: ../include/openssl/stack.h ../include/openssl/symhacks.h prime.o: ../include/openssl/txt_db.h ../include/openssl/x509.h prime.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h @@ -723,15 +771,16 @@ rand.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h rand.o: ../include/openssl/ec.h ../include/openssl/ecdh.h rand.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h rand.o: ../include/openssl/err.h ../include/openssl/evp.h -rand.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -rand.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -rand.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -rand.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -rand.o: ../include/openssl/rand.h ../include/openssl/safestack.h -rand.o: ../include/openssl/sha.h ../include/openssl/stack.h -rand.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -rand.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -rand.o: ../include/openssl/x509v3.h apps.h rand.c +rand.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +rand.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +rand.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +rand.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +rand.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h +rand.o: ../include/openssl/safestack.h ../include/openssl/sha.h +rand.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +rand.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +rand.o: ../include/openssl/txt_db.h ../include/openssl/x509.h +rand.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h rand.c req.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h req.o: ../include/openssl/bn.h ../include/openssl/buffer.h req.o: ../include/openssl/conf.h ../include/openssl/crypto.h @@ -739,46 +788,51 @@ req.o: ../include/openssl/dh.h ../include/openssl/dsa.h req.o: ../include/openssl/e_os2.h ../include/openssl/ec.h req.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h req.o: ../include/openssl/engine.h ../include/openssl/err.h -req.o: ../include/openssl/evp.h ../include/openssl/lhash.h -req.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -req.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -req.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -req.o: ../include/openssl/pem.h ../include/openssl/pem2.h -req.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h +req.o: ../include/openssl/evp.h ../include/openssl/kdf.h +req.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +req.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +req.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +req.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +req.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h req.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -req.o: ../include/openssl/sha.h ../include/openssl/stack.h +req.o: ../include/openssl/sha.h ../include/openssl/sm2.h +req.o: ../include/openssl/sm3.h ../include/openssl/stack.h req.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -req.o: ../include/openssl/ui.h ../include/openssl/x509.h -req.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h req.c +req.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +req.o: ../include/openssl/x509v3.h apps.h req.c rsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h rsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h rsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h rsa.o: ../include/openssl/e_os2.h ../include/openssl/ec.h rsa.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h rsa.o: ../include/openssl/engine.h ../include/openssl/err.h -rsa.o: ../include/openssl/evp.h ../include/openssl/lhash.h -rsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -rsa.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -rsa.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -rsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h -rsa.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h -rsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h -rsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -rsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -rsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h rsa.c +rsa.o: ../include/openssl/evp.h ../include/openssl/kdf.h +rsa.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +rsa.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +rsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +rsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +rsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +rsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +rsa.o: ../include/openssl/sha.h ../include/openssl/sm2.h +rsa.o: ../include/openssl/sm3.h ../include/openssl/stack.h +rsa.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +rsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +rsa.o: ../include/openssl/x509v3.h apps.h rsa.c rsautl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -rsautl.o: ../include/openssl/buffer.h ../include/openssl/conf.h -rsautl.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -rsautl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -rsautl.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -rsautl.o: ../include/openssl/err.h ../include/openssl/evp.h +rsautl.o: ../include/openssl/bn.h ../include/openssl/buffer.h +rsautl.o: ../include/openssl/conf.h ../include/openssl/crypto.h +rsautl.o: ../include/openssl/e_os2.h ../include/openssl/ec.h +rsautl.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h +rsautl.o: ../include/openssl/engine.h ../include/openssl/err.h +rsautl.o: ../include/openssl/evp.h ../include/openssl/kdf.h rsautl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h rsautl.o: ../include/openssl/objects.h ../include/openssl/ocsp.h rsautl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h rsautl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h rsautl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h rsautl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -rsautl.o: ../include/openssl/sha.h ../include/openssl/stack.h +rsautl.o: ../include/openssl/sha.h ../include/openssl/sm2.h +rsautl.o: ../include/openssl/sm3.h ../include/openssl/stack.h rsautl.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h rsautl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h rsautl.o: ../include/openssl/x509v3.h apps.h rsautl.c @@ -789,7 +843,8 @@ s_cb.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s_cb.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s_cb.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h s_cb.o: ../include/openssl/err.h ../include/openssl/evp.h -s_cb.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +s_cb.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +s_cb.o: ../include/openssl/kdf.h ../include/openssl/kssl.h s_cb.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h s_cb.o: ../include/openssl/objects.h ../include/openssl/ocsp.h s_cb.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -797,6 +852,7 @@ s_cb.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s_cb.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s_cb.o: ../include/openssl/pqueue.h ../include/openssl/rand.h s_cb.o: ../include/openssl/safestack.h ../include/openssl/sha.h +s_cb.o: ../include/openssl/sm2.h ../include/openssl/sm3.h s_cb.o: ../include/openssl/srtp.h ../include/openssl/ssl.h s_cb.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h s_cb.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -811,7 +867,8 @@ s_client.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h s_client.o: ../include/openssl/e_os2.h ../include/openssl/ec.h s_client.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h s_client.o: ../include/openssl/engine.h ../include/openssl/err.h -s_client.o: ../include/openssl/evp.h ../include/openssl/hmac.h +s_client.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s_client.o: ../include/openssl/hmac.h ../include/openssl/kdf.h s_client.o: ../include/openssl/kssl.h ../include/openssl/lhash.h s_client.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s_client.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h @@ -819,7 +876,8 @@ s_client.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h s_client.o: ../include/openssl/pem.h ../include/openssl/pem2.h s_client.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h s_client.o: ../include/openssl/rand.h ../include/openssl/safestack.h -s_client.o: ../include/openssl/sha.h ../include/openssl/srp.h +s_client.o: ../include/openssl/sha.h ../include/openssl/sm2.h +s_client.o: ../include/openssl/sm3.h ../include/openssl/srp.h s_client.o: ../include/openssl/srtp.h ../include/openssl/ssl.h s_client.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h s_client.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -831,25 +889,26 @@ s_server.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h s_server.o: ../include/openssl/bn.h ../include/openssl/buffer.h s_server.o: ../include/openssl/comp.h ../include/openssl/conf.h s_server.o: ../include/openssl/crypto.h ../include/openssl/dh.h -s_server.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h -s_server.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -s_server.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -s_server.o: ../include/openssl/engine.h ../include/openssl/err.h -s_server.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s_server.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s_server.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s_server.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -s_server.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -s_server.o: ../include/openssl/pem.h ../include/openssl/pem2.h -s_server.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -s_server.o: ../include/openssl/rand.h ../include/openssl/rsa.h -s_server.o: ../include/openssl/safestack.h ../include/openssl/sha.h -s_server.o: ../include/openssl/srp.h ../include/openssl/srtp.h -s_server.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s_server.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s_server.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s_server.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h -s_server.o: ../include/openssl/ui.h ../include/openssl/x509.h +s_server.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h +s_server.o: ../include/openssl/ec.h ../include/openssl/ecdh.h +s_server.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h +s_server.o: ../include/openssl/err.h ../include/openssl/evp.h +s_server.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +s_server.o: ../include/openssl/kdf.h ../include/openssl/kssl.h +s_server.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +s_server.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +s_server.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +s_server.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +s_server.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +s_server.o: ../include/openssl/pqueue.h ../include/openssl/rand.h +s_server.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +s_server.o: ../include/openssl/sha.h ../include/openssl/sm2.h +s_server.o: ../include/openssl/sm3.h ../include/openssl/srp.h +s_server.o: ../include/openssl/srtp.h ../include/openssl/ssl.h +s_server.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h +s_server.o: ../include/openssl/ssl3.h ../include/openssl/stack.h +s_server.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h +s_server.o: ../include/openssl/txt_db.h ../include/openssl/x509.h s_server.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h s_server.o: s_apps.h s_server.c timeouts.h s_socket.o: ../e_os.h ../e_os2.h ../include/openssl/asn1.h @@ -858,21 +917,24 @@ s_socket.o: ../include/openssl/comp.h ../include/openssl/conf.h s_socket.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h s_socket.o: ../include/openssl/e_os2.h ../include/openssl/ec.h s_socket.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -s_socket.o: ../include/openssl/engine.h ../include/openssl/evp.h -s_socket.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -s_socket.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -s_socket.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -s_socket.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s_socket.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s_socket.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s_socket.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h -s_socket.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s_socket.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s_socket.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s_socket.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s_socket.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h -s_socket.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -s_socket.o: ../include/openssl/x509v3.h apps.h s_apps.h s_socket.c +s_socket.o: ../include/openssl/engine.h ../include/openssl/err.h +s_socket.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s_socket.o: ../include/openssl/hmac.h ../include/openssl/kdf.h +s_socket.o: ../include/openssl/kssl.h ../include/openssl/lhash.h +s_socket.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +s_socket.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +s_socket.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +s_socket.o: ../include/openssl/pem.h ../include/openssl/pem2.h +s_socket.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h +s_socket.o: ../include/openssl/safestack.h ../include/openssl/sha.h +s_socket.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +s_socket.o: ../include/openssl/srtp.h ../include/openssl/ssl.h +s_socket.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h +s_socket.o: ../include/openssl/ssl3.h ../include/openssl/stack.h +s_socket.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h +s_socket.o: ../include/openssl/txt_db.h ../include/openssl/x509.h +s_socket.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h +s_socket.o: s_apps.h s_socket.c s_time.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h s_time.o: ../include/openssl/buffer.h ../include/openssl/comp.h s_time.o: ../include/openssl/conf.h ../include/openssl/crypto.h @@ -880,14 +942,16 @@ s_time.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s_time.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s_time.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h s_time.o: ../include/openssl/err.h ../include/openssl/evp.h -s_time.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +s_time.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +s_time.o: ../include/openssl/kdf.h ../include/openssl/kssl.h s_time.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h s_time.o: ../include/openssl/objects.h ../include/openssl/ocsp.h s_time.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h s_time.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s_time.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s_time.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h -s_time.o: ../include/openssl/sha.h ../include/openssl/srtp.h +s_time.o: ../include/openssl/sha.h ../include/openssl/sm2.h +s_time.o: ../include/openssl/sm3.h ../include/openssl/srtp.h s_time.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h s_time.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h s_time.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -901,14 +965,16 @@ sess_id.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h sess_id.o: ../include/openssl/ec.h ../include/openssl/ecdh.h sess_id.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h sess_id.o: ../include/openssl/err.h ../include/openssl/evp.h -sess_id.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +sess_id.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +sess_id.o: ../include/openssl/kdf.h ../include/openssl/kssl.h sess_id.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h sess_id.o: ../include/openssl/objects.h ../include/openssl/ocsp.h sess_id.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h sess_id.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h sess_id.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h sess_id.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h -sess_id.o: ../include/openssl/sha.h ../include/openssl/srtp.h +sess_id.o: ../include/openssl/sha.h ../include/openssl/sm2.h +sess_id.o: ../include/openssl/sm3.h ../include/openssl/srtp.h sess_id.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h sess_id.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h sess_id.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -921,32 +987,31 @@ smime.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h smime.o: ../include/openssl/ec.h ../include/openssl/ecdh.h smime.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h smime.o: ../include/openssl/err.h ../include/openssl/evp.h -smime.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -smime.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -smime.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -smime.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -smime.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -smime.o: ../include/openssl/safestack.h ../include/openssl/sha.h -smime.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -smime.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -smime.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -smime.o: smime.c +smime.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +smime.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +smime.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +smime.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +smime.o: ../include/openssl/pem.h ../include/openssl/pem2.h +smime.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +smime.o: ../include/openssl/sha.h ../include/openssl/sm2.h +smime.o: ../include/openssl/sm3.h ../include/openssl/stack.h +smime.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +smime.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +smime.o: ../include/openssl/x509v3.h apps.h smime.c speed.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h speed.o: ../include/openssl/bio.h ../include/openssl/blowfish.h speed.o: ../include/openssl/bn.h ../include/openssl/buffer.h speed.o: ../include/openssl/camellia.h ../include/openssl/cast.h speed.o: ../include/openssl/conf.h ../include/openssl/crypto.h speed.o: ../include/openssl/des.h ../include/openssl/des_old.h -speed.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h -speed.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -speed.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -speed.o: ../include/openssl/err.h ../include/openssl/evp.h -speed.o: ../include/openssl/hmac.h ../include/openssl/idea.h +speed.o: ../include/openssl/dh.h ../include/openssl/dsa.h +speed.o: ../include/openssl/e_os2.h ../include/openssl/ec.h +speed.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h +speed.o: ../include/openssl/engine.h ../include/openssl/err.h +speed.o: ../include/openssl/evp.h ../include/openssl/hmac.h +speed.o: ../include/openssl/idea.h ../include/openssl/kdf.h speed.o: ../include/openssl/lhash.h ../include/openssl/md4.h speed.o: ../include/openssl/md5.h ../include/openssl/mdc2.h -speed.o: ../include/openssl/sm3.h ../include/openssl/sms4.h -speed.o: ../include/openssl/zuc.h -speed.o: ../include/openssl/cpk.h speed.o: ../include/openssl/modes.h ../include/openssl/obj_mac.h speed.o: ../include/openssl/objects.h ../include/openssl/ocsp.h speed.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -955,6 +1020,7 @@ speed.o: ../include/openssl/rand.h ../include/openssl/rc2.h speed.o: ../include/openssl/rc4.h ../include/openssl/ripemd.h speed.o: ../include/openssl/rsa.h ../include/openssl/safestack.h speed.o: ../include/openssl/seed.h ../include/openssl/sha.h +speed.o: ../include/openssl/sm2.h ../include/openssl/sm3.h speed.o: ../include/openssl/stack.h ../include/openssl/symhacks.h speed.o: ../include/openssl/txt_db.h ../include/openssl/ui.h speed.o: ../include/openssl/ui_compat.h ../include/openssl/whrlpool.h @@ -966,31 +1032,34 @@ spkac.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h spkac.o: ../include/openssl/ec.h ../include/openssl/ecdh.h spkac.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h spkac.o: ../include/openssl/err.h ../include/openssl/evp.h -spkac.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -spkac.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -spkac.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -spkac.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -spkac.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -spkac.o: ../include/openssl/safestack.h ../include/openssl/sha.h -spkac.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -spkac.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -spkac.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -spkac.o: spkac.c +spkac.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +spkac.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +spkac.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +spkac.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +spkac.o: ../include/openssl/pem.h ../include/openssl/pem2.h +spkac.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +spkac.o: ../include/openssl/sha.h ../include/openssl/sm2.h +spkac.o: ../include/openssl/sm3.h ../include/openssl/stack.h +spkac.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +spkac.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +spkac.o: ../include/openssl/x509v3.h apps.h spkac.c srp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h srp.o: ../include/openssl/bn.h ../include/openssl/buffer.h srp.o: ../include/openssl/conf.h ../include/openssl/crypto.h srp.o: ../include/openssl/e_os2.h ../include/openssl/ec.h srp.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h srp.o: ../include/openssl/engine.h ../include/openssl/err.h -srp.o: ../include/openssl/evp.h ../include/openssl/lhash.h -srp.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -srp.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -srp.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -srp.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -srp.o: ../include/openssl/sha.h ../include/openssl/srp.h -srp.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -srp.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -srp.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h srp.c +srp.o: ../include/openssl/evp.h ../include/openssl/kdf.h +srp.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +srp.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +srp.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +srp.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h +srp.o: ../include/openssl/safestack.h ../include/openssl/sha.h +srp.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +srp.o: ../include/openssl/srp.h ../include/openssl/stack.h +srp.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +srp.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +srp.o: ../include/openssl/x509v3.h apps.h srp.c ts.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h ts.o: ../include/openssl/bn.h ../include/openssl/buffer.h ts.o: ../include/openssl/conf.h ../include/openssl/crypto.h @@ -998,33 +1067,36 @@ ts.o: ../include/openssl/dh.h ../include/openssl/dsa.h ts.o: ../include/openssl/e_os2.h ../include/openssl/ec.h ts.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h ts.o: ../include/openssl/engine.h ../include/openssl/err.h -ts.o: ../include/openssl/evp.h ../include/openssl/lhash.h -ts.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -ts.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -ts.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ts.o: ../include/openssl/pem.h ../include/openssl/pem2.h -ts.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -ts.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -ts.o: ../include/openssl/sha.h ../include/openssl/stack.h -ts.o: ../include/openssl/symhacks.h ../include/openssl/ts.h -ts.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -ts.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ts.c +ts.o: ../include/openssl/evp.h ../include/openssl/kdf.h +ts.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +ts.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +ts.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +ts.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +ts.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +ts.o: ../include/openssl/rand.h ../include/openssl/rsa.h +ts.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ts.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +ts.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +ts.o: ../include/openssl/ts.h ../include/openssl/txt_db.h +ts.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +ts.o: ../include/openssl/x509v3.h apps.h ts.c verify.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h verify.o: ../include/openssl/buffer.h ../include/openssl/conf.h verify.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h verify.o: ../include/openssl/ec.h ../include/openssl/ecdh.h verify.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h verify.o: ../include/openssl/err.h ../include/openssl/evp.h -verify.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -verify.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -verify.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -verify.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -verify.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -verify.o: ../include/openssl/safestack.h ../include/openssl/sha.h -verify.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -verify.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -verify.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -verify.o: verify.c +verify.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +verify.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +verify.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h +verify.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +verify.o: ../include/openssl/pem.h ../include/openssl/pem2.h +verify.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +verify.o: ../include/openssl/sha.h ../include/openssl/sm2.h +verify.o: ../include/openssl/sm3.h ../include/openssl/stack.h +verify.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h +verify.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +verify.o: ../include/openssl/x509v3.h apps.h verify.c version.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h version.o: ../include/openssl/blowfish.h ../include/openssl/bn.h version.o: ../include/openssl/buffer.h ../include/openssl/conf.h @@ -1032,13 +1104,15 @@ version.o: ../include/openssl/crypto.h ../include/openssl/des.h version.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h version.o: ../include/openssl/ec.h ../include/openssl/ecdh.h version.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -version.o: ../include/openssl/evp.h ../include/openssl/idea.h +version.o: ../include/openssl/err.h ../include/openssl/evp.h +version.o: ../include/openssl/idea.h ../include/openssl/kdf.h version.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h version.o: ../include/openssl/objects.h ../include/openssl/ocsp.h version.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h version.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h version.o: ../include/openssl/rc4.h ../include/openssl/safestack.h -version.o: ../include/openssl/sha.h ../include/openssl/stack.h +version.o: ../include/openssl/sha.h ../include/openssl/sm2.h +version.o: ../include/openssl/sm3.h ../include/openssl/stack.h version.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h version.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h version.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h @@ -1046,17 +1120,19 @@ version.o: ../include/openssl/x509v3.h apps.h version.c x509.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h x509.o: ../include/openssl/bn.h ../include/openssl/buffer.h x509.o: ../include/openssl/conf.h ../include/openssl/crypto.h -x509.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h -x509.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -x509.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -x509.o: ../include/openssl/err.h ../include/openssl/evp.h +x509.o: ../include/openssl/dh.h ../include/openssl/dsa.h +x509.o: ../include/openssl/e_os2.h ../include/openssl/ec.h +x509.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h +x509.o: ../include/openssl/engine.h ../include/openssl/err.h +x509.o: ../include/openssl/evp.h ../include/openssl/kdf.h x509.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h x509.o: ../include/openssl/objects.h ../include/openssl/ocsp.h x509.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h x509.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h x509.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h x509.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -x509.o: ../include/openssl/sha.h ../include/openssl/stack.h +x509.o: ../include/openssl/sha.h ../include/openssl/sm2.h +x509.o: ../include/openssl/sm3.h ../include/openssl/stack.h x509.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h x509.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h x509.o: ../include/openssl/x509v3.h apps.h x509.c diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile index 330fe81b..d2ca2522 100644 --- a/crypto/asn1/Makefile +++ b/crypto/asn1/Makefile @@ -146,12 +146,13 @@ a_digest.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h a_digest.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h a_digest.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h a_digest.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -a_digest.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -a_digest.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -a_digest.o: ../../include/openssl/opensslconf.h +a_digest.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +a_digest.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +a_digest.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h a_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h a_digest.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -a_digest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +a_digest.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +a_digest.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h a_digest.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h a_digest.o: ../../include/openssl/x509_vfy.h ../cryptlib.h a_digest.c a_dup.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h @@ -239,27 +240,29 @@ a_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h a_sign.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h a_sign.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h a_sign.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -a_sign.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -a_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -a_sign.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -a_sign.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -a_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -a_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -a_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -a_sign.o: ../cryptlib.h a_sign.c asn1_locl.h +a_sign.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +a_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +a_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +a_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +a_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +a_sign.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +a_sign.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +a_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +a_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h a_sign.c asn1_locl.h a_strex.o: ../../e_os.h ../../include/openssl/asn1.h a_strex.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h a_strex.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h a_strex.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h a_strex.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -a_strex.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -a_strex.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -a_strex.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -a_strex.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -a_strex.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -a_strex.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -a_strex.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -a_strex.o: ../cryptlib.h a_strex.c charmap.h +a_strex.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +a_strex.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +a_strex.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +a_strex.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +a_strex.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +a_strex.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +a_strex.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +a_strex.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +a_strex.o: ../../include/openssl/x509_vfy.h ../cryptlib.h a_strex.c charmap.h a_strnid.o: ../../e_os.h ../../include/openssl/asn1.h a_strnid.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h a_strnid.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h @@ -308,11 +311,13 @@ a_verify.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h a_verify.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h a_verify.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h a_verify.o: ../../include/openssl/err.h ../../include/openssl/evp.h -a_verify.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -a_verify.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +a_verify.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +a_verify.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +a_verify.o: ../../include/openssl/opensslconf.h a_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h a_verify.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -a_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +a_verify.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +a_verify.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h a_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h a_verify.o: ../../include/openssl/x509_vfy.h ../cryptlib.h a_verify.c a_verify.o: asn1_locl.h @@ -322,12 +327,14 @@ ameth_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h ameth_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ameth_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h ameth_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h -ameth_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ameth_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +ameth_lib.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +ameth_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ameth_lib.o: ../../include/openssl/objects.h ameth_lib.o: ../../include/openssl/opensslconf.h ameth_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ameth_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ameth_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +ameth_lib.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ameth_lib.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h ameth_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h ameth_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ameth_lib.c ameth_lib.o: asn1_locl.h @@ -344,11 +351,13 @@ asn1_gen.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h asn1_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h asn1_gen.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h asn1_gen.o: ../../include/openssl/err.h ../../include/openssl/evp.h -asn1_gen.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -asn1_gen.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +asn1_gen.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +asn1_gen.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +asn1_gen.o: ../../include/openssl/opensslconf.h asn1_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h asn1_gen.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -asn1_gen.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +asn1_gen.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +asn1_gen.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h asn1_gen.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h asn1_gen.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h asn1_gen.o: ../cryptlib.h asn1_gen.c @@ -375,11 +384,13 @@ asn_mime.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h asn_mime.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h asn_mime.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h asn_mime.o: ../../include/openssl/err.h ../../include/openssl/evp.h -asn_mime.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -asn_mime.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +asn_mime.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +asn_mime.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +asn_mime.o: ../../include/openssl/opensslconf.h asn_mime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h asn_mime.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h asn_mime.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +asn_mime.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h asn_mime.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h asn_mime.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h asn_mime.o: ../cryptlib.h asn1_locl.h asn_mime.c @@ -389,12 +400,13 @@ asn_moid.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h asn_moid.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h asn_moid.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h asn_moid.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -asn_moid.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -asn_moid.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -asn_moid.o: ../../include/openssl/opensslconf.h +asn_moid.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +asn_moid.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +asn_moid.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h asn_moid.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h asn_moid.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -asn_moid.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +asn_moid.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +asn_moid.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h asn_moid.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h asn_moid.o: ../../include/openssl/x509_vfy.h ../cryptlib.h asn_moid.c asn_pack.o: ../../e_os.h ../../include/openssl/asn1.h @@ -424,13 +436,15 @@ d2i_pr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h d2i_pr.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h d2i_pr.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h d2i_pr.o: ../../include/openssl/err.h ../../include/openssl/evp.h -d2i_pr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -d2i_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -d2i_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -d2i_pr.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -d2i_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -d2i_pr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -d2i_pr.o: ../../include/openssl/x509_vfy.h ../cryptlib.h asn1_locl.h d2i_pr.c +d2i_pr.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +d2i_pr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +d2i_pr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +d2i_pr.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +d2i_pr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +d2i_pr.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +d2i_pr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +d2i_pr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +d2i_pr.o: ../cryptlib.h asn1_locl.h d2i_pr.c d2i_pu.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h d2i_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h d2i_pu.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h @@ -477,13 +491,15 @@ i2d_pr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h i2d_pr.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h i2d_pr.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h i2d_pr.o: ../../include/openssl/err.h ../../include/openssl/evp.h -i2d_pr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -i2d_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -i2d_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -i2d_pr.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -i2d_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -i2d_pr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -i2d_pr.o: ../../include/openssl/x509_vfy.h ../cryptlib.h asn1_locl.h i2d_pr.c +i2d_pr.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +i2d_pr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +i2d_pr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +i2d_pr.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +i2d_pr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +i2d_pr.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +i2d_pr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +i2d_pr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +i2d_pr.o: ../cryptlib.h asn1_locl.h i2d_pr.c i2d_pu.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h i2d_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h i2d_pu.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h @@ -501,24 +517,28 @@ n_pkey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h n_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h n_pkey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h n_pkey.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -n_pkey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -n_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -n_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -n_pkey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -n_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -n_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -n_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -n_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h n_pkey.c +n_pkey.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +n_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +n_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +n_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +n_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h +n_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +n_pkey.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +n_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +n_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +n_pkey.o: ../cryptlib.h n_pkey.c nsseq.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h nsseq.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h nsseq.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h nsseq.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -nsseq.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h +nsseq.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h +nsseq.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h nsseq.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h nsseq.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h nsseq.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h nsseq.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -nsseq.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +nsseq.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +nsseq.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h nsseq.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h nsseq.o: ../../include/openssl/x509_vfy.h nsseq.c p5_pbe.o: ../../e_os.h ../../include/openssl/asn1.h @@ -527,25 +547,28 @@ p5_pbe.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h p5_pbe.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h p5_pbe.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h p5_pbe.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p5_pbe.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p5_pbe.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p5_pbe.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p5_pbe.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -p5_pbe.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p5_pbe.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p5_pbe.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p5_pbe.o: ../cryptlib.h p5_pbe.c +p5_pbe.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +p5_pbe.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +p5_pbe.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +p5_pbe.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +p5_pbe.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h +p5_pbe.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +p5_pbe.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +p5_pbe.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +p5_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p5_pbe.c p5_pbev2.o: ../../e_os.h ../../include/openssl/asn1.h p5_pbev2.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h p5_pbev2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h p5_pbev2.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h p5_pbev2.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h p5_pbev2.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p5_pbev2.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p5_pbev2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +p5_pbev2.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +p5_pbev2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +p5_pbev2.o: ../../include/openssl/opensslconf.h p5_pbev2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h p5_pbev2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h p5_pbev2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p5_pbev2.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h p5_pbev2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h p5_pbev2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h p5_pbev2.o: ../cryptlib.h p5_pbev2.c @@ -555,41 +578,45 @@ p8_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h p8_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h p8_pkey.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h p8_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p8_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p8_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p8_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p8_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p8_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p8_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p8_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p8_pkey.c +p8_pkey.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +p8_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +p8_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +p8_pkey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +p8_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p8_pkey.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +p8_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +p8_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +p8_pkey.o: ../cryptlib.h p8_pkey.c t_bitst.o: ../../e_os.h ../../include/openssl/asn1.h t_bitst.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h t_bitst.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h t_bitst.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h t_bitst.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h t_bitst.o: ../../include/openssl/err.h ../../include/openssl/evp.h -t_bitst.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -t_bitst.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -t_bitst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -t_bitst.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -t_bitst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -t_bitst.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -t_bitst.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -t_bitst.o: ../cryptlib.h t_bitst.c +t_bitst.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +t_bitst.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +t_bitst.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +t_bitst.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +t_bitst.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +t_bitst.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +t_bitst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +t_bitst.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +t_bitst.o: ../../include/openssl/x509v3.h ../cryptlib.h t_bitst.c t_crl.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h t_crl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h t_crl.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h t_crl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h t_crl.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h t_crl.o: ../../include/openssl/err.h ../../include/openssl/evp.h -t_crl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -t_crl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -t_crl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -t_crl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -t_crl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -t_crl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -t_crl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -t_crl.o: ../cryptlib.h t_crl.c +t_crl.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +t_crl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +t_crl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +t_crl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +t_crl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +t_crl.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +t_crl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +t_crl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +t_crl.o: ../../include/openssl/x509v3.h ../cryptlib.h t_crl.c t_pkey.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h t_pkey.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h t_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h @@ -605,57 +632,61 @@ t_req.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h t_req.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h t_req.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h t_req.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -t_req.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -t_req.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -t_req.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -t_req.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -t_req.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -t_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -t_req.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -t_req.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -t_req.o: ../cryptlib.h t_req.c +t_req.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +t_req.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +t_req.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +t_req.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +t_req.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h +t_req.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +t_req.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +t_req.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +t_req.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +t_req.o: ../../include/openssl/x509v3.h ../cryptlib.h t_req.c t_spki.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h t_spki.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h t_spki.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h t_spki.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h t_spki.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h t_spki.o: ../../include/openssl/err.h ../../include/openssl/evp.h -t_spki.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -t_spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -t_spki.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -t_spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -t_spki.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -t_spki.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -t_spki.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -t_spki.o: ../cryptlib.h t_spki.c +t_spki.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +t_spki.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +t_spki.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +t_spki.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +t_spki.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h +t_spki.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +t_spki.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +t_spki.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +t_spki.o: ../../include/openssl/x509_vfy.h ../cryptlib.h t_spki.c t_x509.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h t_x509.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h t_x509.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h t_x509.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h t_x509.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h t_x509.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -t_x509.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -t_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -t_x509.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -t_x509.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -t_x509.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -t_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -t_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -t_x509.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -t_x509.o: ../cryptlib.h asn1_locl.h t_x509.c +t_x509.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +t_x509.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +t_x509.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +t_x509.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +t_x509.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h +t_x509.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +t_x509.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +t_x509.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +t_x509.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +t_x509.o: ../../include/openssl/x509v3.h ../cryptlib.h asn1_locl.h t_x509.c t_x509a.o: ../../e_os.h ../../include/openssl/asn1.h t_x509a.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h t_x509a.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h t_x509a.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h t_x509a.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -t_x509a.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -t_x509a.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -t_x509a.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -t_x509a.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -t_x509a.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -t_x509a.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -t_x509a.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -t_x509a.o: ../cryptlib.h t_x509a.c +t_x509a.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +t_x509a.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +t_x509a.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +t_x509a.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +t_x509a.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +t_x509a.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +t_x509a.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +t_x509a.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +t_x509a.o: ../../include/openssl/x509_vfy.h ../cryptlib.h t_x509a.c tasn_dec.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h tasn_dec.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h tasn_dec.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h @@ -695,12 +726,13 @@ tasn_prn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h tasn_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h tasn_prn.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h tasn_prn.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -tasn_prn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -tasn_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -tasn_prn.o: ../../include/openssl/opensslconf.h +tasn_prn.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +tasn_prn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +tasn_prn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h tasn_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h tasn_prn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tasn_prn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +tasn_prn.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +tasn_prn.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h tasn_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h tasn_prn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h tasn_prn.o: ../cryptlib.h asn1_locl.h tasn_prn.c @@ -722,12 +754,14 @@ x_algor.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h x_algor.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x_algor.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x_algor.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x_algor.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h +x_algor.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h +x_algor.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h x_algor.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h x_algor.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h x_algor.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x_algor.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_algor.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x_algor.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x_algor.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x_algor.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x_algor.o: ../../include/openssl/x509_vfy.h x_algor.c x_attrib.o: ../../e_os.h ../../include/openssl/asn1.h @@ -736,11 +770,13 @@ x_attrib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h x_attrib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x_attrib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x_attrib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_attrib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_attrib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +x_attrib.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x_attrib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x_attrib.o: ../../include/openssl/opensslconf.h x_attrib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x_attrib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_attrib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x_attrib.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x_attrib.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x_attrib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x_attrib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_attrib.c x_bignum.o: ../../e_os.h ../../include/openssl/asn1.h @@ -758,24 +794,28 @@ x_crl.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h x_crl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x_crl.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h x_crl.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x_crl.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x_crl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x_crl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -x_crl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -x_crl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -x_crl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -x_crl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -x_crl.o: ../../include/openssl/x509v3.h ../cryptlib.h asn1_locl.h x_crl.c +x_crl.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +x_crl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +x_crl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +x_crl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +x_crl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +x_crl.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x_crl.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +x_crl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +x_crl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +x_crl.o: ../cryptlib.h asn1_locl.h x_crl.c x_exten.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h x_exten.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x_exten.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x_exten.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x_exten.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h +x_exten.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h +x_exten.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h x_exten.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h x_exten.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h x_exten.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x_exten.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_exten.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x_exten.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x_exten.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x_exten.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x_exten.o: ../../include/openssl/x509_vfy.h x_exten.c x_info.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h @@ -783,13 +823,15 @@ x_info.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h x_info.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x_info.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x_info.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_info.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_info.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_info.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_info.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_info.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_info.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_info.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_info.c +x_info.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x_info.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x_info.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +x_info.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +x_info.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +x_info.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +x_info.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +x_info.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +x_info.o: ../cryptlib.h x_info.c x_long.o: ../../e_os.h ../../include/openssl/asn1.h x_long.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h x_long.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h @@ -805,23 +847,27 @@ x_name.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h x_name.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x_name.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x_name.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_name.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_name.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_name.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_name.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_name.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_name.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_name.o: ../../include/openssl/x509_vfy.h ../cryptlib.h asn1_locl.h x_name.c +x_name.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x_name.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x_name.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +x_name.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +x_name.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +x_name.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +x_name.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +x_name.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +x_name.o: ../cryptlib.h asn1_locl.h x_name.c x_nx509.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h x_nx509.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x_nx509.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x_nx509.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x_nx509.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h +x_nx509.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h +x_nx509.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h x_nx509.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h x_nx509.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h x_nx509.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x_nx509.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_nx509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x_nx509.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x_nx509.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x_nx509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x_nx509.o: ../../include/openssl/x509_vfy.h x_nx509.c x_pkey.o: ../../e_os.h ../../include/openssl/asn1.h @@ -830,25 +876,28 @@ x_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h x_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x_pkey.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_pkey.c +x_pkey.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +x_pkey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +x_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +x_pkey.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +x_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +x_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +x_pkey.o: ../cryptlib.h x_pkey.c x_pubkey.o: ../../e_os.h ../../include/openssl/asn1.h x_pubkey.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h x_pubkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h x_pubkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h x_pubkey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h x_pubkey.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x_pubkey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x_pubkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x_pubkey.o: ../../include/openssl/opensslconf.h +x_pubkey.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +x_pubkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +x_pubkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h x_pubkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x_pubkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h x_pubkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +x_pubkey.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h x_pubkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h x_pubkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h x_pubkey.o: ../cryptlib.h asn1_locl.h x_pubkey.c @@ -858,76 +907,88 @@ x_req.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h x_req.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x_req.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x_req.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_req.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_req.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_req.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_req.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_req.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_req.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_req.c +x_req.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x_req.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x_req.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +x_req.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +x_req.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +x_req.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +x_req.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +x_req.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +x_req.o: ../cryptlib.h x_req.c x_sig.o: ../../e_os.h ../../include/openssl/asn1.h x_sig.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h x_sig.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h x_sig.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x_sig.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x_sig.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_sig.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_sig.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_sig.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_sig.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_sig.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_sig.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_sig.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_sig.c +x_sig.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x_sig.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x_sig.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +x_sig.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +x_sig.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +x_sig.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +x_sig.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +x_sig.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +x_sig.o: ../cryptlib.h x_sig.c x_spki.o: ../../e_os.h ../../include/openssl/asn1.h x_spki.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h x_spki.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h x_spki.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x_spki.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x_spki.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_spki.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_spki.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_spki.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_spki.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_spki.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_spki.c +x_spki.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x_spki.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x_spki.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +x_spki.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +x_spki.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +x_spki.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +x_spki.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +x_spki.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +x_spki.o: ../cryptlib.h x_spki.c x_val.o: ../../e_os.h ../../include/openssl/asn1.h x_val.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h x_val.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h x_val.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x_val.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x_val.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_val.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_val.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_val.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_val.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_val.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_val.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_val.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_val.c +x_val.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x_val.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x_val.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +x_val.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +x_val.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +x_val.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +x_val.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +x_val.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +x_val.o: ../cryptlib.h x_val.c x_x509.o: ../../e_os.h ../../include/openssl/asn1.h x_x509.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h x_x509.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h x_x509.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x_x509.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h x_x509.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x_x509.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x_x509.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -x_x509.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -x_x509.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -x_x509.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -x_x509.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -x_x509.o: ../../include/openssl/x509v3.h ../cryptlib.h x_x509.c +x_x509.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +x_x509.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +x_x509.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +x_x509.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +x_x509.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +x_x509.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x_x509.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +x_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +x_x509.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +x_x509.o: ../cryptlib.h x_x509.c x_x509a.o: ../../e_os.h ../../include/openssl/asn1.h x_x509a.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h x_x509a.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h x_x509a.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x_x509a.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x_x509a.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_x509a.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_x509a.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_x509a.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_x509a.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_x509a.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_x509a.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_x509a.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_x509a.c +x_x509a.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x_x509a.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x_x509a.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +x_x509a.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +x_x509a.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +x_x509a.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +x_x509a.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +x_x509a.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +x_x509a.o: ../cryptlib.h x_x509a.c diff --git a/crypto/cbcmac/Makefile b/crypto/cbcmac/Makefile index f550139a..2b6ec686 100644 --- a/crypto/cbcmac/Makefile +++ b/crypto/cbcmac/Makefile @@ -17,8 +17,8 @@ TEST= APPS= LIB=$(TOP)/libcrypto.a -LIBSRC=cbcmac.c cbcm_ameth.c cbcm_pmeth.c -LIBOBJ=cbcmac.o cbcm_ameth.o cbcm_pmeth.o +LIBSRC=cbcmac.c cbcmac_err.c cbcm_ameth.c cbcm_pmeth.c +LIBOBJ=cbcmac.o cbcmac_err.o cbcm_ameth.o cbcm_pmeth.o SRC= $(LIBSRC) @@ -76,38 +76,49 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. -cm_ameth.o: ../../e_os.h ../../include/openssl/asn1.h -cm_ameth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -cm_ameth.o: ../../include/openssl/cmac.h ../../include/openssl/crypto.h -cm_ameth.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -cm_ameth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cm_ameth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cm_ameth.o: ../../include/openssl/opensslconf.h -cm_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cm_ameth.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -cm_ameth.o: ../../include/openssl/symhacks.h ../asn1/asn1_locl.h ../cryptlib.h -cm_ameth.o: cm_ameth.c -cm_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h -cm_pmeth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -cm_pmeth.o: ../../include/openssl/cmac.h ../../include/openssl/conf.h -cm_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -cm_pmeth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -cm_pmeth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cm_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cm_pmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cm_pmeth.o: ../../include/openssl/opensslconf.h -cm_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cm_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cm_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -cm_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -cm_pmeth.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cm_pmeth.o: ../cryptlib.h ../evp/evp_locl.h cm_pmeth.c -cmac.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -cmac.o: ../../include/openssl/buffer.h ../../include/openssl/cmac.h -cmac.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -cmac.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cmac.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cmac.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -cmac.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cmac.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -cmac.o: ../../include/openssl/symhacks.h ../cryptlib.h cmac.c +cbcm_ameth.o: ../../e_os.h ../../include/openssl/asn1.h +cbcm_ameth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h +cbcm_ameth.o: ../../include/openssl/cbcmac.h ../../include/openssl/crypto.h +cbcm_ameth.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +cbcm_ameth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +cbcm_ameth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +cbcm_ameth.o: ../../include/openssl/opensslconf.h +cbcm_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +cbcm_ameth.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +cbcm_ameth.o: ../../include/openssl/symhacks.h ../asn1/asn1_locl.h +cbcm_ameth.o: ../cryptlib.h cbcm_ameth.c +cbcm_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h +cbcm_pmeth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h +cbcm_pmeth.o: ../../include/openssl/cbcmac.h ../../include/openssl/conf.h +cbcm_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +cbcm_pmeth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h +cbcm_pmeth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h +cbcm_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +cbcm_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +cbcm_pmeth.o: ../../include/openssl/objects.h +cbcm_pmeth.o: ../../include/openssl/opensslconf.h +cbcm_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +cbcm_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +cbcm_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +cbcm_pmeth.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +cbcm_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +cbcm_pmeth.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +cbcm_pmeth.o: ../cryptlib.h ../evp/evp_locl.h cbcm_pmeth.c +cbcmac.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +cbcmac.o: ../../include/openssl/cbcmac.h ../../include/openssl/crypto.h +cbcmac.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +cbcmac.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +cbcmac.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +cbcmac.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +cbcmac.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h +cbcmac.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +cbcmac.o: cbcmac.c +cbcmac_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +cbcmac_err.o: ../../include/openssl/cbcmac.h ../../include/openssl/crypto.h +cbcmac_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +cbcmac_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +cbcmac_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +cbcmac_err.o: ../../include/openssl/opensslconf.h +cbcmac_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +cbcmac_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +cbcmac_err.o: ../../include/openssl/symhacks.h cbcmac_err.c diff --git a/crypto/cbcmac/cbcmac.c b/crypto/cbcmac/cbcmac.c index a57ba2e3..2e769f4a 100644 --- a/crypto/cbcmac/cbcmac.c +++ b/crypto/cbcmac/cbcmac.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include @@ -55,10 +56,12 @@ int CBCMAC_Init(CBCMAC_CTX *ctx, const void *key, size_t keylen, { int i, block_size; - if (!EVP_EncryptInit_ex(&ctx->cipher_ctx, cipher, key, NULL, eng)) { + if (!EVP_EncryptInit_ex(&ctx->cipher_ctx, cipher, eng, key, NULL)) { + CBCMACerr(CBCMAC_F_CBCMAC_INIT, CBCMAC_R_CIPHER_CTX_INIT_FAILED); return 0; } if (EVP_CIPHER_CTX_mode(&ctx->cipher_ctx) != EVP_CIPH_ECB_MODE) { + CBCMACerr(CBCMAC_F_CBCMAC_INIT, CBCMAC_R_CIPHER_NOT_ECB_MODE); return 0; } ctx->worklen = 0; @@ -90,6 +93,7 @@ int CBCMAC_Update(CBCMAC_CTX *ctx, const void *data, size_t datalen) } if (!EVP_EncryptUpdate(&ctx->cipher_ctx, ctx->cbcstate, &len, ctx->workspace, block_size)) { + CBCMACerr(CBCMAC_F_CBCMAC_UPDATE, ERR_R_EVP_LIB); return 0; } } @@ -127,7 +131,10 @@ int CBCMAC_Final(CBCMAC_CTX *ctx, unsigned char *out, size_t *outlen) for (i = ctx->worklen; i < block_size; i++) { ctx->workspace[i] = ctx->cbcstate[i]; } - EVP_EncryptUpdate(&(ctx->cipher_ctx), out, outlen, ctx->workspace, block_size); + if (!EVP_EncryptUpdate(&(ctx->cipher_ctx), out, outlen, ctx->workspace, block_size)) { + CBCMACerr(CBCMAC_F_CBCMAC_FINAL, ERR_R_EVP_LIB); + return 0; + } } else { for (i = 0; i < block_size; i++) { @@ -135,7 +142,7 @@ int CBCMAC_Final(CBCMAC_CTX *ctx, unsigned char *out, size_t *outlen) } } - return 0; + return 1; } int CBCMAC_resume(CBCMAC_CTX *ctx) diff --git a/crypto/cbcmac/cbcmac.h b/crypto/cbcmac/cbcmac.h index bc718a79..9eda2e40 100644 --- a/crypto/cbcmac/cbcmac.h +++ b/crypto/cbcmac/cbcmac.h @@ -53,6 +53,7 @@ * 2. the message length should be multiple of block size * 3. the implementation do not add padding */ + #ifndef HEADER_CBCMAC_H #define HEADER_CBCMAC_H @@ -77,8 +78,25 @@ int CBCMAC_Update(CBCMAC_CTX *ctx, const void *data, size_t datalen); int CBCMAC_Final(CBCMAC_CTX *ctx, unsigned char *out, size_t *outlen); int CBCMAC_resume(CBCMAC_CTX *ctx); +/* BEGIN ERROR CODES */ +/* + * The following lines are auto generated by the script mkerr.pl. Any changes + * made after this point may be overwritten when the script is next run. + */ +void ERR_load_CBCMAC_strings(void); + +/* Error codes for the CBCMAC functions. */ + +/* Function codes. */ +# define CBCMAC_F_CBCMAC_FINAL 100 +# define CBCMAC_F_CBCMAC_INIT 101 +# define CBCMAC_F_CBCMAC_UPDATE 102 + +/* Reason codes. */ +# define CBCMAC_R_CIPHER_CTX_INIT_FAILED 100 +# define CBCMAC_R_CIPHER_NOT_ECB_MODE 101 + #ifdef __cplusplus } #endif #endif - diff --git a/crypto/cbcmac/cbcmac_err.c b/crypto/cbcmac/cbcmac_err.c new file mode 100644 index 00000000..4b163d72 --- /dev/null +++ b/crypto/cbcmac/cbcmac_err.c @@ -0,0 +1,96 @@ +/* crypto/cbcmac/cbcmac_err.c */ +/* ==================================================================== + * Copyright (c) 1999-2016 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. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * + */ + +/* + * NOTE: this file was auto generated by the mkerr.pl script: any changes + * made to it will be overwritten when the script next updates this file, + * only reason strings will be preserved. + */ + +#include +#include +#include + +/* BEGIN ERROR CODES */ +#ifndef OPENSSL_NO_ERR + +# define ERR_FUNC(func) ERR_PACK(ERR_LIB_CBCMAC,func,0) +# define ERR_REASON(reason) ERR_PACK(ERR_LIB_CBCMAC,0,reason) + +static ERR_STRING_DATA CBCMAC_str_functs[] = { + {ERR_FUNC(CBCMAC_F_CBCMAC_FINAL), "CBCMAC_Final"}, + {ERR_FUNC(CBCMAC_F_CBCMAC_INIT), "CBCMAC_Init"}, + {ERR_FUNC(CBCMAC_F_CBCMAC_UPDATE), "CBCMAC_Update"}, + {0, NULL} +}; + +static ERR_STRING_DATA CBCMAC_str_reasons[] = { + {ERR_REASON(CBCMAC_R_CIPHER_CTX_INIT_FAILED), "cipher ctx init failed"}, + {ERR_REASON(CBCMAC_R_CIPHER_NOT_ECB_MODE), "cipher not ecb mode"}, + {0, NULL} +}; + +#endif + +void ERR_load_CBCMAC_strings(void) +{ +#ifndef OPENSSL_NO_ERR + + if (ERR_func_error_string(CBCMAC_str_functs[0].error) == NULL) { + ERR_load_strings(0, CBCMAC_str_functs); + ERR_load_strings(0, CBCMAC_str_reasons); + } +#endif +} diff --git a/crypto/cmac/Makefile b/crypto/cmac/Makefile index 6a284086..1386e3f4 100644 --- a/crypto/cmac/Makefile +++ b/crypto/cmac/Makefile @@ -93,12 +93,13 @@ cm_pmeth.o: ../../include/openssl/cmac.h ../../include/openssl/conf.h cm_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h cm_pmeth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h cm_pmeth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cm_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cm_pmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cm_pmeth.o: ../../include/openssl/opensslconf.h +cm_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +cm_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +cm_pmeth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h cm_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h cm_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cm_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +cm_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +cm_pmeth.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h cm_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h cm_pmeth.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h cm_pmeth.o: ../cryptlib.h ../evp/evp_locl.h cm_pmeth.c diff --git a/crypto/cms/Makefile b/crypto/cms/Makefile index 6f3a8320..8f7fcaa8 100644 --- a/crypto/cms/Makefile +++ b/crypto/cms/Makefile @@ -87,13 +87,15 @@ cms_asn1.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h cms_asn1.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h cms_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h cms_asn1.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -cms_asn1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +cms_asn1.o: ../../include/openssl/err.h ../../include/openssl/evp.h +cms_asn1.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h cms_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h cms_asn1.o: ../../include/openssl/opensslconf.h cms_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h cms_asn1.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h cms_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cms_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +cms_asn1.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +cms_asn1.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h cms_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h cms_asn1.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h cms_asn1.o: cms.h cms_asn1.c cms_lcl.h @@ -103,15 +105,16 @@ cms_att.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h cms_att.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h cms_att.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h cms_att.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cms_att.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cms_att.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -cms_att.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_att.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -cms_att.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cms_att.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -cms_att.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -cms_att.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cms_att.o: cms.h cms_att.c cms_lcl.h +cms_att.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +cms_att.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +cms_att.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +cms_att.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h +cms_att.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h +cms_att.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +cms_att.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +cms_att.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +cms_att.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +cms_att.o: ../../include/openssl/x509v3.h cms.h cms_att.c cms_lcl.h cms_cd.o: ../../e_os.h ../../include/openssl/asn1.h cms_cd.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h cms_cd.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h @@ -119,15 +122,17 @@ cms_cd.o: ../../include/openssl/comp.h ../../include/openssl/conf.h cms_cd.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h cms_cd.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h cms_cd.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cms_cd.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cms_cd.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cms_cd.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -cms_cd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -cms_cd.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -cms_cd.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -cms_cd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cms_cd.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -cms_cd.o: ../../include/openssl/x509v3.h ../cryptlib.h cms_cd.c cms_lcl.h +cms_cd.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +cms_cd.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +cms_cd.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +cms_cd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +cms_cd.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h +cms_cd.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +cms_cd.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +cms_cd.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +cms_cd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +cms_cd.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +cms_cd.o: ../cryptlib.h cms_cd.c cms_lcl.h cms_dd.o: ../../e_os.h ../../include/openssl/asn1.h cms_dd.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h cms_dd.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h @@ -135,15 +140,16 @@ cms_dd.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h cms_dd.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h cms_dd.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h cms_dd.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cms_dd.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cms_dd.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -cms_dd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_dd.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -cms_dd.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cms_dd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -cms_dd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -cms_dd.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cms_dd.o: ../cryptlib.h cms_dd.c cms_lcl.h +cms_dd.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +cms_dd.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +cms_dd.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +cms_dd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h +cms_dd.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h +cms_dd.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +cms_dd.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +cms_dd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +cms_dd.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +cms_dd.o: ../../include/openssl/x509v3.h ../cryptlib.h cms_dd.c cms_lcl.h cms_enc.o: ../../e_os.h ../../include/openssl/asn1.h cms_enc.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h cms_enc.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h @@ -151,15 +157,17 @@ cms_enc.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h cms_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h cms_enc.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h cms_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cms_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cms_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -cms_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_enc.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -cms_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -cms_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -cms_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cms_enc.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -cms_enc.o: ../../include/openssl/x509v3.h ../cryptlib.h cms_enc.c cms_lcl.h +cms_enc.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +cms_enc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +cms_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +cms_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h +cms_enc.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h +cms_enc.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h +cms_enc.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +cms_enc.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +cms_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +cms_enc.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +cms_enc.o: ../cryptlib.h cms_enc.c cms_lcl.h cms_env.o: ../../e_os.h ../../include/openssl/aes.h cms_env.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h cms_env.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h @@ -167,29 +175,32 @@ cms_env.o: ../../include/openssl/cms.h ../../include/openssl/conf.h cms_env.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h cms_env.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h cms_env.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cms_env.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cms_env.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cms_env.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -cms_env.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -cms_env.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -cms_env.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -cms_env.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -cms_env.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -cms_env.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cms_env.o: ../asn1/asn1_locl.h ../cryptlib.h cms_env.c cms_lcl.h +cms_env.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +cms_env.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +cms_env.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +cms_env.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +cms_env.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h +cms_env.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h +cms_env.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +cms_env.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +cms_env.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +cms_env.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +cms_env.o: ../../include/openssl/x509v3.h ../asn1/asn1_locl.h ../cryptlib.h +cms_env.o: cms_env.c cms_lcl.h cms_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h cms_err.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h cms_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h cms_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h cms_err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cms_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cms_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cms_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -cms_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -cms_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -cms_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cms_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -cms_err.o: cms_err.c +cms_err.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +cms_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +cms_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +cms_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +cms_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +cms_err.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +cms_err.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +cms_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +cms_err.o: ../../include/openssl/x509_vfy.h cms_err.c cms_ess.o: ../../e_os.h ../../include/openssl/asn1.h cms_ess.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h cms_ess.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h @@ -197,29 +208,32 @@ cms_ess.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h cms_ess.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h cms_ess.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h cms_ess.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cms_ess.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cms_ess.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -cms_ess.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_ess.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -cms_ess.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -cms_ess.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -cms_ess.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cms_ess.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -cms_ess.o: ../../include/openssl/x509v3.h ../cryptlib.h cms_ess.c cms_lcl.h +cms_ess.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +cms_ess.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +cms_ess.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +cms_ess.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h +cms_ess.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h +cms_ess.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h +cms_ess.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +cms_ess.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +cms_ess.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +cms_ess.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +cms_ess.o: ../cryptlib.h cms_ess.c cms_lcl.h cms_io.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h cms_io.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h cms_io.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h cms_io.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h cms_io.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cms_io.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cms_io.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cms_io.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -cms_io.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -cms_io.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -cms_io.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -cms_io.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cms_io.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h cms.h -cms_io.o: cms_io.c cms_lcl.h +cms_io.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +cms_io.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +cms_io.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +cms_io.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +cms_io.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h +cms_io.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +cms_io.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +cms_io.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +cms_io.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +cms_io.o: ../../include/openssl/x509_vfy.h cms.h cms_io.c cms_lcl.h cms_kari.o: ../../e_os.h ../../include/openssl/aes.h cms_kari.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h cms_kari.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h @@ -227,13 +241,14 @@ cms_kari.o: ../../include/openssl/cms.h ../../include/openssl/conf.h cms_kari.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h cms_kari.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h cms_kari.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cms_kari.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cms_kari.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cms_kari.o: ../../include/openssl/opensslconf.h +cms_kari.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +cms_kari.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +cms_kari.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h cms_kari.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h cms_kari.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h cms_kari.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h cms_kari.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +cms_kari.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h cms_kari.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h cms_kari.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h cms_kari.o: ../../include/openssl/x509v3.h ../asn1/asn1_locl.h ../cryptlib.h @@ -244,15 +259,16 @@ cms_lib.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h cms_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h cms_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h cms_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cms_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cms_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -cms_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -cms_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cms_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -cms_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -cms_lib.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cms_lib.o: cms.h cms_lcl.h cms_lib.c +cms_lib.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +cms_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +cms_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +cms_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h +cms_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h +cms_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +cms_lib.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +cms_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +cms_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +cms_lib.o: ../../include/openssl/x509v3.h cms.h cms_lcl.h cms_lib.c cms_pwri.o: ../../e_os.h ../../include/openssl/aes.h cms_pwri.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h cms_pwri.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h @@ -260,13 +276,14 @@ cms_pwri.o: ../../include/openssl/cms.h ../../include/openssl/conf.h cms_pwri.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h cms_pwri.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h cms_pwri.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cms_pwri.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cms_pwri.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cms_pwri.o: ../../include/openssl/opensslconf.h +cms_pwri.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +cms_pwri.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +cms_pwri.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h cms_pwri.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h cms_pwri.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h cms_pwri.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h cms_pwri.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +cms_pwri.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h cms_pwri.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h cms_pwri.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h cms_pwri.o: ../../include/openssl/x509v3.h ../asn1/asn1_locl.h ../cryptlib.h @@ -278,15 +295,17 @@ cms_sd.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h cms_sd.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h cms_sd.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h cms_sd.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cms_sd.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cms_sd.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -cms_sd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_sd.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -cms_sd.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cms_sd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -cms_sd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -cms_sd.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cms_sd.o: ../asn1/asn1_locl.h ../cryptlib.h cms_lcl.h cms_sd.c +cms_sd.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +cms_sd.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +cms_sd.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +cms_sd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h +cms_sd.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h +cms_sd.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +cms_sd.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +cms_sd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +cms_sd.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +cms_sd.o: ../../include/openssl/x509v3.h ../asn1/asn1_locl.h ../cryptlib.h +cms_sd.o: cms_lcl.h cms_sd.c cms_smime.o: ../../e_os.h ../../include/openssl/asn1.h cms_smime.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h cms_smime.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h @@ -294,12 +313,13 @@ cms_smime.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h cms_smime.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h cms_smime.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h cms_smime.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cms_smime.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cms_smime.o: ../../include/openssl/objects.h +cms_smime.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +cms_smime.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h cms_smime.o: ../../include/openssl/opensslconf.h cms_smime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h cms_smime.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cms_smime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +cms_smime.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +cms_smime.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h cms_smime.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h cms_smime.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h cms_smime.o: ../asn1/asn1_locl.h ../cryptlib.h cms_lcl.h cms_smime.c diff --git a/crypto/conf/Makefile b/crypto/conf/Makefile index d5f5c582..2e7337aa 100644 --- a/crypto/conf/Makefile +++ b/crypto/conf/Makefile @@ -116,12 +116,13 @@ conf_mall.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h conf_mall.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h conf_mall.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h conf_mall.o: ../../include/openssl/err.h ../../include/openssl/evp.h -conf_mall.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -conf_mall.o: ../../include/openssl/objects.h +conf_mall.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +conf_mall.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h conf_mall.o: ../../include/openssl/opensslconf.h conf_mall.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h conf_mall.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -conf_mall.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +conf_mall.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +conf_mall.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h conf_mall.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h conf_mall.o: ../../include/openssl/x509_vfy.h ../cryptlib.h conf_mall.c conf_mod.o: ../../e_os.h ../../include/openssl/asn1.h @@ -130,12 +131,13 @@ conf_mod.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h conf_mod.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h conf_mod.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h conf_mod.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -conf_mod.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -conf_mod.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -conf_mod.o: ../../include/openssl/opensslconf.h +conf_mod.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +conf_mod.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +conf_mod.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h conf_mod.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h conf_mod.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -conf_mod.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +conf_mod.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +conf_mod.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h conf_mod.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h conf_mod.o: ../../include/openssl/x509_vfy.h ../cryptlib.h conf_mod.c conf_sap.o: ../../e_os.h ../../include/openssl/asn1.h @@ -145,10 +147,12 @@ conf_sap.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h conf_sap.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h conf_sap.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h conf_sap.o: ../../include/openssl/err.h ../../include/openssl/evp.h -conf_sap.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -conf_sap.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +conf_sap.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +conf_sap.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +conf_sap.o: ../../include/openssl/opensslconf.h conf_sap.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h conf_sap.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -conf_sap.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +conf_sap.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +conf_sap.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h conf_sap.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h conf_sap.o: ../../include/openssl/x509_vfy.h ../cryptlib.h conf_sap.c diff --git a/crypto/cpk/Makefile b/crypto/cpk/Makefile index 00972229..3c43eb92 100644 --- a/crypto/cpk/Makefile +++ b/crypto/cpk/Makefile @@ -76,3 +76,90 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. +cpk_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h +cpk_asn1.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h +cpk_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +cpk_asn1.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h +cpk_asn1.o: ../../include/openssl/ecdsa.h ../../include/openssl/ecies.h +cpk_asn1.o: ../../include/openssl/err.h ../../include/openssl/evp.h +cpk_asn1.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +cpk_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +cpk_asn1.o: ../../include/openssl/opensslconf.h +cpk_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +cpk_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +cpk_asn1.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +cpk_asn1.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +cpk_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +cpk_asn1.o: ../../include/openssl/x509_vfy.h cpk.h cpk_asn1.c +cpk_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +cpk_err.o: ../../include/openssl/buffer.h ../../include/openssl/cpk.h +cpk_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +cpk_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h +cpk_err.o: ../../include/openssl/ecdsa.h ../../include/openssl/ecies.h +cpk_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h +cpk_err.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +cpk_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +cpk_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +cpk_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +cpk_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +cpk_err.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +cpk_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +cpk_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +cpk_err.o: cpk_err.c +cpk_kap.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +cpk_kap.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h +cpk_kap.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +cpk_kap.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +cpk_kap.o: ../../include/openssl/ecies.h ../../include/openssl/err.h +cpk_kap.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +cpk_kap.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +cpk_kap.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +cpk_kap.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +cpk_kap.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +cpk_kap.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +cpk_kap.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +cpk_kap.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +cpk_kap.o: ../../include/openssl/x509_vfy.h cpk.h cpk_kap.c +cpk_lib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h +cpk_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h +cpk_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +cpk_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h +cpk_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/ecies.h +cpk_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h +cpk_lib.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +cpk_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +cpk_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +cpk_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +cpk_lib.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h +cpk_lib.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +cpk_lib.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +cpk_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +cpk_lib.o: ../../include/openssl/x509_vfy.h cpk.h cpk_lib.c +cpk_map.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +cpk_map.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h +cpk_map.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +cpk_map.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +cpk_map.o: ../../include/openssl/ecies.h ../../include/openssl/err.h +cpk_map.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +cpk_map.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +cpk_map.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +cpk_map.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +cpk_map.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +cpk_map.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +cpk_map.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +cpk_map.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +cpk_map.o: ../../include/openssl/x509_vfy.h cpk.h cpk_map.c +cpk_prn.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +cpk_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h +cpk_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +cpk_prn.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +cpk_prn.o: ../../include/openssl/ecies.h ../../include/openssl/err.h +cpk_prn.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +cpk_prn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +cpk_prn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +cpk_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +cpk_prn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +cpk_prn.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +cpk_prn.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +cpk_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +cpk_prn.o: ../../include/openssl/x509_vfy.h cpk.h cpk_prn.c diff --git a/crypto/cpk/cpk.h b/crypto/cpk/cpk.h index 3ca0af9d..cee2d3d9 100644 --- a/crypto/cpk/cpk.h +++ b/crypto/cpk/cpk.h @@ -61,152 +61,38 @@ extern "C" { #endif -#define CPK_LIB_VERSION "0.9" #define CPK_MAX_ID_LENGTH 64 -/** - * @struct CPK_MASTER_SECRET - * @brief The in-memory structure to represent a cpk master secret. - */ typedef struct cpk_master_secret_st { - long version; /**< The version of the master secret.*/ - X509_NAME *id; /**< The id of the master secret.*/ - X509_ALGOR *pkey_algor; /**< The public key algorithm used in the master secret.*/ - X509_ALGOR *map_algor; /**< The map algorithm used in the master secret.*/ - ASN1_OCTET_STRING *secret_factors; /**< The secret factors of the master secret.*/ + long version; + X509_NAME *id; + X509_ALGOR *pkey_algor; + X509_ALGOR *map_algor; + ASN1_OCTET_STRING *secret_factors; } CPK_MASTER_SECRET; -/** - * @def - * @brief Declare 4 basic ASN1 functions of CPK_MASTER_SECRET and a pointer - * to an ASN1_ITEM with detail information of the fields of - * CPK_MASTER_SECRET in it. - * - * The macro would generate following 4 function declarations and 1 pointer:\n - * CPK_MASTER_SECRET *CPK_MASTER_SECRET_new(void): alloc a new instance of CPK_MASTER_SECRET.\n - * void CPK_MASTER_SECRET_free(CPK_MASTER_SECRET* a): free the instance a.\n - * CPK_MASTER_SECRET *d2i_CPK_MASTER_SECRET(CPK_MASTER_SECRET **a, const unsigned char **in, long len): - * convert the CPK_MASTER_SECRET instance from the DER format to the internal format.\n - * int i2d_CPK_MASTER_SECRET(CPK_MASTER_SECRET *a, unsigned char* out): convert an CPK_MASTER_SECRET - * to the DER format.\n - * ASN1_ITEM* CPK_MASTER_SECRET_it: a pointer to a instance of ASN1_ITEM struct which contains - * information on the conversion between DER and internal.\n - */ -DECLARE_ASN1_FUNCTIONS(CPK_MASTER_SECRET) -/** - * @struct CPK_PUBLIC_PARAMS - * @brief The in-memory structure to represent a set of cpk public parameters. - */ + typedef struct cpk_public_params_st { - long version; /**< The version of the public parameters.*/ - X509_NAME *id; /**< The id of the public parameters.*/ - X509_ALGOR *pkey_algor; /**< The public key algorithm used in the public parameters.*/ - X509_ALGOR *map_algor; /**< The map algorithm used in the public parameters.*/ - ASN1_OCTET_STRING *public_factors;/**< The public factors of the public parameters.*/ + long version; + X509_NAME *id; + X509_ALGOR *pkey_algor; + X509_ALGOR *map_algor; + ASN1_OCTET_STRING *public_factors; } CPK_PUBLIC_PARAMS; -/** - * @brief Declare 4 basic ASN1 functions of CPK_PUBLIC_PARAMS and a pointer to an ASN1_ITEM - * with detail information of the fields of CPK_PUBLIC_PARAMS in it. - * - * The macro would generate following 4 function declarations and 1 pointer:\n - * CPK_PUBLIC_PARAMS *CPK_PUBLIC_PARAMS_new(void): alloc a new instance of CPK_PUBLIC_PARAMS.\n - * void CPK_PUBLIC_PARAMS_free(CPK_PUBLIC_PARAMS* a): free the instance a.\n - * CPK_PUBLIC_PARAMS *d2i_CPK_PUBLIC_PARAMS(CPK_PUBLIC_PARAMS **a, const unsigned char **in, long len): - * convert the CPK_PUBLIC_PARAMS instance from the DER format to the internal format.\n - * int i2d_CPK_PUBLIC_PARAMS(CPK_PUBLIC_PARAMS *a, unsigned char* out): convert a CPK_PUBLIC_PARAMS - * to the DER format.\n - * ASN1_ITEM* CPK_PUBLIC_PARAMS_it: a pointer to a instance of ASN1_ITEM struct which contains - * information on the conversion between DER and internal.\n - */ -DECLARE_ASN1_FUNCTIONS(CPK_PUBLIC_PARAMS) -/** - * @brief Get a new default map algorithm. - * - * @return Returns a pointer to a new instance of the default map algorithm of the type X509_ALGOR. - */ -X509_ALGOR *CPK_MAP_new_default(); -/** - * @brief Check if the given map algorithm is valid. - * - * @param[in] algor The pointer to the algorithm to check. - * @return Returns 1 if the given algorithm is valid. - */ +X509_ALGOR *CPK_MAP_new_default(void); int CPK_MAP_is_valid(const X509_ALGOR *algor); - -/** - * @brief Get the number of factors of the given algorithm. - * - * @param[in] algor The pointer to the algorithm. - * @return Returns the number of factors of the algorithm. - */ int CPK_MAP_num_factors(const X509_ALGOR *algor); - -/** - * @brief Get the number of indexes of the given algorithm. - * - * @param[in] algor The pointer to the algorithm. - * @return Returns the number of indexes of the algorithm. - */ int CPK_MAP_num_indexes(const X509_ALGOR *algor); - -/** - * @brief Convert the string to the index vector. - * - * @param[in] algor The pointer to the algorithm to do the map function. - * @param[in] str The pointer to a string in the memory, ended by '\0'. - * @param[out] index The pointer to a array which will receive the index. - * @return Returns 1 on success. - */ int CPK_MAP_str2index(const X509_ALGOR *algor, const char *str, int *index); - -/** - * @brief Print the parameters of the map algortihm. - * - * @param[out] out A IO abstraction to receive the output stream. - * @param[in] indent The amount of the indentation in the output stream. - * @param[in] flags The flag set to control the ouput. - * @return Returns 1 on success. - */ int CPK_MAP_print(BIO *out, X509_ALGOR *map, int indent, unsigned long flags); -/** - * @brief Create a master secret with the given domain id, public key algorithm and map algorithm. - * - * @param[in] domain_id The domain identifier of the master secret. - * @param[in] pkey The pointer to the public key algorithm of the master secret. - * @param[in] map_algor The pointer to the map algorithm of the master secret. - * @return Returns a poniter to the created master secret on success, or NULL on failure. - */ CPK_MASTER_SECRET *CPK_MASTER_SECRET_create(const char *domain_id, EVP_PKEY *pkey, X509_ALGOR *map_algor); - -/** - * @brief Extract the public parameters from the master secret. - * - * @param[in] master The master secret to extract from. - * @return Returns the pointer to the extracted public parameters on success, or NULL on failure. - */ CPK_PUBLIC_PARAMS *CPK_MASTER_SECRET_extract_public_params(CPK_MASTER_SECRET *master); - -/** - * @brief Extract the private key of a given identifier from the master secret. - * - * @param[in] master The master secret to extract from. - * @param[in] id The identifier which is used to maps to the private key. - * @return Returns the pointer to the extracted private key on success, or NULL on failure. - */ EVP_PKEY *CPK_MASTER_SECRET_extract_private_key(CPK_MASTER_SECRET *master, const char *id); - -/** - * @brief Extract the public key of a given identifier from the public parameters. - * - * @param[in] params The public parameters to extract from. - * @param[in] id The identifier which is used to maps to the public key. - * @return Returns the pointer to the extracted public key EVP_PKEY on success, or NULL on failure. - */ EVP_PKEY *CPK_PUBLIC_PARAMS_extract_public_key(CPK_PUBLIC_PARAMS *params, const char *id); @@ -216,374 +102,74 @@ int CPK_PUBLIC_PARAMS_compute_share_key(CPK_PUBLIC_PARAMS *params, char *CPK_MASTER_SECRET_get_name(CPK_MASTER_SECRET *master, char *buf, int size); char *CPK_PUBLIC_PARAMS_get_name(CPK_PUBLIC_PARAMS *params); - -/** - * @brief Generate the message digest of the given master secret with the given parameters. - * - * This function takes the secret_factors field of the given parameter of CPK_MASTER_SECRET as - * the input and the parameter type of EVP_MD as the message digest - * algorithm to compute the message digest, and put the result in the parameter md, the length - * of the result in the paramter len. - * @param[in] master The master secret to compute the digest. - * @param[in] type The message digest algorithm to use to comput the digest. - * @param[out] md The buffer to receive the result of the computation of message digest. - * @param[out] len If len is not null, the variable it point to will be assigned the length of - * the message digest. - * @return Returns 1 on success, 0 on failure. - */ int CPK_MASTER_SECRET_digest(CPK_MASTER_SECRET *master, const EVP_MD *type, unsigned char *md, unsigned int *len); - -/** - * @brief Generate the message digest of the given public parameters with the given parameters. - * - * This function takes the secret_factors field of the given parameter of CPK_PUBLIC_PARAMS as - * the input and the parameter type of EVP_MD as the message digest - * algorithm to compute the message digest, and put the result in the parameter md, the length - * of the result in the paramter len. - * @param[in] params The public parameters to compute the digest. - * @param[in] type The message digest algorithm to use to comput the digest. - * @param[out] md The buffer to receive the result of the computation of message digest. - * @param[out] len If len is not null, the variable it point to will be assigned the length of - * the message digest. - * @return Returns 1 on success, 0 on failure. - */ int CPK_PUBLIC_PARAMS_digest(CPK_PUBLIC_PARAMS *params, const EVP_MD *type, unsigned char *md, unsigned int *len); - -/** - * @brief Print the master secret to a BIO, including the version, the domain uri, the public - * algorithm and the map algorithm. - * - * @param[out] out A IO abstraction to receive the output stream. - * @param[in] master The CPK_MASTER_SECRET instance to print. - * @param[in] indent The amount of the indentation. - * @param[in] flags The flag set to control the ouput. - * @return Returns 1 on success, 0 on failure. - */ int CPK_MASTER_SECRET_print(BIO *out, CPK_MASTER_SECRET *master, int indent, unsigned long flags); - -/** - * @brief Print the public parameters to a BIO. - * - * @param[out] out A IO abstraction to receive the output stream. - * @param[in] params The CPK_PUBLIC_PARAMS instance to print. - * @param[in] indent The amount of the indentation. - * @param[in] flags The flag set to control the ouput. - * @return Returns 1 on success, 0 on failure. - */ int CPK_PUBLIC_PARAMS_print(BIO *out, CPK_PUBLIC_PARAMS *params, int indent, unsigned long flags); - -/** - * @brief Validate the public parameters with the given master secret. - * - * @param[in] master The master secret used for the validation. - * @param[in] params The public parameters to validate. - * @return Returns 1 if the public parameter is valid, returns 0 otherwise. - */ int CPK_MASTER_SECRET_validate_public_params(CPK_MASTER_SECRET *master, CPK_PUBLIC_PARAMS *params); - -/** - * @brief Validate the private key with the given public parameters. - * - * @param[in] params The public parameter used for the validation. - * @param[in] id the identifier of the private key owner. - * @param[in] pkey pkey The private key to validate. - * @return Returns 1 if the private key is valid, returns a integer less or equal than 0 otherwise. - */ int CPK_PUBLIC_PARAMS_validate_private_key(CPK_PUBLIC_PARAMS *params, const char *id, const EVP_PKEY *pkey); - -/** - * @brief Convert the master secret in DER format in the IO abstraction to an instance of CPK_MASTER_SECRET. - * - * @param[in] bp A pointer to the IO abstraction which ocntaints the master secret in DER format. - * @param[out] master A pointer to receive the pointer to the converted master secret of the type CPK_MASTER_SECRET. - * @return Returns the pointer to the converted master secret of the type CPK_MASTER_SECRET on success, - * or null on failure. - */ CPK_MASTER_SECRET *d2i_CPK_MASTER_SECRET_bio(BIO *bp, CPK_MASTER_SECRET **master); - -/** - * @brief Convert the master key from CPK_MASTER_SECRET to a byte stream in DER format, and write - * the stream to an IO abstraction. - * - * @param[out] bp A pointer to the IO abstraction which receives the stream. - * @param[in] master A pointer to the master key of the type CPK_MASTER_SECRET. - * @return Returns the size of the output stream on success, of an integer less or equal than 0 - * indicating an error. - */ int i2d_CPK_MASTER_SECRET_bio(BIO *bp, CPK_MASTER_SECRET *master); - -/** - * @brief Convert the public parameters in DER format in the IO abstraction to an instance of CPK_PUBLIC_PARAMS. - * - * @param[in] bp A pointer to the IO abstraction which ocntaints the public parameters in DER format. - * @param[out] params A pointer to receive the pointer to the converted public parameters of the type CPK_PUBLIC_PARAMS. - * @return Returns the pointer to the converted public parameters of the type CPK_PUBLIC_PARAMS on success, - * or null on failure. - */ CPK_PUBLIC_PARAMS *d2i_CPK_PUBLIC_PARAMS_bio(BIO *bp, CPK_PUBLIC_PARAMS **params); - -/** - * @brief Convert the public parameters from CPK_PUBLIC_PARAMS to a byte stream in DER format, - * and write the stream to an IO abstraction. - * - * @param[out] bp A pointer to the IO abstraction which receives the stream. - * @param[in] master A pointer to the public parameters of the type CPK_PUBLIC_PARAMS. - * @return Returns the size of the output stream on success, of an integer less or equal than 0 - * indicating an error. - */ int i2d_CPK_PUBLIC_PARAMS_bio(BIO *bp, CPK_PUBLIC_PARAMS *params); +/* BEGIN ERROR CODES */ /* - * SignerInfo ::= SEQUENCE { - * version INTEGER {1}, - * signer IssuerAndSerialNumber, - * digestAlgor DigestAlgorithmIdentifier, - * signedAttrs [0] IMPLICIT Attributes OPTIONAL, - * signingAlgor SigningAlgorithmIdentifier, - * signature OCTET STRING {{ECDSASigValue}}, - * unsignedAttrs [1] IMPLICIT Attributes OPTIONAL - * } + * The following lines are auto generated by the script mkerr.pl. Any changes + * made after this point may be overwritten when the script is next run. */ -typedef struct cpk_signer_info_st { - long version; - X509_NAME *signer; - X509_ALGOR *digest_algor; - STACK_OF(X509_ATTRIBUTE) *signed_attr; - X509_ALGOR *sign_algor; - ASN1_OCTET_STRING *signature; - STACK_OF(X509_ATTRIBTE) *unsigned_attr; - EVP_PKEY *_privkey; /* private member */ -} CPK_SIGNER_INFO; -DECLARE_STACK_OF(CPK_SIGNER_INFO) -DECLARE_ASN1_SET_OF(CPK_SIGNER_INFO) -DECLARE_ASN1_FUNCTIONS(CPK_SIGNER_INFO) - -int CPK_SIGNER_INFO_set(CPK_SIGNER_INFO *si, const EVP_MD *sign_alg, const EVP_PKEY *sign_key); -int CPK_SIGNER_INFO_add_attr(CPK_SIGNER_INFO *si, int nid, int atrtype, void *value); -int CPK_SIGNER_INFO_add_signed_attr(CPK_SIGNER_INFO *si, int nid, int atrtype, void *value); -int CPK_SIGNER_INFO_add_signed_time(CPK_SIGNER_INFO *si); -int CPK_SIGNER_INFO_add_signed_digest(CPK_SIGNER_INFO *si, const EVP_MD_CTX *ctx); -ASN1_TYPE *CPK_SIGNER_INFO_get_attr(CPK_SIGNER_INFO *si, int nid); -ASN1_TYPE *CPK_SIGNER_INFO_get_signed_attr(CPK_SIGNER_INFO *si, int nid); -ASN1_UTCTIME *CPK_SIGNER_INFO_get_signed_time(CPK_SIGNER_INFO *si); - -int CPK_SIGNER_INFO_do_sign(CPK_SIGNER_INFO *si, EVP_MD_CTX *md_ctx); -int CPK_SIGNER_INFO_do_verify(const CPK_SIGNER_INFO *si, EVP_MD_CTX *ctx, const CPK_PUBLIC_PARAMS *params); - -/* - * RecipientInfo ::= SEQUENCE { - * version INTEGER {0}, - * recipient IssuerAndSerialNumber, - * keyEncryptionAlgor EncryptionAlgorithmIdentifier, - * encryptedKey OCTET STRING - * } - * RecipientInfos ::= SET OF RecipientInfo - */ -typedef struct cpk_recip_info_st { - long version; - X509_NAME *recipient; - X509_ALGOR *enc_algor; - ASN1_OCTET_STRING *enc_data; - /* private */ - EVP_PKEY *_pubkey; -} CPK_RECIP_INFO; -DECLARE_STACK_OF(CPK_RECIP_INFO) -DECLARE_ASN1_SET_OF(CPK_RECIP_INFO) -DECLARE_ASN1_FUNCTIONS(CPK_RECIP_INFO) - -int CPK_RECIP_INFO_set(CPK_RECIP_INFO *ri, const X509_NAME *recipient, const ECIES_PARAMS *ecies); -int CPK_RECIP_INFO_do_encrypt(CPK_RECIP_INFO *ri, const unsigned char *in, size_t inlen); -int CPK_RECIP_INFO_do_decrypt(CPK_RECIP_INFO *ri, const EVP_PKEY *pkey, unsigned char *out, size_t *outlen); - - -/* - * SingerInfos ::= SET OF SignerInfo - * - * SignedData ::= SEQUENCE { - * version INTEGER, - * digestAlgors DigestAlgorithmIdentifiers, - * contentInfo ContentInfo, - * signerInfos SignerInfos, - * } - */ -typedef struct cpk_signed_st { - long version; - STACK_OF(X509_ALGOR) *digest_algors; - STACK_OF(X509) *cert; /* [ 0 ] */ - STACK_OF(X509_CRL) *crl; /* [ 1 ] */ - STACK_OF(CPK_SIGINFO) *signer_infos; - struct CPK_CMS_st *contents; -} CPK_SIGNED; -DECLARE_ASN1_FUNCTIONS(CPK_SIGNED) - -typedef struct cpk_enc_content_st { - ASN1_OBJECT *content_type; - X509_ALGOR *enc_algor; - ASN1_OCTET_STRING *enc_data; /* [ 0 ] */ - /* private */ - const EVP_CIPHER *cipher; -} CPK_ENC_CONTENT; -DECLARE_ASN1_FUNCTIONS(CPK_ENC_CONTENT) - -typedef struct cpk_envelope_st { - long version; - STACK_OF(CPK_RECIP_INFO) *recip_infos; - CPK_ENC_CONTENT *enc_data; -} CPK_ENVELOPE; -DECLARE_ASN1_FUNCTIONS(CPK_ENVELOPE) - -typedef struct cpk_sign_envelope_st { - long version; - STACK_OF(X509_ALGOR) *digest_algors; - STACK_OF(X509) *cert; /* [ 0 ] */ - STACK_OF(X509_CRL) *crl; /* [ 1 ] */ - STACK_OF(CPK_SIGNER_INFO) *signer_infos; - CPK_ENC_CONTENT *enc_data; - STACK_OF(CPK_RECIP_INFO) *recip_infos; -} CPK_SIGN_ENVELOPE; -DECLARE_ASN1_FUNCTIONS(CPK_SIGN_ENVELOPE) - -typedef struct cpk_cms_st { - int state; /* used during processing */ - int detached; - - ASN1_OBJECT *type; - union { - char *ptr; - - /* NID_pkcs7_data */ - ASN1_OCTET_STRING *data; - - /* NID_pkcs7_signed */ - CPK_SIGNED *sign; - - /* NID_pkcs7_enveloped */ - CPK_ENVELOPE *enveloped; - - /* NID_pkcs7_signedAndEnveloped */ - CPK_SIGN_ENVELOPE *signed_and_enveloped; - - /* Anything else */ - ASN1_TYPE *other; - } d; -} CPK_CMS; -DECLARE_STACK_OF(CPK_CMS) -DECLARE_ASN1_SET_OF(CPK_CMS) -DECLARE_PKCS12_STACK_OF(CPK_CMS) -DECLARE_ASN1_FUNCTIONS(CPK_CMS) - -DECLARE_ASN1_ITEM(CPK_CMS_ATTR_SIGN) -DECLARE_ASN1_ITEM(CPK_CMS_ATTR_VERIFY) -DECLARE_ASN1_NDEF_FUNCTION(CPK_CMS) - - - -#define CPK_CMS_OP_SET_DETACHED_SIGNATURE 1 -#define CPK_CMS_OP_GET_DETACHED_SIGNATURE 2 - -#define CPK_CMS_get_signed_attributes(si) ((si)->auth_attr) -#define CPK_CMS_get_attributes(si) ((si)->unauth_attr) - -#define CPK_CMS_type_is_signed(a) \ - (OBJ_obj2nid((a)->type) == NID_pkcs7_signed) -#define CPK_CMS_type_is_enveloped(a) \ - (OBJ_obj2nid((a)->type) == NID_pkcs7_enveloped) -#define CPK_CMS_type_is_signedAndEnveloped(a) \ - (OBJ_obj2nid((a)->type) == NID_pkcs7_signedAndEnveloped) -#define CPK_CMS_type_is_data(a) \ - (OBJ_obj2nid((a)->type) == NID_pkcs7_data) -#define CPK_CMS_set_detached(p,v) \ - CPK_CMS_ctrl(p,CPK_CMS_OP_SET_DETACHED_SIGNATURE,v,NULL) -#define CPK_CMS_get_detached(p) \ - CPK_CMS_ctrl(p,CPK_CMS_OP_GET_DETACHED_SIGNATURE,0,NULL) -#define CPK_CMS_is_detached(p7) \ - (CPK_CMS_type_is_signed(p7) && CPK_CMS_get_detached(p7)) - -long CPK_CMS_ctrl(CPK_CMS *p7, int cmd, long larg, char *parg); -int CPK_CMS_set_type(CPK_CMS *p7, int type); -int CPK_CMS_set_cipher(CPK_CMS *p7, const EVP_CIPHER *cipher); -int CPK_CMS_set_content(CPK_CMS *p7, CPK_CMS *p7_data); -int CPK_CMS_content_new(CPK_CMS *p7, int type); -int CPK_CMS_add_signer(CPK_CMS *p7, const EVP_MD *sign_alg, const EVP_PKEY *sign_key); -int CPK_CMS_add_recipient(CPK_CMS *p7, const X509_NAME *id, const ECIES_PARAMS *params); - - -BIO *CPK_CMS_dataInit(CPK_CMS *p7, BIO *bio); -BIO *CPK_CMS_dataDecode(CPK_CMS *p7, BIO *in_bio, const EVP_PKEY *keyinfo); -int CPK_CMS_dataUpdate(CPK_CMS *p7, BIO *bio, const unsigned char *data, int len); -int CPK_CMS_dataFinal(CPK_CMS *p7, BIO *bio); -STACK_OF(CPK_SIGNER_INFO) *CPK_CMS_get_signer_infos(CPK_CMS *p7); -int CPK_CMS_dataVerify(CPK_PUBLIC_PARAMS *params, BIO *bio, CPK_CMS *p7, CPK_SIGNER_INFO *si); - - - -/* ERR function (should in openssl/err.h) begin */ -#define ERR_LIB_CPK 130 -#define ERR_R_CPK_LIB ERR_LIB_CPK -#define CPKerr(f,r) ERR_PUT_error(ERR_LIB_CPK,(f),(r),__FILE__,__LINE__) -/* end */ - - void ERR_load_CPK_strings(void); -/** - * @defgroup error_cpk Definations to handle errors of cpk runtime. - * @{ - */ -/* Error codes for the ECIES functions. */ +/* Error codes for the CPK functions. */ /* Function codes. */ -#define CPK_F_CPK_MASTER_SECRET_CREATE 100 -#define CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS 101 -#define CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY 102 -#define CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY 103 -#define CPK_F_CPK_PUBLIC_PARAMS_COMPUTE_SHARE_KEY 116 -#define CPK_F_CPK_MASTER_SECRET_DIGEST 104 -#define CPK_F_CPK_PUBLIC_PARAMS_DIGEST 105 -#define CPK_F_CPK_MASTER_SECRET_PRINT 106 -#define CPK_F_CPK_PUBLIC_PARAMS_PRINT 107 -#define CPK_F_CPK_MASTER_SECRET_VALIDATE_PUBLIC_PARAMS 108 -#define CPK_F_CPK_PUBLIC_PARAMS_VALIDATE_PRIVATE_KEY 109 -#define CPK_F_CPK_MAP_NEW_DEFAULT 110 -#define CPK_F_CPK_MAP_NUM_FACTORS 111 -#define CPK_F_CPK_MAP_NUM_INDEXES 112 -#define CPK_F_CPK_MAP_STR2INDEX 113 -#define CPK_F_X509_ALGOR_GET1_EC_KEY 114 -#define CPK_F_X509_ALGOR_GET1_DSA 115 +# define CPK_F_CPK_MAP_NEW_DEFAULT 100 +# define CPK_F_CPK_MAP_NUM_FACTORS 101 +# define CPK_F_CPK_MAP_NUM_INDEXES 102 +# define CPK_F_CPK_MAP_STR2INDEX 103 +# define CPK_F_CPK_MASTER_SECRET_CREATE 104 +# define CPK_F_CPK_MASTER_SECRET_DIGEST 105 +# define CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY 106 +# define CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS 107 +# define CPK_F_CPK_MASTER_SECRET_PRINT 108 +# define CPK_F_CPK_MASTER_SECRET_VALIDATE_PUBLIC_PARAMS 109 +# define CPK_F_CPK_PUBLIC_PARAMS_COMPUTE_SHARE_KEY 110 +# define CPK_F_CPK_PUBLIC_PARAMS_DIGEST 111 +# define CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY 112 +# define CPK_F_CPK_PUBLIC_PARAMS_PRINT 113 +# define CPK_F_CPK_PUBLIC_PARAMS_VALIDATE_PRIVATE_KEY 114 +# define CPK_F_X509_ALGOR_GET1_DSA 115 +# define CPK_F_X509_ALGOR_GET1_EC_KEY 116 /* Reason codes. */ -#define CPK_R_BAD_ARGUMENT 100 -#define CPK_R_UNKNOWN_DIGEST_TYPE 101 -#define CPK_R_UNKNOWN_CIPHER_TYPE 102 -#define CPK_R_UNKNOWN_MAP_TYPE 103 -#define CPK_R_UNKNOWN_CURVE 104 -#define CPK_R_STACK_ERROR 105 -#define CPK_R_DERIVE_KEY_FAILED 106 -#define CPK_R_ECIES_ENCRYPT_FAILED 107 -#define CPK_R_ECIES_DECRYPT_FAILED 108 -#define CPK_R_DER_DECODE_FAILED 109 -#define CPK_R_UNSUPPORTED_PKCS7_CONTENT_TYPE 110 -#define CPK_R_SET_SIGNER 111 -#define CPK_R_SET_RECIP_INFO 112 -#define CPK_R_UNABLE_TO_FIND_MESSAGE_DIGEST 113 -#define CPK_R_BAD_DATA 114 -#define CPK_R_MAP_FAILED 115 -#define CPK_R_ADD_SIGNING_TIME 116 -#define CPK_R_VERIFY_FAILED 117 -#define CPK_R_UNKNOWN_ECDH_TYPE 118 -#define CPK_R_DIGEST_FAILED 119 -#define CPK_R_WITHOUT_DECRYPT_KEY 120 -#define CPK_R_UNKNOWN_PKCS7_TYPE 121 -#define CPK_R_INVALID_ID_LENGTH 122 -#define CPK_R_INVALID_PKEY_TYPE 123 -#define CPK_R_INVALID_MAP_ALGOR 124 -#define CPK_R_PKEY_TYPE_NOT_MATCH 125 +# define CPK_R_ADD_SIGNING_TIME 100 +# define CPK_R_BAD_ARGUMENT 101 +# define CPK_R_BAD_DATA 102 +# define CPK_R_DERIVE_KEY_FAILED 103 +# define CPK_R_DER_DECODE_FAILED 104 +# define CPK_R_DIGEST_FAILED 105 +# define CPK_R_ECIES_DECRYPT_FAILED 106 +# define CPK_R_ECIES_ENCRYPT_FAILED 107 +# define CPK_R_INVALID_ID_LENGTH 108 +# define CPK_R_INVALID_MAP_ALGOR 109 +# define CPK_R_INVALID_PKEY_TYPE 110 +# define CPK_R_MAP_FAILED 111 +# define CPK_R_PKEY_TYPE_NOT_MATCH 112 +# define CPK_R_SET_RECIP_INFO 113 +# define CPK_R_SET_SIGNER 114 +# define CPK_R_STACK_ERROR 115 +# define CPK_R_UNABLE_TO_FIND_MESSAGE_DIGEST 116 +# define CPK_R_UNKNOWN_CIPHER_TYPE 117 +# define CPK_R_UNKNOWN_CURVE 118 +# define CPK_R_UNKNOWN_DIGEST_TYPE 119 +# define CPK_R_UNKNOWN_ECDH_TYPE 120 +# define CPK_R_UNKNOWN_MAP_TYPE 121 +# define CPK_R_UNKNOWN_PKCS7_TYPE 122 +# define CPK_R_UNSUPPORTED_PKCS7_CONTENT_TYPE 123 +# define CPK_R_VERIFY_FAILED 124 +# define CPK_R_WITHOUT_DECRYPT_KEY 125 -/** - * @} - */ - #ifdef __cplusplus } #endif diff --git a/crypto/cpk/cpk_asn1.c b/crypto/cpk/cpk_asn1.c index b745e5d3..e92073a2 100644 --- a/crypto/cpk/cpk_asn1.c +++ b/crypto/cpk/cpk_asn1.c @@ -89,87 +89,3 @@ int i2d_CPK_PUBLIC_PARAMS_bio(BIO *bp, CPK_PUBLIC_PARAMS *params) { return ASN1_item_i2d_bio(ASN1_ITEM_rptr(CPK_PUBLIC_PARAMS), bp, params); } -#if 0 - -/* This is the ANY DEFINED BY table for the top level PKCS#7 structure */ -ASN1_ADB_TEMPLATE(cpkcmsdefault) = ASN1_EXP_OPT(CPK_CMS, d.other, ASN1_ANY, 0); - -ASN1_ADB(CPK_CMS) = { - ADB_ENTRY(NID_pkcs7_data, ASN1_NDEF_EXP_OPT(CPK_CMS, d.data, ASN1_OCTET_STRING_NDEF, 0)), - ADB_ENTRY(NID_pkcs7_signed, ASN1_NDEF_EXP_OPT(CPK_CMS, d.sign, CPK_SIGNED, 0)), - ADB_ENTRY(NID_pkcs7_enveloped, ASN1_NDEF_EXP_OPT(CPK_CMS, d.enveloped, CPK_ENVELOPE, 0)), - ADB_ENTRY(NID_pkcs7_signedAndEnveloped, - ASN1_NDEF_EXP_OPT(CPK_CMS, d.signed_and_enveloped, CPK_SIGN_ENVELOPE, 0)), -} ASN1_ADB_END(CPK_CMS, 0, type, 0, &cpkcmsdefault_tt, NULL); - - -ASN1_NDEF_SEQUENCE(CPK_CMS) = { - ASN1_SIMPLE(CPK_CMS, type, ASN1_OBJECT), - ASN1_ADB_OBJECT(CPK_CMS) -}ASN1_NDEF_SEQUENCE_END(CPK_CMS) -IMPLEMENT_ASN1_FUNCTIONS(CPK_CMS) -IMPLEMENT_ASN1_NDEF_FUNCTION(CPK_CMS) -IMPLEMENT_ASN1_DUP_FUNCTION(CPK_CMS) - - -ASN1_NDEF_SEQUENCE(CPK_SIGNED) = { - ASN1_SIMPLE(CPK_SIGNED, version, LONG), - ASN1_SET_OF(CPK_SIGNED, digest_algors, X509_ALGOR), - ASN1_SIMPLE(CPK_SIGNED, contents, CPK_CMS), - ASN1_IMP_SEQUENCE_OF_OPT(CPK_SIGNED, cert, X509, 0), - ASN1_IMP_SET_OF_OPT(CPK_SIGNED, crl, X509_CRL, 1), - ASN1_SET_OF(CPK_SIGNED, signer_infos, CPK_SIGNER_INFO) -} ASN1_NDEF_SEQUENCE_END(CPK_SIGNED) -IMPLEMENT_ASN1_FUNCTIONS(CPK_SIGNED) - - -ASN1_SEQUENCE(CPK_SIGNER_INFO) = { - ASN1_SIMPLE(CPK_SIGNER_INFO, version, LONG), - ASN1_SIMPLE(CPK_SIGNER_INFO, signer, X509_NAME), - ASN1_SIMPLE(CPK_SIGNER_INFO, digest_algor, X509_ALGOR), - ASN1_IMP_SEQUENCE_OF_OPT(CPK_SIGNER_INFO, signed_attr, X509_ATTRIBUTE, 0), - ASN1_SIMPLE(CPK_SIGNER_INFO, sign_algor, X509_ALGOR), - ASN1_SIMPLE(CPK_SIGNER_INFO, signature, ASN1_OCTET_STRING), - ASN1_IMP_SET_OF_OPT(CPK_SIGNER_INFO, unsigned_attr, X509_ATTRIBUTE, 1) -} ASN1_SEQUENCE_END(CPK_SIGNER_INFO) -IMPLEMENT_ASN1_FUNCTIONS(CPK_SIGNER_INFO) -IMPLEMENT_ASN1_DUP_FUNCTION(CPK_SIGNER_INFO) - - -ASN1_NDEF_SEQUENCE(CPK_ENVELOPE) = { - ASN1_SIMPLE(CPK_ENVELOPE, version, LONG), - ASN1_SET_OF(CPK_ENVELOPE, recip_infos, CPK_RECIP_INFO), - ASN1_SIMPLE(CPK_ENVELOPE, enc_data, CPK_ENC_CONTENT) -} ASN1_NDEF_SEQUENCE_END(CPK_ENVELOPE) -IMPLEMENT_ASN1_FUNCTIONS(CPK_ENVELOPE) - - -ASN1_SEQUENCE(CPK_RECIP_INFO) = { - ASN1_SIMPLE(CPK_RECIP_INFO, version, LONG), - ASN1_SIMPLE(CPK_RECIP_INFO, recipient, X509_NAME), - ASN1_SIMPLE(CPK_RECIP_INFO, enc_algor, X509_ALGOR), - ASN1_SIMPLE(CPK_RECIP_INFO, enc_data, ASN1_OCTET_STRING) -} ASN1_SEQUENCE_END(CPK_RECIP_INFO) -IMPLEMENT_ASN1_FUNCTIONS(CPK_RECIP_INFO) -IMPLEMENT_ASN1_DUP_FUNCTION(CPK_RECIP_INFO) - - -ASN1_NDEF_SEQUENCE(CPK_ENC_CONTENT) = { - ASN1_SIMPLE(CPK_ENC_CONTENT, content_type, ASN1_OBJECT), - ASN1_SIMPLE(CPK_ENC_CONTENT, enc_algor, X509_ALGOR), - ASN1_IMP_OPT(CPK_ENC_CONTENT, enc_data, ASN1_OCTET_STRING, 0) -} ASN1_NDEF_SEQUENCE_END(CPK_ENC_CONTENT) -IMPLEMENT_ASN1_FUNCTIONS(CPK_ENC_CONTENT) - - -ASN1_NDEF_SEQUENCE(CPK_SIGN_ENVELOPE) = { - ASN1_SIMPLE(CPK_SIGN_ENVELOPE, version, LONG), - ASN1_SET_OF(CPK_SIGN_ENVELOPE, recip_infos, CPK_RECIP_INFO), - ASN1_SET_OF(CPK_SIGN_ENVELOPE, digest_algors, X509_ALGOR), - ASN1_SIMPLE(CPK_SIGN_ENVELOPE, enc_data, CPK_ENC_CONTENT), - ASN1_IMP_SET_OF_OPT(CPK_SIGN_ENVELOPE, cert, X509, 0), - ASN1_IMP_SET_OF_OPT(CPK_SIGN_ENVELOPE, crl, X509_CRL, 1), - ASN1_SET_OF(CPK_SIGN_ENVELOPE, signer_infos, CPK_SIGNER_INFO) -} ASN1_NDEF_SEQUENCE_END(CPK_SIGN_ENVELOPE) -IMPLEMENT_ASN1_FUNCTIONS(CPK_SIGN_ENVELOPE) -#endif diff --git a/crypto/cpk/cpk_err.c b/crypto/cpk/cpk_err.c index 5abc0244..6bacffd8 100644 --- a/crypto/cpk/cpk_err.c +++ b/crypto/cpk/cpk_err.c @@ -1,6 +1,6 @@ /* crypto/cpk/cpk_err.c */ /* ==================================================================== - * Copyright (c) 2007 - 2015 The GmSSL Project. All rights reserved. + * Copyright (c) 1999-2016 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 @@ -16,27 +16,27 @@ * * 3. All advertising materials mentioning features or use of this * software must display the following acknowledgment: - * "This product includes software developed by the GmSSL Project. - * (http://gmssl.org/)" + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" * - * 4. The name "GmSSL Project" must not be used to endorse or promote - * products derived from this software without prior written - * permission. For written permission, please contact - * guanzhi1980@gmail.com. + * 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 "GmSSL" - * nor may "GmSSL" appear in their names without prior written - * permission of the GmSSL Project. + * 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 GmSSL Project - * (http://gmssl.org/)" + * "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 GmSSL PROJECT ``AS IS'' AND ANY + * 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 GmSSL PROJECT OR + * 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; @@ -47,68 +47,85 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. * ==================================================================== * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * */ +/* + * NOTE: this file was auto generated by the mkerr.pl script: any changes + * made to it will be overwritten when the script next updates this file, + * only reason strings will be preserved. + */ + +#include #include -#include "cpk.h" +#include /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR -#define ERR_FUNC(func) ERR_PACK(ERR_LIB_CPK,func,0) -#define ERR_REASON(reason) ERR_PACK(ERR_LIB_CPK,0,reason) +# define ERR_FUNC(func) ERR_PACK(ERR_LIB_CPK,func,0) +# define ERR_REASON(reason) ERR_PACK(ERR_LIB_CPK,0,reason) -static ERR_STRING_DATA CPK_str_functs[] = -{ - {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_CREATE), "CPK_MASTER_SECRET_create"}, - {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS), "CPK_MASTER_SECRET_extract_public_params"}, - {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY), "CPK_MASTER_SECRET_extract_private_key"}, - {ERR_FUNC(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY), "CPK_PUBLIC_PARAMS_extract_public_key"}, - {ERR_FUNC(CPK_F_CPK_PUBLIC_PARAMS_COMPUTE_SHARE_KEY), "CPK_PUBLIC_PARAMS_compute_share_key"}, - {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_DIGEST), "CPK_F_CPK_MASTER_SECRET_digest"}, - {ERR_FUNC(CPK_F_CPK_PUBLIC_PARAMS_DIGEST), "CPK_F_CPK_PUBLIC_PARAMS_digest"}, - {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_PRINT), "CPK_F_CPK_MASTER_SECRET_print"}, - {ERR_FUNC(CPK_F_CPK_PUBLIC_PARAMS_PRINT), "CPK_F_CPK_PUBLIC_PARAMS_print"}, - {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_VALIDATE_PUBLIC_PARAMS), "CPK_F_CPK_MASTER_SECRET_validate_public_params"}, - {ERR_FUNC(CPK_F_CPK_PUBLIC_PARAMS_VALIDATE_PRIVATE_KEY), "CPK_F_CPK_PUBLIC_PARAMS_validate_private_key"}, - {ERR_FUNC(CPK_F_CPK_MAP_NEW_DEFAULT), "CPK_F_CPK_MAP_new_default"}, - {ERR_FUNC(CPK_F_CPK_MAP_NUM_FACTORS), "CPK_F_CPK_MAP_num_factors"}, - {ERR_FUNC(CPK_F_CPK_MAP_NUM_INDEXES), "CPK_F_CPK_MAP_num_indexes"}, - {ERR_FUNC(CPK_F_CPK_MAP_STR2INDEX), "CPK_F_CPK_MAP_STR2INDEX"}, - {ERR_FUNC(CPK_F_X509_ALGOR_GET1_EC_KEY), "X509_ALGOR_get1_ec_key"}, - {ERR_FUNC(CPK_F_X509_ALGOR_GET1_DSA), "X509_ALGOR_get1_dsa"}, - {0, NULL} +static ERR_STRING_DATA CPK_str_functs[] = { + {ERR_FUNC(CPK_F_CPK_MAP_NEW_DEFAULT), "CPK_MAP_new_default"}, + {ERR_FUNC(CPK_F_CPK_MAP_NUM_FACTORS), "CPK_MAP_num_factors"}, + {ERR_FUNC(CPK_F_CPK_MAP_NUM_INDEXES), "CPK_MAP_num_indexes"}, + {ERR_FUNC(CPK_F_CPK_MAP_STR2INDEX), "CPK_MAP_str2index"}, + {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_CREATE), "CPK_MASTER_SECRET_create"}, + {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_DIGEST), "CPK_MASTER_SECRET_digest"}, + {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY), + "CPK_MASTER_SECRET_extract_private_key"}, + {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS), + "CPK_MASTER_SECRET_extract_public_params"}, + {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_PRINT), "CPK_MASTER_SECRET_print"}, + {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_VALIDATE_PUBLIC_PARAMS), + "CPK_MASTER_SECRET_validate_public_params"}, + {ERR_FUNC(CPK_F_CPK_PUBLIC_PARAMS_COMPUTE_SHARE_KEY), + "CPK_PUBLIC_PARAMS_compute_share_key"}, + {ERR_FUNC(CPK_F_CPK_PUBLIC_PARAMS_DIGEST), "CPK_PUBLIC_PARAMS_digest"}, + {ERR_FUNC(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY), + "CPK_PUBLIC_PARAMS_extract_public_key"}, + {ERR_FUNC(CPK_F_CPK_PUBLIC_PARAMS_PRINT), "CPK_PUBLIC_PARAMS_print"}, + {ERR_FUNC(CPK_F_CPK_PUBLIC_PARAMS_VALIDATE_PRIVATE_KEY), + "CPK_PUBLIC_PARAMS_validate_private_key"}, + {ERR_FUNC(CPK_F_X509_ALGOR_GET1_DSA), "X509_ALGOR_GET1_DSA"}, + {ERR_FUNC(CPK_F_X509_ALGOR_GET1_EC_KEY), "X509_ALGOR_GET1_EC_KEY"}, + {0, NULL} }; -static ERR_STRING_DATA CPK_str_reasons[] = -{ - {ERR_REASON(CPK_R_BAD_ARGUMENT), "bad argument"}, - {ERR_REASON(CPK_R_UNKNOWN_DIGEST_TYPE), "unknown digest algorithm"}, - {ERR_REASON(CPK_R_UNKNOWN_CIPHER_TYPE), "unknown cipher algorithm"}, - {ERR_REASON(CPK_R_UNKNOWN_MAP_TYPE), "unknown cpk map algorithm"}, - {ERR_REASON(CPK_R_UNKNOWN_CURVE), "unknown elliptic curve"}, - {ERR_REASON(CPK_R_STACK_ERROR), "stack error"}, - {ERR_REASON(CPK_R_DERIVE_KEY_FAILED), "derive key failed"}, - {ERR_REASON(CPK_R_ECIES_ENCRYPT_FAILED), "ecies encryption failed"}, - {ERR_REASON(CPK_R_ECIES_DECRYPT_FAILED), "ecies decryption failed"}, - {ERR_REASON(CPK_R_DER_DECODE_FAILED), "DER decode failed"}, - {ERR_REASON(CPK_R_UNSUPPORTED_PKCS7_CONTENT_TYPE),"CPK_R_UNSUPPORTED_PKCS7_CONTENT_TYPE"}, - {ERR_REASON(CPK_R_SET_SIGNER), "CPK_R_SET_SIGNER"}, - {ERR_REASON(CPK_R_SET_RECIP_INFO), "CPK_R_SET_RECIP_INFO"}, - {ERR_REASON(CPK_R_UNABLE_TO_FIND_MESSAGE_DIGEST),"CPK_R_UNABLE_TO_FIND_MESSAGE_DIGEST"}, - {ERR_REASON(CPK_R_BAD_DATA), "bad data"}, - {ERR_REASON(CPK_R_MAP_FAILED), "CPK_R_MAP_FAILED"}, - {ERR_REASON(CPK_R_ADD_SIGNING_TIME), "CPK_R_ADD_SIGNING_TIME"}, - {ERR_REASON(CPK_R_VERIFY_FAILED), "CPK_R_VERIFY_FAILED"}, - {ERR_REASON(CPK_R_UNKNOWN_ECDH_TYPE), "CPK_R_UNKNOWN_ECDH_TYPE"}, - {ERR_REASON(CPK_R_DIGEST_FAILED), "CPK_R_DIGEST_FAILED"}, - {ERR_REASON(CPK_R_WITHOUT_DECRYPT_KEY), "CPK_R_WITHOUT_DECRYPT_KEY"}, - {ERR_REASON(CPK_R_UNKNOWN_PKCS7_TYPE), "CPK_R_UNKNOWN_PKCS7_TYPE"}, - {ERR_REASON(CPK_R_INVALID_ID_LENGTH), "invalid identity length"}, - {ERR_REASON(CPK_R_INVALID_PKEY_TYPE), "invalid public key type"}, - {ERR_REASON(CPK_R_INVALID_MAP_ALGOR), "invalid map algorithm"}, - {ERR_REASON(CPK_R_PKEY_TYPE_NOT_MATCH), "public key type not match"}, - {0, NULL} +static ERR_STRING_DATA CPK_str_reasons[] = { + {ERR_REASON(CPK_R_ADD_SIGNING_TIME), "add signing time"}, + {ERR_REASON(CPK_R_BAD_ARGUMENT), "bad argument"}, + {ERR_REASON(CPK_R_BAD_DATA), "bad data"}, + {ERR_REASON(CPK_R_DERIVE_KEY_FAILED), "derive key failed"}, + {ERR_REASON(CPK_R_DER_DECODE_FAILED), "der decode failed"}, + {ERR_REASON(CPK_R_DIGEST_FAILED), "digest failed"}, + {ERR_REASON(CPK_R_ECIES_DECRYPT_FAILED), "ecies decrypt failed"}, + {ERR_REASON(CPK_R_ECIES_ENCRYPT_FAILED), "ecies encrypt failed"}, + {ERR_REASON(CPK_R_INVALID_ID_LENGTH), "invalid id length"}, + {ERR_REASON(CPK_R_INVALID_MAP_ALGOR), "invalid map algor"}, + {ERR_REASON(CPK_R_INVALID_PKEY_TYPE), "invalid pkey type"}, + {ERR_REASON(CPK_R_MAP_FAILED), "map failed"}, + {ERR_REASON(CPK_R_PKEY_TYPE_NOT_MATCH), "pkey type not match"}, + {ERR_REASON(CPK_R_SET_RECIP_INFO), "set recip info"}, + {ERR_REASON(CPK_R_SET_SIGNER), "set signer"}, + {ERR_REASON(CPK_R_STACK_ERROR), "stack error"}, + {ERR_REASON(CPK_R_UNABLE_TO_FIND_MESSAGE_DIGEST), + "unable to find message digest"}, + {ERR_REASON(CPK_R_UNKNOWN_CIPHER_TYPE), "unknown cipher type"}, + {ERR_REASON(CPK_R_UNKNOWN_CURVE), "unknown curve"}, + {ERR_REASON(CPK_R_UNKNOWN_DIGEST_TYPE), "unknown digest type"}, + {ERR_REASON(CPK_R_UNKNOWN_ECDH_TYPE), "unknown ecdh type"}, + {ERR_REASON(CPK_R_UNKNOWN_MAP_TYPE), "unknown map type"}, + {ERR_REASON(CPK_R_UNKNOWN_PKCS7_TYPE), "unknown pkcs7 type"}, + {ERR_REASON(CPK_R_UNSUPPORTED_PKCS7_CONTENT_TYPE), + "unsupported pkcs7 content type"}, + {ERR_REASON(CPK_R_VERIFY_FAILED), "verify failed"}, + {ERR_REASON(CPK_R_WITHOUT_DECRYPT_KEY), "without decrypt key"}, + {0, NULL} }; #endif @@ -117,10 +134,9 @@ void ERR_load_CPK_strings(void) { #ifndef OPENSSL_NO_ERR - if (ERR_func_error_string(CPK_str_functs[0].error) == NULL) { - ERR_load_strings(0, CPK_str_functs); - ERR_load_strings(0, CPK_str_reasons); - } - + if (ERR_func_error_string(CPK_str_functs[0].error) == NULL) { + ERR_load_strings(0, CPK_str_functs); + ERR_load_strings(0, CPK_str_reasons); + } #endif } diff --git a/crypto/cpk/cpk_err2.c b/crypto/cpk/cpk_err2.c new file mode 100644 index 00000000..5abc0244 --- /dev/null +++ b/crypto/cpk/cpk_err2.c @@ -0,0 +1,126 @@ +/* crypto/cpk/cpk_err.c */ +/* ==================================================================== + * Copyright (c) 2007 - 2015 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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 +#include "cpk.h" + +/* BEGIN ERROR CODES */ +#ifndef OPENSSL_NO_ERR + +#define ERR_FUNC(func) ERR_PACK(ERR_LIB_CPK,func,0) +#define ERR_REASON(reason) ERR_PACK(ERR_LIB_CPK,0,reason) + +static ERR_STRING_DATA CPK_str_functs[] = +{ + {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_CREATE), "CPK_MASTER_SECRET_create"}, + {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS), "CPK_MASTER_SECRET_extract_public_params"}, + {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY), "CPK_MASTER_SECRET_extract_private_key"}, + {ERR_FUNC(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY), "CPK_PUBLIC_PARAMS_extract_public_key"}, + {ERR_FUNC(CPK_F_CPK_PUBLIC_PARAMS_COMPUTE_SHARE_KEY), "CPK_PUBLIC_PARAMS_compute_share_key"}, + {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_DIGEST), "CPK_F_CPK_MASTER_SECRET_digest"}, + {ERR_FUNC(CPK_F_CPK_PUBLIC_PARAMS_DIGEST), "CPK_F_CPK_PUBLIC_PARAMS_digest"}, + {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_PRINT), "CPK_F_CPK_MASTER_SECRET_print"}, + {ERR_FUNC(CPK_F_CPK_PUBLIC_PARAMS_PRINT), "CPK_F_CPK_PUBLIC_PARAMS_print"}, + {ERR_FUNC(CPK_F_CPK_MASTER_SECRET_VALIDATE_PUBLIC_PARAMS), "CPK_F_CPK_MASTER_SECRET_validate_public_params"}, + {ERR_FUNC(CPK_F_CPK_PUBLIC_PARAMS_VALIDATE_PRIVATE_KEY), "CPK_F_CPK_PUBLIC_PARAMS_validate_private_key"}, + {ERR_FUNC(CPK_F_CPK_MAP_NEW_DEFAULT), "CPK_F_CPK_MAP_new_default"}, + {ERR_FUNC(CPK_F_CPK_MAP_NUM_FACTORS), "CPK_F_CPK_MAP_num_factors"}, + {ERR_FUNC(CPK_F_CPK_MAP_NUM_INDEXES), "CPK_F_CPK_MAP_num_indexes"}, + {ERR_FUNC(CPK_F_CPK_MAP_STR2INDEX), "CPK_F_CPK_MAP_STR2INDEX"}, + {ERR_FUNC(CPK_F_X509_ALGOR_GET1_EC_KEY), "X509_ALGOR_get1_ec_key"}, + {ERR_FUNC(CPK_F_X509_ALGOR_GET1_DSA), "X509_ALGOR_get1_dsa"}, + {0, NULL} +}; + +static ERR_STRING_DATA CPK_str_reasons[] = +{ + {ERR_REASON(CPK_R_BAD_ARGUMENT), "bad argument"}, + {ERR_REASON(CPK_R_UNKNOWN_DIGEST_TYPE), "unknown digest algorithm"}, + {ERR_REASON(CPK_R_UNKNOWN_CIPHER_TYPE), "unknown cipher algorithm"}, + {ERR_REASON(CPK_R_UNKNOWN_MAP_TYPE), "unknown cpk map algorithm"}, + {ERR_REASON(CPK_R_UNKNOWN_CURVE), "unknown elliptic curve"}, + {ERR_REASON(CPK_R_STACK_ERROR), "stack error"}, + {ERR_REASON(CPK_R_DERIVE_KEY_FAILED), "derive key failed"}, + {ERR_REASON(CPK_R_ECIES_ENCRYPT_FAILED), "ecies encryption failed"}, + {ERR_REASON(CPK_R_ECIES_DECRYPT_FAILED), "ecies decryption failed"}, + {ERR_REASON(CPK_R_DER_DECODE_FAILED), "DER decode failed"}, + {ERR_REASON(CPK_R_UNSUPPORTED_PKCS7_CONTENT_TYPE),"CPK_R_UNSUPPORTED_PKCS7_CONTENT_TYPE"}, + {ERR_REASON(CPK_R_SET_SIGNER), "CPK_R_SET_SIGNER"}, + {ERR_REASON(CPK_R_SET_RECIP_INFO), "CPK_R_SET_RECIP_INFO"}, + {ERR_REASON(CPK_R_UNABLE_TO_FIND_MESSAGE_DIGEST),"CPK_R_UNABLE_TO_FIND_MESSAGE_DIGEST"}, + {ERR_REASON(CPK_R_BAD_DATA), "bad data"}, + {ERR_REASON(CPK_R_MAP_FAILED), "CPK_R_MAP_FAILED"}, + {ERR_REASON(CPK_R_ADD_SIGNING_TIME), "CPK_R_ADD_SIGNING_TIME"}, + {ERR_REASON(CPK_R_VERIFY_FAILED), "CPK_R_VERIFY_FAILED"}, + {ERR_REASON(CPK_R_UNKNOWN_ECDH_TYPE), "CPK_R_UNKNOWN_ECDH_TYPE"}, + {ERR_REASON(CPK_R_DIGEST_FAILED), "CPK_R_DIGEST_FAILED"}, + {ERR_REASON(CPK_R_WITHOUT_DECRYPT_KEY), "CPK_R_WITHOUT_DECRYPT_KEY"}, + {ERR_REASON(CPK_R_UNKNOWN_PKCS7_TYPE), "CPK_R_UNKNOWN_PKCS7_TYPE"}, + {ERR_REASON(CPK_R_INVALID_ID_LENGTH), "invalid identity length"}, + {ERR_REASON(CPK_R_INVALID_PKEY_TYPE), "invalid public key type"}, + {ERR_REASON(CPK_R_INVALID_MAP_ALGOR), "invalid map algorithm"}, + {ERR_REASON(CPK_R_PKEY_TYPE_NOT_MATCH), "public key type not match"}, + {0, NULL} +}; + +#endif + +void ERR_load_CPK_strings(void) +{ +#ifndef OPENSSL_NO_ERR + + if (ERR_func_error_string(CPK_str_functs[0].error) == NULL) { + ERR_load_strings(0, CPK_str_functs); + ERR_load_strings(0, CPK_str_reasons); + } + +#endif +} diff --git a/crypto/cpk/cpk_lib.c b/crypto/cpk/cpk_lib.c index 548d9788..4da54860 100644 --- a/crypto/cpk/cpk_lib.c +++ b/crypto/cpk/cpk_lib.c @@ -250,7 +250,7 @@ CPK_PUBLIC_PARAMS *CPK_MASTER_SECRET_extract_public_params(CPK_MASTER_SECRET *ma break; default: - CPKerr(CPK_F_CPK_MASTER_SECRET_CREATE, CPK_R_INVALID_PKEY_TYPE); + CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, CPK_R_INVALID_PKEY_TYPE); goto err; } return param; @@ -562,34 +562,24 @@ static int extract_dsa_params(CPK_MASTER_SECRET *master, CPK_PUBLIC_PARAMS *para unsigned char *pub_ptr; if (!pri || !pub || !ctx) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - ERR_R_MALLOC_FAILURE); goto err; } if (!(dsa = (DSA *)X509_ALGOR_get1_DSA(master->pkey_algor))) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - CPK_R_BAD_DATA); goto err; } pri_size = BN_num_bytes(dsa->q); pub_size = BN_num_bytes(dsa->p); if ((num_factors = CPK_MAP_num_factors(master->map_algor)) <= 0) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - CPK_R_INVALID_MAP_ALGOR); goto err; } if (M_ASN1_STRING_length(master->secret_factors) != pri_size * num_factors) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - CPK_R_BAD_DATA); goto err; } ASN1_STRING_free(param->public_factors); if (!ASN1_STRING_set(param->public_factors, NULL, pub_size * num_factors)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - ERR_R_MALLOC_FAILURE); goto err; } @@ -600,24 +590,16 @@ static int extract_dsa_params(CPK_MASTER_SECRET *master, CPK_PUBLIC_PARAMS *para for (i = 0; i < num_factors; i++) { if (!BN_bin2bn(pri_ptr, pri_size, pri)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - ERR_R_BN_LIB); goto err; } if (BN_is_zero(pri) || BN_cmp(pri, dsa->q) >= 0) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - CPK_R_BAD_DATA); goto err; } if (!BN_mod_exp(pub, dsa->g, pri, dsa->p, ctx)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - ERR_R_BN_LIB); goto err; } if (!BN_bn2bin(pub, pub_ptr + pub_size - BN_num_bytes(pub))) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - ERR_R_BN_LIB); goto err; } @@ -646,35 +628,23 @@ static DSA *extract_dsa_priv_key(CPK_MASTER_SECRET *master, const char *id) if (!bn || !ctx) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - ERR_R_MALLOC_FAILURE); goto err; } if (!(dsa = X509_ALGOR_get1_DSA(master->pkey_algor))) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - CPK_R_BAD_DATA); goto err; } if ((num_indexes = CPK_MAP_num_indexes(master->map_algor)) <= 0) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - CPK_R_INVALID_MAP_ALGOR); goto err; } if (!(index = OPENSSL_malloc(sizeof(int) * num_indexes))) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - CPK_R_INVALID_MAP_ALGOR); goto err; } if (!CPK_MAP_str2index(master->map_algor, id, index)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - CPK_R_INVALID_MAP_ALGOR); goto err; } if (!dsa->priv_key) { if (!(dsa->priv_key = BN_new())) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - ERR_R_MALLOC_FAILURE); goto err; } } @@ -684,30 +654,21 @@ static DSA *extract_dsa_priv_key(CPK_MASTER_SECRET *master, const char *id) for (i = 0; i < num_indexes; i++) { p = M_ASN1_STRING_data(master->secret_factors) + bn_size * index[i]; if (!BN_bin2bn(p, bn_size, bn)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - ERR_R_BN_LIB); goto err; } if (BN_is_zero(bn) || BN_cmp(bn, dsa->q) >= 0) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - CPK_R_BAD_DATA); goto err; } if (!BN_mod_add(dsa->priv_key, dsa->priv_key, bn, dsa->q, ctx)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - ERR_R_X509_LIB); goto err; } } if (!(dsa->pub_key)) if (!(dsa->pub_key = BN_new())) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - ERR_R_MALLOC_FAILURE); goto err; } if (!BN_mod_exp(dsa->pub_key, dsa->g, dsa->priv_key, dsa->p, ctx)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, ERR_R_BN_LIB); goto err; } e = 0; @@ -735,35 +696,23 @@ static DSA *extract_dsa_pub_key(CPK_PUBLIC_PARAMS *param, const char *id) if (!bn || !ctx) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - ERR_R_MALLOC_FAILURE); goto err; } if (!(dsa = X509_ALGOR_get1_DSA(param->pkey_algor))) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - CPK_R_BAD_DATA); goto err; } if ((num_indexes = CPK_MAP_num_indexes(param->map_algor)) <= 0) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - CPK_R_INVALID_MAP_ALGOR); goto err; } if (!(index = OPENSSL_malloc(sizeof(int) * num_indexes))) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - CPK_R_INVALID_MAP_ALGOR); goto err; } if (!CPK_MAP_str2index(param->map_algor, id, index)) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - CPK_R_INVALID_MAP_ALGOR); goto err; } if (!dsa->pub_key) { if (!(dsa->pub_key = BN_new())) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - ERR_R_MALLOC_FAILURE); goto err; } } @@ -773,18 +722,12 @@ static DSA *extract_dsa_pub_key(CPK_PUBLIC_PARAMS *param, const char *id) for (i = 0; i < num_indexes; i++) { p = M_ASN1_STRING_data(param->public_factors) + bn_size * index[i]; if (!BN_bin2bn(p, bn_size, bn)) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - ERR_R_BN_LIB); goto err; } if (BN_is_zero(bn) || BN_cmp(bn, dsa->p) >= 0) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - CPK_R_BAD_DATA); goto err; } if (!BN_mod_add(dsa->pub_key, dsa->pub_key, bn, dsa->p, ctx)) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - ERR_R_X509_LIB); goto err; } } @@ -860,35 +803,26 @@ static int extract_ec_params(CPK_MASTER_SECRET *master, CPK_PUBLIC_PARAMS *param unsigned char *pt_ptr; if (!bn || !order || !ctx) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - ERR_R_MALLOC_FAILURE); goto err; } if (!(ec_key = X509_ALGOR_get1_EC_KEY(master->pkey_algor))) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, CPK_R_BAD_DATA); goto err; } ec_group = EC_KEY_get0_group(ec_key); if (!(EC_GROUP_get_order(ec_group, order, ctx))) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, ERR_R_EC_LIB); goto err; } bn_size = BN_num_bytes(order); pt_size = bn_size + 1; if ((num_factors = CPK_MAP_num_factors(master->map_algor)) <= 0) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - CPK_R_INVALID_MAP_ALGOR); goto err; } if (M_ASN1_STRING_length(master->secret_factors) != bn_size * num_factors) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, CPK_R_BAD_DATA); goto err; } if (!ASN1_STRING_set(param->public_factors, NULL, pt_size * num_factors)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - ERR_R_MALLOC_FAILURE); goto err; } @@ -897,30 +831,21 @@ static int extract_ec_params(CPK_MASTER_SECRET *master, CPK_PUBLIC_PARAMS *param memset(pt_ptr, 0, M_ASN1_STRING_length(param->public_factors)); if (!(pt = EC_POINT_new(ec_group))) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, ERR_R_X509_LIB); goto err; } for (i = 0; i < num_factors; i++) { if (!BN_bin2bn(bn_ptr, bn_size, bn)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - ERR_R_BN_LIB); goto err; } if (BN_is_zero(bn) || BN_cmp(bn, order) >= 0) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - CPK_R_BAD_DATA); goto err; } if (!EC_POINT_mul(ec_group, pt, bn, NULL, NULL, ctx)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - ERR_R_EC_LIB); goto err; } if (!EC_POINT_point2oct(ec_group, pt, POINT_CONVERSION_COMPRESSED, pt_ptr, pt_size, ctx)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PUBLIC_PARAMS, - ERR_R_EC_LIB); goto err; } bn_ptr += bn_size; @@ -954,41 +879,29 @@ static EC_KEY *extract_ec_priv_key(CPK_MASTER_SECRET *master, const char *id) if (!priv_key || !bn || !order || !ctx) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - ERR_R_MALLOC_FAILURE); goto err; } if (!(ec_key = X509_ALGOR_get1_EC_KEY(master->pkey_algor))) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, ERR_R_CPK_LIB); goto err; } ec_group = EC_KEY_get0_group(ec_key); if (!(pub_key = EC_POINT_new(ec_group))) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - ERR_R_MALLOC_FAILURE); goto err; } if ((num_indexes = CPK_MAP_num_indexes(master->map_algor)) <= 0) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - CPK_R_INVALID_MAP_ALGOR); goto err; } if (!(index = OPENSSL_malloc(sizeof(int) * num_indexes))) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - CPK_R_INVALID_MAP_ALGOR); goto err; } if (!CPK_MAP_str2index(master->map_algor, id, index)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - CPK_R_INVALID_MAP_ALGOR); goto err; } BN_zero(priv_key); if (!(EC_GROUP_get_order(EC_KEY_get0_group(ec_key), order, ctx))) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, ERR_R_EC_LIB); goto err; } bn_size = BN_num_bytes(order); @@ -999,33 +912,23 @@ static EC_KEY *extract_ec_priv_key(CPK_MASTER_SECRET *master, const char *id) bn_size * index[i]; if (!BN_bin2bn(p, bn_size, bn)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, ERR_R_BN_LIB); goto err; } if (BN_is_zero(bn) || BN_cmp(bn, order) >= 0) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - CPK_R_BAD_DATA); goto err; } if (!BN_mod_add(priv_key, priv_key, bn, order, ctx)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, ERR_R_BN_LIB); goto err; } } if (!EC_KEY_set_private_key(ec_key, priv_key)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - ERR_R_EC_LIB); goto err; } if (!EC_POINT_mul(ec_group, pub_key, priv_key, NULL, NULL, ctx)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - ERR_R_EC_LIB); goto err; } if (!EC_KEY_set_public_key(ec_key, pub_key)) { - CPKerr(CPK_F_CPK_MASTER_SECRET_EXTRACT_PRIVATE_KEY, - ERR_R_EC_LIB); goto err; } e = 0; @@ -1058,55 +961,39 @@ static EC_KEY *extract_ec_pub_key(CPK_PUBLIC_PARAMS *param, const char *id) int i, bn_size, pt_size, num_indexes, num_factors; if (!(ec_key = X509_ALGOR_get1_EC_KEY(param->pkey_algor))) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - ERR_R_CPK_LIB); goto err; } ec_group = EC_KEY_get0_group(ec_key); if (!(pub_key = EC_POINT_new(ec_group))) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, ERR_R_EC_LIB); goto err; } if (!(pt = EC_POINT_new(ec_group))) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, ERR_R_EC_LIB); goto err; } if (!EC_GROUP_get_order(ec_group, order, ctx)) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, ERR_R_EC_LIB); goto err; } bn_size = BN_num_bytes(order); pt_size = bn_size + 1; if ((num_factors = CPK_MAP_num_factors(param->map_algor)) <= 0) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - ERR_R_CPK_LIB); goto err; } if (M_ASN1_STRING_length(param->public_factors) != pt_size * num_factors) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - CPK_R_BAD_DATA); goto err; } if ((num_indexes = CPK_MAP_num_indexes(param->map_algor)) <= 0) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - CPK_R_INVALID_MAP_ALGOR); goto err; } if (!(index = OPENSSL_malloc(sizeof(int) * num_indexes))) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - CPK_R_INVALID_MAP_ALGOR); goto err; } if (!CPK_MAP_str2index(param->map_algor, id, index)) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - CPK_R_INVALID_MAP_ALGOR); goto err; } if (!EC_POINT_set_to_infinity(ec_group, pub_key)) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, ERR_R_EC_LIB); goto err; } for (i = 0; i < num_indexes; i++) { @@ -1115,20 +1002,14 @@ static EC_KEY *extract_ec_pub_key(CPK_PUBLIC_PARAMS *param, const char *id) pt_size * index[i]; if (!EC_POINT_oct2point(ec_group, pt, p, pt_size, ctx)) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - CPK_R_BAD_DATA); goto err; } if (!EC_POINT_add(ec_group, pub_key, pub_key, pt, ctx)) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - ERR_R_EC_LIB); goto err; } } if (!EC_KEY_set_public_key(ec_key, pub_key)) { - CPKerr(CPK_F_CPK_PUBLIC_PARAMS_EXTRACT_PUBLIC_KEY, - ERR_R_EC_LIB); goto err; } e = 0; diff --git a/crypto/dh/Makefile b/crypto/dh/Makefile index 46fa5ac5..6cdc99f4 100644 --- a/crypto/dh/Makefile +++ b/crypto/dh/Makefile @@ -85,11 +85,13 @@ dh_ameth.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h dh_ameth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h dh_ameth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h dh_ameth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -dh_ameth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -dh_ameth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +dh_ameth.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +dh_ameth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +dh_ameth.o: ../../include/openssl/opensslconf.h dh_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h dh_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -dh_ameth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +dh_ameth.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +dh_ameth.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h dh_ameth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h dh_ameth.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h dh_ameth.o: dh_ameth.c @@ -139,11 +141,13 @@ dh_kdf.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h dh_kdf.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h dh_kdf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h dh_kdf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -dh_kdf.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +dh_kdf.o: ../../include/openssl/err.h ../../include/openssl/evp.h +dh_kdf.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h dh_kdf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h dh_kdf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h dh_kdf.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h dh_kdf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +dh_kdf.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h dh_kdf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h dh_kdf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h dh_kdf.o: dh_kdf.c @@ -161,14 +165,15 @@ dh_lib.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h dh_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h dh_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h dh_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h -dh_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -dh_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -dh_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dh_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -dh_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -dh_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dh_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -dh_lib.o: ../cryptlib.h dh_lib.c +dh_lib.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +dh_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +dh_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +dh_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +dh_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +dh_lib.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +dh_lib.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +dh_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +dh_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h dh_lib.c dh_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h dh_pmeth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h dh_pmeth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h @@ -176,12 +181,13 @@ dh_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h dh_pmeth.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h dh_pmeth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h dh_pmeth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -dh_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -dh_pmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -dh_pmeth.o: ../../include/openssl/opensslconf.h +dh_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +dh_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +dh_pmeth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h dh_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h dh_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -dh_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +dh_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +dh_pmeth.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h dh_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h dh_pmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ../evp/evp_locl.h dh_pmeth.o: dh_pmeth.c diff --git a/crypto/dsa/Makefile b/crypto/dsa/Makefile index 81092013..ff538d52 100644 --- a/crypto/dsa/Makefile +++ b/crypto/dsa/Makefile @@ -85,12 +85,13 @@ dsa_ameth.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h dsa_ameth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h dsa_ameth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h dsa_ameth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -dsa_ameth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -dsa_ameth.o: ../../include/openssl/objects.h +dsa_ameth.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +dsa_ameth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h dsa_ameth.o: ../../include/openssl/opensslconf.h dsa_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h dsa_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -dsa_ameth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +dsa_ameth.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +dsa_ameth.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h dsa_ameth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h dsa_ameth.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h dsa_ameth.o: dsa_ameth.c @@ -148,14 +149,15 @@ dsa_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h dsa_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h dsa_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h dsa_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h -dsa_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -dsa_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -dsa_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dsa_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -dsa_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -dsa_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dsa_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -dsa_lib.o: ../cryptlib.h dsa_lib.c +dsa_lib.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +dsa_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +dsa_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +dsa_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +dsa_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +dsa_lib.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +dsa_lib.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +dsa_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +dsa_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h dsa_lib.c dsa_ossl.o: ../../e_os.h ../../include/openssl/asn1.h dsa_ossl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h dsa_ossl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h @@ -173,12 +175,13 @@ dsa_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h dsa_pmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h dsa_pmeth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h dsa_pmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -dsa_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -dsa_pmeth.o: ../../include/openssl/objects.h +dsa_pmeth.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +dsa_pmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h dsa_pmeth.o: ../../include/openssl/opensslconf.h dsa_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h dsa_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -dsa_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +dsa_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +dsa_pmeth.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h dsa_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h dsa_pmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ../evp/evp_locl.h dsa_pmeth.o: dsa_locl.h dsa_pmeth.c diff --git a/crypto/ec/Makefile b/crypto/ec/Makefile index 6749a875..6227bda8 100644 --- a/crypto/ec/Makefile +++ b/crypto/ec/Makefile @@ -124,11 +124,13 @@ ec_ameth.o: ../../include/openssl/cms.h ../../include/openssl/crypto.h ec_ameth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ec_ameth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h ec_ameth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ec_ameth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ec_ameth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +ec_ameth.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +ec_ameth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +ec_ameth.o: ../../include/openssl/opensslconf.h ec_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ec_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ec_ameth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +ec_ameth.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ec_ameth.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h ec_ameth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h ec_ameth.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h ec_ameth.o: ec_ameth.c @@ -136,11 +138,12 @@ ec_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h ec_asn1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h ec_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h ec_asn1.o: ../../include/openssl/ec.h ../../include/openssl/err.h -ec_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ec_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -ec_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ec_asn1.o: ../../include/openssl/symhacks.h ec_asn1.c ec_lcl.h +ec_asn1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +ec_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +ec_asn1.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +ec_asn1.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h +ec_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +ec_asn1.o: ec_asn1.c ec_lcl.h ec_check.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h ec_check.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h ec_check.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h @@ -209,13 +212,15 @@ ec_pmeth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h ec_pmeth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h ec_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h ec_pmeth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -ec_pmeth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ec_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +ec_pmeth.o: ../../include/openssl/ecdsa.h ../../include/openssl/ecies.h +ec_pmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h +ec_pmeth.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h ec_pmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h ec_pmeth.o: ../../include/openssl/opensslconf.h ec_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ec_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ec_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +ec_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ec_pmeth.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h ec_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h ec_pmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ../evp/evp_locl.h ec_pmeth.o: ec_lcl.h ec_pmeth.c diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h index a7333a89..4f7904e4 100644 --- a/crypto/ec/ec.h +++ b/crypto/ec/ec.h @@ -1264,32 +1264,31 @@ void ERR_load_EC_strings(void); # define EC_F_OLD_EC_PRIV_DECODE 222 # define EC_F_PKEY_EC_CTRL 197 # define EC_F_PKEY_EC_CTRL_STR 198 +# define EC_F_PKEY_EC_DECRYPT 301 # define EC_F_PKEY_EC_DERIVE 217 +# define EC_F_PKEY_EC_ENCRYPT 300 # define EC_F_PKEY_EC_KEYGEN 199 # define EC_F_PKEY_EC_PARAMGEN 219 # define EC_F_PKEY_EC_SIGN 218 - -# ifndef OPENSSL_NO_GMSSL -# define EC_F_PKEY_EC_ENCRYPT 300 -# define EC_F_PKEY_EC_DECRYPT 301 -# define EC_F_PKEY_SM2_INIT 302 -# define EC_F_PKEY_SM2_COPY 303 -# define EC_F_PKEY_SM2_CLEANUP 304 -# define EC_F_PKEY_SM2_PARAMGEN 305 -# define EC_F_PKEY_SM2_KEYGEN 306 -# define EC_F_PKEY_SM2_SIGN 307 -# define EC_F_PKEY_SM2_VERIFY 308 -# define EC_F_PKEY_SM2_SIGNCTX_INIT 309 -# define EC_F_PKEY_SM2_SIGNCTX 310 -# define EC_F_PKEY_SM2_VERIFYCTX_INIT 311 -# define EC_F_PKEY_SM2_VERIFYCTX 312 -# define EC_F_PKEY_SM2_ENCRYPT 313 -# define EC_F_PKEY_SM2_DECRYPT 314 -# define EC_F_PKEY_SM2_DERIVE_INIT 315 -# define EC_F_PKEY_SM2_DERIVE 316 -# define EC_F_PKEY_SM2_CTRL 317 -# define EC_F_PKEY_SM2_CTRL_STR 318 -# endif +# define EC_F_PKEY_EC_SIGNCTX 246 +# define EC_F_PKEY_EC_SIGNCTX_INIT 247 +# define EC_F_PKEY_SM2_CLEANUP 304 +# define EC_F_PKEY_SM2_COPY 303 +# define EC_F_PKEY_SM2_CTRL 317 +# define EC_F_PKEY_SM2_CTRL_STR 318 +# define EC_F_PKEY_SM2_DECRYPT 314 +# define EC_F_PKEY_SM2_DERIVE 316 +# define EC_F_PKEY_SM2_DERIVE_INIT 315 +# define EC_F_PKEY_SM2_ENCRYPT 313 +# define EC_F_PKEY_SM2_INIT 302 +# define EC_F_PKEY_SM2_KEYGEN 306 +# define EC_F_PKEY_SM2_PARAMGEN 305 +# define EC_F_PKEY_SM2_SIGN 307 +# define EC_F_PKEY_SM2_SIGNCTX 310 +# define EC_F_PKEY_SM2_SIGNCTX_INIT 309 +# define EC_F_PKEY_SM2_VERIFY 308 +# define EC_F_PKEY_SM2_VERIFYCTX 312 +# define EC_F_PKEY_SM2_VERIFYCTX_INIT 311 /* Reason codes. */ # define EC_R_ASN1_ERROR 115 diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c index 09c5187a..620318b3 100644 --- a/crypto/ec/ec_curve.c +++ b/crypto/ec/ec_curve.c @@ -2835,7 +2835,7 @@ static const struct { } }; -#ifndef OPENSSL_NO_SM2 +#ifndef OPENSSL_NO_GMSSL static const struct { EC_CURVE_DATA h; unsigned char data[0 + 32 * 6]; @@ -2865,12 +2865,42 @@ static const struct { 0xBC, 0x37, 0x36, 0xA2, 0xF4, 0xF6, 0x77, 0x9C, 0x59, 0xBD, 0xCE, 0xE3, 0x6B, 0x69, 0x21, 0x53, 0xD0, 0xA9, 0x87, 0x7C, 0xC6, 0x2A, 0x47, 0x40, 0x02, 0xDF, 0x32, 0xE5, 0x21, 0x39, 0xF0, 0xA0, - /* order */ + /* order */ 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x72, 0x03, 0xDF, 0x6B, 0x21, 0xC6, 0x05, 0x2B, 0x53, 0xBB, 0xF4, 0x09, 0x39, 0xD5, 0x41, 0x23 } }; + +static const struct { + EC_CURVE_DATA h; + unsigned char data[0 + 24 * 6]; +} _EC_WAPI_PRIME_192V1 = { + { + NID_X9_62_prime_field, 0, 24, 1 + }, + { + /* no seed */ + /* p */ + 0xBD, 0xB6, 0xF4, 0xFE, 0x3E, 0x8B, 0x1D, 0x9E, 0x0D, 0xA8, 0xC0, 0xD4, + 0x6F, 0x4C, 0x31, 0x8C, 0xEF, 0xE4, 0xAF, 0xE3, 0xB6, 0xB8, 0x55, 0x1F, + /* a */ + 0xBB, 0x8E, 0x5E, 0x8F, 0xBC, 0x11, 0x5E, 0x13, 0x9F, 0xE6, 0xA8, 0x14, + 0xFE, 0x48, 0xAA, 0xA6, 0xF0, 0xAD, 0xA1, 0xAA, 0x5D, 0xF9, 0x19, 0x85, + /* b */ + 0x18, 0x54, 0xBE, 0xBD, 0xC3, 0x1B, 0x21, 0xB7, 0xAE, 0xFC, 0x80, 0xAB, + 0x0E, 0xCD, 0x10, 0xD5, 0xB1, 0xB3, 0x30, 0x8E, 0x6D, 0xBF, 0x11, 0xC1, + /* x */ + 0x4A, 0xD5, 0xF7, 0x04, 0x8D, 0xE7, 0x09, 0xAD, 0x51, 0x23, 0x6D, 0xE6, + 0x5E, 0x4D, 0x4B, 0x48, 0x2C, 0x83, 0x6D, 0xC6, 0xE4, 0x10, 0x66, 0x40, + /* y */ + 0x02, 0xBB, 0x3A, 0x02, 0xD4, 0xAA, 0xAD, 0xAC, 0xAE, 0x24, 0x81, 0x7A, + 0x4C, 0xA3, 0xA1, 0xB0, 0x14, 0xB5, 0x27, 0x04, 0x32, 0xDB, 0x27, 0xD2, + /* order */ + 0xBD, 0xB6, 0xF4, 0xFE, 0x3E, 0x8B, 0x1D, 0x9E, 0x0D, 0xA8, 0xC0, 0xD4, + 0x0F, 0xC9, 0x62, 0x19, 0x5D, 0xFA, 0xE7, 0x6F, 0x56, 0x56, 0x46, 0x77, + } +}; #endif typedef struct _ec_list_element_st { @@ -3082,9 +3112,11 @@ static const ec_list_element curve_list[] = { "RFC 5639 curve over a 512 bit prime field"}, {NID_brainpoolP512t1, &_EC_brainpoolP512t1.h, 0, "RFC 5639 curve over a 512 bit prime field"}, -#ifndef OPENSSL_NO_SM2 +#ifndef OPENSSL_NO_GMSSL {NID_sm2p256v1, &_EC_SM2_PRIME_256V1.h, 0, "SM2 curve over a 256 bit prime field"}, + {NID_wapip192v1, &_EC_WAPI_PRIME_192V1.h, 0, + "WAPI curve over a 192 bit prime field"}, #endif }; diff --git a/crypto/ec/ec_err.c b/crypto/ec/ec_err.c index 395742cb..9d64d209 100644 --- a/crypto/ec/ec_err.c +++ b/crypto/ec/ec_err.c @@ -1,6 +1,6 @@ /* crypto/ec/ec_err.c */ /* ==================================================================== - * Copyright (c) 1999-2015 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2016 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 @@ -250,15 +250,31 @@ static ERR_STRING_DATA EC_str_functs[] = { {ERR_FUNC(EC_F_OLD_EC_PRIV_DECODE), "OLD_EC_PRIV_DECODE"}, {ERR_FUNC(EC_F_PKEY_EC_CTRL), "PKEY_EC_CTRL"}, {ERR_FUNC(EC_F_PKEY_EC_CTRL_STR), "PKEY_EC_CTRL_STR"}, + {ERR_FUNC(EC_F_PKEY_EC_DECRYPT), "PKEY_EC_DECRYPT"}, {ERR_FUNC(EC_F_PKEY_EC_DERIVE), "PKEY_EC_DERIVE"}, + {ERR_FUNC(EC_F_PKEY_EC_ENCRYPT), "PKEY_EC_ENCRYPT"}, {ERR_FUNC(EC_F_PKEY_EC_KEYGEN), "PKEY_EC_KEYGEN"}, {ERR_FUNC(EC_F_PKEY_EC_PARAMGEN), "PKEY_EC_PARAMGEN"}, {ERR_FUNC(EC_F_PKEY_EC_SIGN), "PKEY_EC_SIGN"}, - {ERR_FUNC(EC_F_PKEY_EC_ENCRYPT), "PKEY_EC_ENCRYPT"}, - {ERR_FUNC(EC_F_PKEY_EC_DECRYPT), "PKEY_EC_DECRYPT"}, - {ERR_FUNC(EC_F_PKEY_SM2_SIGN), "PKEY_SM2_SIGN"}, - {ERR_FUNC(EC_F_PKEY_SM2_ENCRYPT), "PKEY_SM2_ENCRYPT"}, + {ERR_FUNC(EC_F_PKEY_EC_SIGNCTX), "PKEY_EC_SIGNCTX"}, + {ERR_FUNC(EC_F_PKEY_EC_SIGNCTX_INIT), "PKEY_EC_SIGNCTX_INIT"}, + {ERR_FUNC(EC_F_PKEY_SM2_CLEANUP), "PKEY_SM2_CLEANUP"}, + {ERR_FUNC(EC_F_PKEY_SM2_COPY), "PKEY_SM2_COPY"}, + {ERR_FUNC(EC_F_PKEY_SM2_CTRL), "PKEY_SM2_CTRL"}, + {ERR_FUNC(EC_F_PKEY_SM2_CTRL_STR), "PKEY_SM2_CTRL_STR"}, {ERR_FUNC(EC_F_PKEY_SM2_DECRYPT), "PKEY_SM2_DECRYPT"}, + {ERR_FUNC(EC_F_PKEY_SM2_DERIVE), "PKEY_SM2_DERIVE"}, + {ERR_FUNC(EC_F_PKEY_SM2_DERIVE_INIT), "PKEY_SM2_DERIVE_INIT"}, + {ERR_FUNC(EC_F_PKEY_SM2_ENCRYPT), "PKEY_SM2_ENCRYPT"}, + {ERR_FUNC(EC_F_PKEY_SM2_INIT), "PKEY_SM2_INIT"}, + {ERR_FUNC(EC_F_PKEY_SM2_KEYGEN), "PKEY_SM2_KEYGEN"}, + {ERR_FUNC(EC_F_PKEY_SM2_PARAMGEN), "PKEY_SM2_PARAMGEN"}, + {ERR_FUNC(EC_F_PKEY_SM2_SIGN), "PKEY_SM2_SIGN"}, + {ERR_FUNC(EC_F_PKEY_SM2_SIGNCTX), "PKEY_SM2_SIGNCTX"}, + {ERR_FUNC(EC_F_PKEY_SM2_SIGNCTX_INIT), "PKEY_SM2_SIGNCTX_INIT"}, + {ERR_FUNC(EC_F_PKEY_SM2_VERIFY), "PKEY_SM2_VERIFY"}, + {ERR_FUNC(EC_F_PKEY_SM2_VERIFYCTX), "PKEY_SM2_VERIFYCTX"}, + {ERR_FUNC(EC_F_PKEY_SM2_VERIFYCTX_INIT), "PKEY_SM2_VERIFYCTX_INIT"}, {0, NULL} }; diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c index 3770b0ea..8c62c70c 100644 --- a/crypto/ec/ec_pmeth.c +++ b/crypto/ec/ec_pmeth.c @@ -177,7 +177,7 @@ static void pkey_ec_cleanup(EVP_PKEY_CTX *ctx) static int pkey_ec_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen, const unsigned char *dgst, size_t dgstlen) { - int ret; + int ret = 0; EC_PKEY_CTX *dctx = ctx->data; EC_KEY *ec_key = ctx->pkey->pkey.ec; int type; @@ -209,6 +209,8 @@ static int pkey_ec_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen, ret = ECDSA_sign(type, dgst, dgstlen, sig, &len, ec_key); } else if (dctx->sign_type == NID_sm_scheme) { ret = SM2_sign(type, dgst, dgstlen, sig, &len, ec_key); + } else { + //error } if (ret <= 0) @@ -239,14 +241,12 @@ static int pkey_ec_verify(EVP_PKEY_CTX *ctx, return ret; } -#if 0 static int int_update(EVP_MD_CTX *ctx, const void *data, size_t count) { if (!EVP_DigestUpdate(ctx, data, count)) return 0; return 1; } -#endif static int pkey_ec_signctx_init(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx) { @@ -256,23 +256,22 @@ static int pkey_ec_signctx_init(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx) unsigned char zid[EVP_MAX_MD_SIZE]; unsigned int zidlen = sizeof(zid); - // the reason might be we need to init mctx->udpate if (dctx->sign_type == NID_sm_scheme) { - /* if (!SM2_compute_id_digest(md, zid, &zidlen, ec_key)) { - ECerr(EC_F_PKEY_SM2_SIGNCTX_INIT, ERR_R_SM2_LIB); + ECerr(EC_F_PKEY_EC_SIGNCTX_INIT, ERR_R_SM2_LIB); return 0; } + + mctx->update = int_update; + if (!mctx->update(mctx, zid, zidlen)) { - ECerr(EC_F_PKEY_SM2_SIGNCTX_INIT, ERR_R_EVP_LIB); + ECerr(EC_F_PKEY_EC_SIGNCTX_INIT, ERR_R_EVP_LIB); return 0; } - */ } - //ctx->update = int_update; return 1; } @@ -280,7 +279,7 @@ static int pkey_ec_signctx_init(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx) static int pkey_ec_signctx(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen, EVP_MD_CTX *mctx) { - int ret; + int ret = 0; unsigned int len; EC_PKEY_CTX *dctx = ctx->data; EC_KEY *ec_key = ctx->pkey->pkey.ec; @@ -292,15 +291,16 @@ static int pkey_ec_signctx(EVP_PKEY_CTX *ctx, *siglen = SM2_signature_size(ec_key); return 1; } else if (*siglen < (size_t)SM2_signature_size(ec_key)) { - ECerr(EC_F_PKEY_SM2_SIGNCTX, EC_R_BUFFER_TOO_SMALL); + ECerr(EC_F_PKEY_EC_SIGNCTX, EC_R_BUFFER_TOO_SMALL); return 0; } if (!EVP_DigestFinal_ex(mctx, dgst, &dgstlen)) { - ECerr(EC_F_PKEY_SM2_SIGNCTX, ERR_R_EVP_LIB); + ECerr(EC_F_PKEY_EC_SIGNCTX, ERR_R_EVP_LIB); return 0; } + len = *siglen; if (dctx->sign_type == NID_sm_scheme) ret = SM2_sign(type, dgst, dgstlen, sig, &len, ec_key); else if (dctx->sign_type == NID_secg_scheme) diff --git a/crypto/ecdh/Makefile b/crypto/ecdh/Makefile index 1b31ba1f..706e8c5e 100644 --- a/crypto/ecdh/Makefile +++ b/crypto/ecdh/Makefile @@ -105,14 +105,15 @@ ech_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h ech_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ech_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h ech_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h -ech_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ech_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ech_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -ech_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -ech_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -ech_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ech_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ech_lib.o: ech_lib.c ech_locl.h +ech_lib.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +ech_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ech_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +ech_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +ech_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +ech_lib.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ech_lib.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +ech_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +ech_lib.o: ../../include/openssl/x509_vfy.h ech_lib.c ech_locl.h ech_ossl.o: ../../e_os.h ../../include/openssl/asn1.h ech_ossl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h ech_ossl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h diff --git a/crypto/ecdsa/Makefile b/crypto/ecdsa/Makefile index 4ce00e8f..ce2b10d7 100644 --- a/crypto/ecdsa/Makefile +++ b/crypto/ecdsa/Makefile @@ -99,13 +99,15 @@ ecs_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h ecs_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h ecs_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h ecs_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ecs_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ecs_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -ecs_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecs_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ecs_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ecs_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ecs_lib.o: ../../include/openssl/x509_vfy.h ecs_lib.c ecs_locl.h +ecs_lib.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +ecs_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +ecs_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +ecs_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +ecs_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +ecs_lib.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +ecs_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +ecs_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +ecs_lib.o: ecs_lib.c ecs_locl.h ecs_ossl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h ecs_ossl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h ecs_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h @@ -119,12 +121,14 @@ ecs_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h ecs_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h ecs_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ecs_sign.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ecs_sign.o: ../../include/openssl/engine.h ../../include/openssl/evp.h +ecs_sign.o: ../../include/openssl/engine.h ../../include/openssl/err.h +ecs_sign.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h ecs_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h ecs_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h ecs_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ecs_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h ecs_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +ecs_sign.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h ecs_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h ecs_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h ecs_sign.o: ecs_locl.h ecs_sign.c @@ -132,11 +136,13 @@ ecs_vrf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h ecs_vrf.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h ecs_vrf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ecs_vrf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ecs_vrf.o: ../../include/openssl/engine.h ../../include/openssl/evp.h +ecs_vrf.o: ../../include/openssl/engine.h ../../include/openssl/err.h +ecs_vrf.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h ecs_vrf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h ecs_vrf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h ecs_vrf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ecs_vrf.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ecs_vrf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +ecs_vrf.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ecs_vrf.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h ecs_vrf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h ecs_vrf.o: ../../include/openssl/x509_vfy.h ecs_locl.h ecs_vrf.c diff --git a/crypto/ecies/Makefile b/crypto/ecies/Makefile index 5c448c61..e5add24e 100644 --- a/crypto/ecies/Makefile +++ b/crypto/ecies/Makefile @@ -17,13 +17,12 @@ TEST=eciestest.c APPS= LIB=$(TOP)/libcrypto.a -LIBSRC= ecies_lib.c ecies_asn1.c ecies_err.c kdf_x9_63.c - -LIBOBJ= ecies_lib.o ecies_asn1.o ecies_err.o kdf_x9_63.o +LIBSRC= ecies_lib.c ecies_asn1.c ecies_err.c +LIBOBJ= ecies_lib.o ecies_asn1.o ecies_err.o SRC= $(LIBSRC) -EXHEADER= ecies.h kdf.h +EXHEADER= ecies.h HEADER= ecies_locl.h $(EXHEADER) ALL= $(GENERAL) $(SRC) $(HEADER) @@ -77,66 +76,50 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. -ecs_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -ecs_asn1.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -ecs_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ecs_asn1.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ecs_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -ecs_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecs_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ecs_asn1.o: ../../include/openssl/symhacks.h ecs_asn1.c ecs_locl.h -ecs_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ecs_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ecs_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h -ecs_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ecs_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -ecs_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -ecs_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ecs_err.o: ecs_err.c -ecs_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ecs_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -ecs_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ecs_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -ecs_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -ecs_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ecs_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ecs_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -ecs_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecs_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ecs_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ecs_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ecs_lib.o: ../../include/openssl/x509_vfy.h ecs_lib.c ecs_locl.h -ecs_ossl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ecs_ossl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ecs_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ecs_ossl.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ecs_ossl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ecs_ossl.o: ../../include/openssl/opensslconf.h -ecs_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecs_ossl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ecs_ossl.o: ../../include/openssl/symhacks.h ecs_locl.h ecs_ossl.c -ecs_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ecs_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -ecs_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ecs_sign.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ecs_sign.o: ../../include/openssl/engine.h ../../include/openssl/evp.h -ecs_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ecs_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -ecs_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecs_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -ecs_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -ecs_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ecs_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ecs_sign.o: ecs_locl.h ecs_sign.c -ecs_vrf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ecs_vrf.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -ecs_vrf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ecs_vrf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ecs_vrf.o: ../../include/openssl/engine.h ../../include/openssl/evp.h -ecs_vrf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ecs_vrf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -ecs_vrf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecs_vrf.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ecs_vrf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ecs_vrf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ecs_vrf.o: ../../include/openssl/x509_vfy.h ecs_locl.h ecs_vrf.c +ecies_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h +ecies_asn1.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h +ecies_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +ecies_asn1.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h +ecies_asn1.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h +ecies_asn1.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +ecies_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ecies_asn1.o: ../../include/openssl/objects.h +ecies_asn1.o: ../../include/openssl/opensslconf.h +ecies_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +ecies_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +ecies_asn1.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ecies_asn1.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +ecies_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +ecies_asn1.o: ../../include/openssl/x509_vfy.h ecies.h ecies_asn1.c +ecies_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +ecies_err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h +ecies_err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +ecies_err.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +ecies_err.o: ../../include/openssl/ecies.h ../../include/openssl/err.h +ecies_err.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +ecies_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ecies_err.o: ../../include/openssl/objects.h +ecies_err.o: ../../include/openssl/opensslconf.h +ecies_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +ecies_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +ecies_err.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ecies_err.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +ecies_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +ecies_err.o: ../../include/openssl/x509_vfy.h ecies_err.c +ecies_lib.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h +ecies_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h +ecies_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +ecies_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h +ecies_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/ecies.h +ecies_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h +ecies_lib.o: ../../include/openssl/hmac.h ../../include/openssl/kdf.h +ecies_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ecies_lib.o: ../../include/openssl/objects.h +ecies_lib.o: ../../include/openssl/opensslconf.h +ecies_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +ecies_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h +ecies_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +ecies_lib.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +ecies_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +ecies_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +ecies_lib.o: ecies_lib.c diff --git a/crypto/ecies/ecies.h b/crypto/ecies/ecies.h index d2528bf2..bac41690 100644 --- a/crypto/ecies/ecies.h +++ b/crypto/ecies/ecies.h @@ -142,31 +142,34 @@ int ECIES_decrypt_with_recommended(unsigned char *out, size_t *outlen, void ERR_load_ECIES_strings(void); + +/* BEGIN ERROR CODES */ +/* + * The following lines are auto generated by the script mkerr.pl. Any changes + * made after this point may be overwritten when the script is next run. + */ +void ERR_load_ECIES_strings(void); + /* Error codes for the ECIES functions. */ /* Function codes. */ -#define ECIES_F_I2D_ECIESPARAMETERS 100 -#define ECIES_F_D2I_ECIESPARAMETERS 101 -#define ECIES_F_ECIES_SET_PARAMETERS 102 -#define ECIES_F_ECIES_GET_PARAMETERS 103 -#define ECIES_F_ECIES_DO_ENCRYPT 104 -#define ECIES_F_ECIES_DO_DECRYPT 105 -#define ECIES_F_ECIES_ENCRYPT 106 -#define ECIES_F_ECIES_DECRYPT 107 +# define ECIES_F_D2I_ECIESPARAMETERS 100 +# define ECIES_F_ECIES_DECRYPT 101 +# define ECIES_F_ECIES_DO_DECRYPT 102 +# define ECIES_F_ECIES_DO_ENCRYPT 103 +# define ECIES_F_ECIES_ENCRYPT 104 +# define ECIES_F_I2D_ECIESPARAMETERS 105 /* Reason codes. */ -#define ECIES_R_BAD_DATA 100 -#define ECIES_R_UNKNOWN_CIPHER_TYPE 101 -#define ECIES_R_ENCRYPT_FAILED 102 -#define ECIES_R_DECRYPT_FAILED 103 -#define ECIES_R_UNKNOWN_MAC_TYPE 104 -#define ECIES_R_GEN_MAC_FAILED 105 -#define ECIES_R_VERIFY_MAC_FAILED 106 -#define ECIES_R_ECDH_FAILED 107 -#define ECIES_R_BUFFER_TOO_SMALL 108 +# define ECIES_R_BAD_DATA 100 +# define ECIES_R_BUFFER_TOO_SMALL 101 +# define ECIES_R_DECRYPT_FAILED 102 +# define ECIES_R_ECDH_FAILED 103 +# define ECIES_R_ENCRYPT_FAILED 104 +# define ECIES_R_GEN_MAC_FAILED 105 +# define ECIES_R_VERIFY_MAC_FAILED 106 -#ifdef __cplusplus +#ifdef __cplusplus } #endif #endif - diff --git a/crypto/ecies/ecies_err.c b/crypto/ecies/ecies_err.c index 88d0c22a..68db7f10 100644 --- a/crypto/ecies/ecies_err.c +++ b/crypto/ecies/ecies_err.c @@ -1,6 +1,6 @@ /* crypto/ecies/ecies_err.c */ /* ==================================================================== - * Copyright (c) 2007 - 2015 The GmSSL Project. All rights reserved. + * Copyright (c) 1999-2016 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 @@ -16,27 +16,27 @@ * * 3. All advertising materials mentioning features or use of this * software must display the following acknowledgment: - * "This product includes software developed by the GmSSL Project. - * (http://gmssl.org/)" + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" * - * 4. The name "GmSSL Project" must not be used to endorse or promote - * products derived from this software without prior written - * permission. For written permission, please contact - * guanzhi1980@gmail.com. + * 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 "GmSSL" - * nor may "GmSSL" appear in their names without prior written - * permission of the GmSSL Project. + * 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 GmSSL Project - * (http://gmssl.org/)" + * "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 GmSSL PROJECT ``AS IS'' AND ANY + * 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 GmSSL PROJECT OR + * 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; @@ -47,40 +47,47 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. * ==================================================================== * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * */ +/* + * NOTE: this file was auto generated by the mkerr.pl script: any changes + * made to it will be overwritten when the script next updates this file, + * only reason strings will be preserved. + */ #include #include -#include "ecies.h" +#include +/* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR -#define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECIES,func,0) -#define ERR_REASON(reason) ERR_PACK(ERR_LIB_ECIES,0,reason) - +# define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECIES,func,0) +# define ERR_REASON(reason) ERR_PACK(ERR_LIB_ECIES,0,reason) static ERR_STRING_DATA ECIES_str_functs[] = { - {ERR_FUNC(ECIES_F_ECIES_SET_PARAMETERS),"ECIES_set_parameters"}, - {ERR_FUNC(ECIES_F_ECIES_GET_PARAMETERS),"ECIES_get_parameters"}, - {ERR_FUNC(ECIES_F_ECIES_DO_ENCRYPT), "ECIES_do_encrypt"}, - {ERR_FUNC(ECIES_F_ECIES_DO_DECRYPT), "ECIES_do_decrypt"}, - {ERR_FUNC(ECIES_F_ECIES_ENCRYPT), "ECIES_encrypt"}, - {ERR_FUNC(ECIES_F_ECIES_DECRYPT), "ECIES_decrypt"}, - {0,NULL} + {ERR_FUNC(ECIES_F_D2I_ECIESPARAMETERS), "d2i_ECIESParameters"}, + {ERR_FUNC(ECIES_F_ECIES_DECRYPT), "ECIES_decrypt"}, + {ERR_FUNC(ECIES_F_ECIES_DO_DECRYPT), "ECIES_do_decrypt"}, + {ERR_FUNC(ECIES_F_ECIES_DO_ENCRYPT), "ECIES_do_encrypt"}, + {ERR_FUNC(ECIES_F_ECIES_ENCRYPT), "ECIES_encrypt"}, + {ERR_FUNC(ECIES_F_I2D_ECIESPARAMETERS), "i2d_ECIESParameters"}, + {0, NULL} }; static ERR_STRING_DATA ECIES_str_reasons[] = { - {ERR_REASON(ECIES_R_BAD_DATA), "bad data"}, - {ERR_REASON(ECIES_R_UNKNOWN_CIPHER_TYPE),"unknown cipher type"}, - {ERR_REASON(ECIES_R_ENCRYPT_FAILED), "encrypt failed"}, - {ERR_REASON(ECIES_R_DECRYPT_FAILED), "decrypt failed"}, - {ERR_REASON(ECIES_R_UNKNOWN_MAC_TYPE), "unknown MAC type"}, - {ERR_REASON(ECIES_R_GEN_MAC_FAILED), "MAC generation failed"}, - {ERR_REASON(ECIES_R_VERIFY_MAC_FAILED), "MAC verification failed"}, - {ERR_REASON(ECIES_R_ECDH_FAILED), "ECDH failed"}, - {ERR_REASON(ECIES_R_BUFFER_TOO_SMALL), "buffer too small"}, - {0,NULL} + {ERR_REASON(ECIES_R_BAD_DATA), "bad data"}, + {ERR_REASON(ECIES_R_BUFFER_TOO_SMALL), "buffer too small"}, + {ERR_REASON(ECIES_R_DECRYPT_FAILED), "decrypt failed"}, + {ERR_REASON(ECIES_R_ECDH_FAILED), "ECDH failed"}, + {ERR_REASON(ECIES_R_ENCRYPT_FAILED), "encrypt failed"}, + {ERR_REASON(ECIES_R_GEN_MAC_FAILED), "MAC generation failed"}, + {ERR_REASON(ECIES_R_VERIFY_MAC_FAILED), "MAC verification failed"}, + {0, NULL} }; #endif @@ -89,10 +96,9 @@ void ERR_load_ECIES_strings(void) { #ifndef OPENSSL_NO_ERR - if (ERR_func_error_string(ECIES_str_functs[0].error) == NULL) { - ERR_load_strings(0,ECIES_str_functs); - ERR_load_strings(0,ECIES_str_reasons); - } + if (ERR_func_error_string(ECIES_str_functs[0].error) == NULL) { + ERR_load_strings(0, ECIES_str_functs); + ERR_load_strings(0, ECIES_str_reasons); + } #endif } - diff --git a/crypto/ecies/ecies_lib.c b/crypto/ecies/ecies_lib.c index 80f94265..d7fdfd0f 100644 --- a/crypto/ecies/ecies_lib.c +++ b/crypto/ecies/ecies_lib.c @@ -57,8 +57,8 @@ #include #include #include -#include "ecies.h" -#include "kdf.h" +#include +#include static void *ecies_data_dup(void *data) { @@ -342,7 +342,7 @@ int ECIES_do_decrypt(const ECIES_CIPHERTEXT_VALUE *cv, } if (!(ephem_point = EC_POINT_new(EC_KEY_get0_group(pri_key)))) { - ECIESerr(ECIES_F_ECIES_DO_ENCRYPT, ERR_R_MALLOC_FAILURE); + ECIESerr(ECIES_F_ECIES_DO_DECRYPT, ERR_R_MALLOC_FAILURE); goto err; } if (!EC_POINT_oct2point(EC_KEY_get0_group(pri_key), ephem_point, @@ -397,7 +397,7 @@ int ECIES_do_decrypt(const ECIES_CIPHERTEXT_VALUE *cv, ECIESerr(ECIES_F_ECIES_DO_DECRYPT, ECIES_R_VERIFY_MAC_FAILED); goto err; } - if (memcmp(cv->mactag->data, mac, len)) + if (OPENSSL_memcmp(cv->mactag->data, mac, len)) { ECIESerr(ECIES_F_ECIES_DO_DECRYPT, ECIES_R_VERIFY_MAC_FAILED); goto err; @@ -507,12 +507,12 @@ int ECIES_decrypt(const ECIES_PARAMS *param, const unsigned char *p = in; if (!(cv = d2i_ECIES_CIPHERTEXT_VALUE(NULL, &p, (long)inlen))) { - ECIESerr(ECIES_F_ECIES_ENCRYPT, ECIES_R_ENCRYPT_FAILED); + ECIESerr(ECIES_F_ECIES_DECRYPT, ECIES_R_ENCRYPT_FAILED); return 0; } if (!ECIES_do_decrypt(cv, param, out, outlen, ec_key)) { - ECIESerr(ECIES_F_ECIES_ENCRYPT, ECIES_R_ENCRYPT_FAILED); + ECIESerr(ECIES_F_ECIES_DECRYPT, ECIES_R_ENCRYPT_FAILED); goto end; } @@ -554,4 +554,3 @@ int ECIES_decrypt_with_recommended(unsigned char *out, size_t *outlen, return ECIES_decrypt(¶m, out, outlen, in, inlen, ec_key); } - diff --git a/crypto/engine/Makefile b/crypto/engine/Makefile index 426388e9..af432cce 100644 --- a/crypto/engine/Makefile +++ b/crypto/engine/Makefile @@ -92,39 +92,44 @@ eng_all.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h eng_all.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h eng_all.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h eng_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eng_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eng_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -eng_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -eng_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -eng_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -eng_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -eng_all.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_all.c eng_int.h +eng_all.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +eng_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +eng_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +eng_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +eng_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +eng_all.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +eng_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +eng_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +eng_all.o: ../cryptlib.h eng_all.c eng_int.h eng_cnf.o: ../../e_os.h ../../include/openssl/asn1.h eng_cnf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h eng_cnf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h eng_cnf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h eng_cnf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h eng_cnf.o: ../../include/openssl/engine.h ../../include/openssl/err.h -eng_cnf.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -eng_cnf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -eng_cnf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -eng_cnf.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -eng_cnf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -eng_cnf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -eng_cnf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -eng_cnf.o: ../cryptlib.h eng_cnf.c eng_int.h +eng_cnf.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +eng_cnf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +eng_cnf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +eng_cnf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +eng_cnf.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +eng_cnf.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +eng_cnf.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +eng_cnf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +eng_cnf.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_cnf.c eng_int.h eng_cryptodev.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h eng_cryptodev.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h eng_cryptodev.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h eng_cryptodev.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h eng_cryptodev.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -eng_cryptodev.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +eng_cryptodev.o: ../../include/openssl/err.h ../../include/openssl/evp.h +eng_cryptodev.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h eng_cryptodev.o: ../../include/openssl/obj_mac.h eng_cryptodev.o: ../../include/openssl/objects.h eng_cryptodev.o: ../../include/openssl/opensslconf.h eng_cryptodev.o: ../../include/openssl/opensslv.h eng_cryptodev.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h eng_cryptodev.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +eng_cryptodev.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h eng_cryptodev.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h eng_cryptodev.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h eng_cryptodev.o: eng_cryptodev.c @@ -134,11 +139,13 @@ eng_ctrl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h eng_ctrl.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h eng_ctrl.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h eng_ctrl.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eng_ctrl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eng_ctrl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +eng_ctrl.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +eng_ctrl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +eng_ctrl.o: ../../include/openssl/opensslconf.h eng_ctrl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h eng_ctrl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -eng_ctrl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +eng_ctrl.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +eng_ctrl.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h eng_ctrl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h eng_ctrl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_ctrl.c eng_int.h eng_dyn.o: ../../e_os.h ../../include/openssl/asn1.h @@ -147,52 +154,57 @@ eng_dyn.o: ../../include/openssl/crypto.h ../../include/openssl/dso.h eng_dyn.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h eng_dyn.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h eng_dyn.o: ../../include/openssl/engine.h ../../include/openssl/err.h -eng_dyn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -eng_dyn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -eng_dyn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -eng_dyn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -eng_dyn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -eng_dyn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -eng_dyn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -eng_dyn.o: ../cryptlib.h eng_dyn.c eng_int.h +eng_dyn.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +eng_dyn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +eng_dyn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +eng_dyn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +eng_dyn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +eng_dyn.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +eng_dyn.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +eng_dyn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +eng_dyn.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_dyn.c eng_int.h eng_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h eng_err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h eng_err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h eng_err.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h eng_err.o: ../../include/openssl/engine.h ../../include/openssl/err.h -eng_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -eng_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -eng_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -eng_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -eng_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -eng_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -eng_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -eng_err.o: eng_err.c +eng_err.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +eng_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +eng_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +eng_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +eng_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +eng_err.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +eng_err.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +eng_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +eng_err.o: ../../include/openssl/x509_vfy.h eng_err.c eng_fat.o: ../../e_os.h ../../include/openssl/asn1.h eng_fat.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h eng_fat.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h eng_fat.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h eng_fat.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h eng_fat.o: ../../include/openssl/engine.h ../../include/openssl/err.h -eng_fat.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -eng_fat.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -eng_fat.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -eng_fat.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -eng_fat.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -eng_fat.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -eng_fat.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -eng_fat.o: ../cryptlib.h eng_fat.c eng_int.h +eng_fat.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +eng_fat.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +eng_fat.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +eng_fat.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +eng_fat.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +eng_fat.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +eng_fat.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +eng_fat.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +eng_fat.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_fat.c eng_int.h eng_init.o: ../../e_os.h ../../include/openssl/asn1.h eng_init.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h eng_init.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h eng_init.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h eng_init.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h eng_init.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eng_init.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eng_init.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +eng_init.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +eng_init.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +eng_init.o: ../../include/openssl/opensslconf.h eng_init.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h eng_init.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -eng_init.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +eng_init.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +eng_init.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h eng_init.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h eng_init.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_init.c eng_int.h eng_lib.o: ../../e_os.h ../../include/openssl/asn1.h @@ -201,25 +213,28 @@ eng_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h eng_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h eng_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h eng_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eng_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eng_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -eng_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -eng_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -eng_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -eng_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -eng_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -eng_lib.o: ../cryptlib.h eng_int.h eng_lib.c +eng_lib.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +eng_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +eng_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +eng_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +eng_lib.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h +eng_lib.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +eng_lib.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +eng_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +eng_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h eng_lib.c eng_list.o: ../../e_os.h ../../include/openssl/asn1.h eng_list.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h eng_list.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h eng_list.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h eng_list.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h eng_list.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eng_list.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eng_list.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +eng_list.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +eng_list.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +eng_list.o: ../../include/openssl/opensslconf.h eng_list.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h eng_list.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -eng_list.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +eng_list.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +eng_list.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h eng_list.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h eng_list.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h eng_list.c eng_openssl.o: ../../e_os.h ../../include/openssl/asn1.h @@ -229,15 +244,17 @@ eng_openssl.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h eng_openssl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h eng_openssl.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h eng_openssl.o: ../../include/openssl/engine.h ../../include/openssl/err.h -eng_openssl.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -eng_openssl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +eng_openssl.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +eng_openssl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +eng_openssl.o: ../../include/openssl/objects.h eng_openssl.o: ../../include/openssl/opensslconf.h eng_openssl.o: ../../include/openssl/opensslv.h eng_openssl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h eng_openssl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h eng_openssl.o: ../../include/openssl/rand.h ../../include/openssl/rc4.h eng_openssl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -eng_openssl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +eng_openssl.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +eng_openssl.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h eng_openssl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h eng_openssl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_openssl.c eng_pkey.o: ../../e_os.h ../../include/openssl/asn1.h @@ -246,11 +263,13 @@ eng_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h eng_pkey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h eng_pkey.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h eng_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eng_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eng_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +eng_pkey.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +eng_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +eng_pkey.o: ../../include/openssl/opensslconf.h eng_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h eng_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -eng_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +eng_pkey.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +eng_pkey.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h eng_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h eng_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h eng_pkey.c eng_rdrand.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h @@ -258,12 +277,14 @@ eng_rdrand.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h eng_rdrand.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h eng_rdrand.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h eng_rdrand.o: ../../include/openssl/engine.h ../../include/openssl/err.h -eng_rdrand.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -eng_rdrand.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +eng_rdrand.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +eng_rdrand.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +eng_rdrand.o: ../../include/openssl/objects.h eng_rdrand.o: ../../include/openssl/opensslconf.h eng_rdrand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h eng_rdrand.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h eng_rdrand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +eng_rdrand.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h eng_rdrand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h eng_rdrand.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h eng_rdrand.o: eng_rdrand.c @@ -273,12 +294,13 @@ eng_table.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h eng_table.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h eng_table.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h eng_table.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eng_table.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eng_table.o: ../../include/openssl/objects.h +eng_table.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +eng_table.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h eng_table.o: ../../include/openssl/opensslconf.h eng_table.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h eng_table.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -eng_table.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +eng_table.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +eng_table.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h eng_table.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h eng_table.o: eng_table.c @@ -288,12 +310,13 @@ tb_asnmth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h tb_asnmth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h tb_asnmth.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h tb_asnmth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_asnmth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_asnmth.o: ../../include/openssl/objects.h +tb_asnmth.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +tb_asnmth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h tb_asnmth.o: ../../include/openssl/opensslconf.h tb_asnmth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h tb_asnmth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_asnmth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +tb_asnmth.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +tb_asnmth.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h tb_asnmth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h tb_asnmth.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h tb_asnmth.o: eng_int.h tb_asnmth.c @@ -303,12 +326,13 @@ tb_cipher.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h tb_cipher.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h tb_cipher.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h tb_cipher.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_cipher.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_cipher.o: ../../include/openssl/objects.h +tb_cipher.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +tb_cipher.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h tb_cipher.o: ../../include/openssl/opensslconf.h tb_cipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h tb_cipher.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_cipher.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +tb_cipher.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +tb_cipher.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h tb_cipher.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h tb_cipher.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h tb_cipher.o: tb_cipher.c @@ -317,26 +341,28 @@ tb_dh.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h tb_dh.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h tb_dh.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h tb_dh.o: ../../include/openssl/engine.h ../../include/openssl/err.h -tb_dh.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -tb_dh.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -tb_dh.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -tb_dh.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -tb_dh.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -tb_dh.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -tb_dh.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -tb_dh.o: ../cryptlib.h eng_int.h tb_dh.c +tb_dh.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +tb_dh.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +tb_dh.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +tb_dh.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +tb_dh.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +tb_dh.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +tb_dh.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +tb_dh.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +tb_dh.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h tb_dh.c tb_digest.o: ../../e_os.h ../../include/openssl/asn1.h tb_digest.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h tb_digest.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h tb_digest.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h tb_digest.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h tb_digest.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_digest.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_digest.o: ../../include/openssl/objects.h +tb_digest.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +tb_digest.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h tb_digest.o: ../../include/openssl/opensslconf.h tb_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h tb_digest.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_digest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +tb_digest.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +tb_digest.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h tb_digest.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h tb_digest.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h tb_digest.o: tb_digest.c @@ -345,38 +371,43 @@ tb_dsa.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h tb_dsa.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h tb_dsa.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h tb_dsa.o: ../../include/openssl/engine.h ../../include/openssl/err.h -tb_dsa.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -tb_dsa.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -tb_dsa.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -tb_dsa.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -tb_dsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -tb_dsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -tb_dsa.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -tb_dsa.o: ../cryptlib.h eng_int.h tb_dsa.c +tb_dsa.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +tb_dsa.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +tb_dsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +tb_dsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +tb_dsa.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +tb_dsa.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +tb_dsa.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +tb_dsa.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +tb_dsa.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h tb_dsa.c tb_ecdh.o: ../../e_os.h ../../include/openssl/asn1.h tb_ecdh.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h tb_ecdh.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h tb_ecdh.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h tb_ecdh.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h tb_ecdh.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_ecdh.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_ecdh.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -tb_ecdh.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tb_ecdh.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_ecdh.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -tb_ecdh.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -tb_ecdh.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h tb_ecdh.c +tb_ecdh.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +tb_ecdh.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +tb_ecdh.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +tb_ecdh.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +tb_ecdh.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +tb_ecdh.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +tb_ecdh.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +tb_ecdh.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +tb_ecdh.o: ../cryptlib.h eng_int.h tb_ecdh.c tb_ecdsa.o: ../../e_os.h ../../include/openssl/asn1.h tb_ecdsa.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h tb_ecdsa.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h tb_ecdsa.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h tb_ecdsa.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h tb_ecdsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_ecdsa.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_ecdsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +tb_ecdsa.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +tb_ecdsa.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +tb_ecdsa.o: ../../include/openssl/opensslconf.h tb_ecdsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h tb_ecdsa.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_ecdsa.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +tb_ecdsa.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +tb_ecdsa.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h tb_ecdsa.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h tb_ecdsa.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h tb_ecdsa.c tb_pkmeth.o: ../../e_os.h ../../include/openssl/asn1.h @@ -385,12 +416,13 @@ tb_pkmeth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h tb_pkmeth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h tb_pkmeth.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h tb_pkmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_pkmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_pkmeth.o: ../../include/openssl/objects.h +tb_pkmeth.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +tb_pkmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h tb_pkmeth.o: ../../include/openssl/opensslconf.h tb_pkmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h tb_pkmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_pkmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +tb_pkmeth.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +tb_pkmeth.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h tb_pkmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h tb_pkmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h tb_pkmeth.o: tb_pkmeth.c @@ -400,36 +432,41 @@ tb_rand.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h tb_rand.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h tb_rand.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h tb_rand.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_rand.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -tb_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tb_rand.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -tb_rand.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -tb_rand.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h tb_rand.c +tb_rand.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +tb_rand.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +tb_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +tb_rand.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +tb_rand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +tb_rand.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +tb_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +tb_rand.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +tb_rand.o: ../cryptlib.h eng_int.h tb_rand.c tb_rsa.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h tb_rsa.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h tb_rsa.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h tb_rsa.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h tb_rsa.o: ../../include/openssl/engine.h ../../include/openssl/err.h -tb_rsa.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -tb_rsa.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -tb_rsa.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -tb_rsa.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -tb_rsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -tb_rsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -tb_rsa.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -tb_rsa.o: ../cryptlib.h eng_int.h tb_rsa.c +tb_rsa.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +tb_rsa.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +tb_rsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +tb_rsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +tb_rsa.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +tb_rsa.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +tb_rsa.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +tb_rsa.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +tb_rsa.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h tb_rsa.c tb_store.o: ../../e_os.h ../../include/openssl/asn1.h tb_store.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h tb_store.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h tb_store.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h tb_store.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h tb_store.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_store.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_store.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +tb_store.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +tb_store.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +tb_store.o: ../../include/openssl/opensslconf.h tb_store.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h tb_store.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_store.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +tb_store.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +tb_store.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h tb_store.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h tb_store.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h tb_store.c diff --git a/crypto/err/Makefile b/crypto/err/Makefile index b6f3ef17..cbb06782 100644 --- a/crypto/err/Makefile +++ b/crypto/err/Makefile @@ -85,24 +85,29 @@ err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h err.o: ../cryptlib.h err.c err_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h err_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -err_all.o: ../../include/openssl/cms.h ../../include/openssl/comp.h -err_all.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h +err_all.o: ../../include/openssl/cbcmac.h ../../include/openssl/cms.h +err_all.o: ../../include/openssl/comp.h ../../include/openssl/conf.h +err_all.o: ../../include/openssl/cpk.h ../../include/openssl/crypto.h err_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h err_all.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h err_all.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -err_all.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -err_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h +err_all.o: ../../include/openssl/ecdsa.h ../../include/openssl/ecies.h +err_all.o: ../../include/openssl/engine.h ../../include/openssl/err.h +err_all.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h err_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h err_all.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h err_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -err_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem2.h -err_all.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -err_all.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h -err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -err_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -err_all.o: ../../include/openssl/ts.h ../../include/openssl/ui.h -err_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -err_all.o: ../../include/openssl/x509v3.h err_all.c +err_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/otp.h +err_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h +err_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h +err_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h +err_all.o: ../../include/openssl/sha.h ../../include/openssl/skf.h +err_all.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +err_all.o: ../../include/openssl/sm9.h ../../include/openssl/stack.h +err_all.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h +err_all.o: ../../include/openssl/ui.h ../../include/openssl/x509.h +err_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +err_all.o: err_all.c err_prn.o: ../../e_os.h ../../include/openssl/bio.h err_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h diff --git a/crypto/err/err.c b/crypto/err/err.c index 40cbbc0a..6175ec69 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -157,8 +157,12 @@ static ERR_STRING_DATA ERR_str_libraries[] = { {ERR_PACK(ERR_LIB_HMAC, 0, 0), "HMAC routines"}, # ifndef OPENSSL_NO_GMSSL {ERR_PACK(ERR_LIB_ECIES, 0, 0), "ECIES routines"}, + {ERR_PACK(ERR_LIB_CPK, 0, 0), "CPK routines"}, {ERR_PACK(ERR_LIB_SM2, 0, 0), "SM2 routines"}, {ERR_PACK(ERR_LIB_SKF, 0, 0), "SKF routines"}, + {ERR_PACK(ERR_LIB_CBCMAC, 0, 0), "CBCMAC routines"}, + {ERR_PACK(ERR_LIB_OTP, 0, 0), "OTP routines"}, + {ERR_PACK(ERR_LIB_SM9, 0, 0), "SM9 routines"}, # endif {0, NULL}, }; diff --git a/crypto/err/err.h b/crypto/err/err.h index 3bf1b5aa..29d4409f 100644 --- a/crypto/err/err.h +++ b/crypto/err/err.h @@ -197,10 +197,15 @@ typedef struct err_state_st { # define ERR_LIB_TS 47 # define ERR_LIB_HMAC 48 # define ERR_LIB_JPAKE 49 + # ifndef OPENSSL_NO_GMSSL # define ERR_LIB_ECIES 50 -# define ERR_LIB_SM2 51 -# define ERR_LIB_SKF 52 +# define ERR_LIB_CPK 51 +# define ERR_LIB_SM2 52 +# define ERR_LIB_SKF 53 +# define ERR_LIB_CBCMAC 54 +# define ERR_LIB_OTP 55 +# define ERR_LIB_SM9 56 # endif # define ERR_LIB_USER 128 @@ -238,10 +243,15 @@ typedef struct err_state_st { # define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),__FILE__,__LINE__) # define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__) # define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__) + # ifndef OPENSSL_NO_GMSSL # define ECIESerr(f,r) ERR_PUT_error(ERR_LIB_ECIES,(f),(r),__FILE__,__LINE__) +# define CPKerr(f,r) ERR_PUT_error(ERR_LIB_CPK,(f),(r),__FILE__,__LINE__) # define SM2err(f,r) ERR_PUT_error(ERR_LIB_SM2,(f),(r),__FILE__,__LINE__) # define SKFerr(f,r) ERR_PUT_error(ERR_LIB_SKF,(f),(r),__FILE__,__LINE__) +# define CBCMACerr(f,r) ERR_PUT_error(ERR_LIB_CBCMAC,(f),(r),__FILE__,__LINE__); +# define OTPerr(f,r) ERR_PUT_error(ERR_LIB_OTP,(f),(r),__FILE__,__LINE__); +# define SM9err(f,r) ERR_PUT_error(ERR_LIB_SM9,(f),(r),__FILE__,__LINE__); # endif /* @@ -299,10 +309,15 @@ typedef struct err_state_st { # define ERR_R_ECDH_LIB ERR_LIB_ECDH/* 43 */ # define ERR_R_STORE_LIB ERR_LIB_STORE/* 44 */ # define ERR_R_TS_LIB ERR_LIB_TS/* 45 */ + # ifndef OPENSSL_NO_GMSSL # define ERR_R_ECIES_LIB ERR_LIB_ECIES/* 50 */ -# define ERR_R_SM2_LIB ERR_LIB_SM2/* 51 */ -# define ERR_R_SKF_LIB ERR_LIB_SKF/* 52 */ +# define ERR_R_CPK_LIB ERR_LIB_CPK/* 51 */ +# define ERR_R_SM2_LIB ERR_LIB_SM2/* 52 */ +# define ERR_R_SKF_LIB ERR_LIB_SKF/* 53 */ +# define ERR_R_CBCMAC_LIB ERR_LIB_CBCMAC/* 54 */ +# define ERR_R_OTP_LIB ERR_LIB_CBCMAC/* 55 */ +# define ERR_R_SM9_LIB ERR_LIB_SM9/* 56 */ # endif # define ERR_R_NESTED_ASN1_ERROR 58 diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 4f8aca65..07aa6edf 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -107,8 +107,15 @@ #ifndef OPENSSL_NO_JPAKE # include #endif + #ifndef OPENSSL_NO_GMSSL # include +# include +# include +# include +# include +# include +# include #endif void ERR_load_crypto_strings(void) @@ -169,7 +176,12 @@ void ERR_load_crypto_strings(void) # endif # ifndef OPENSSL_NO_GMSSL ERR_load_ECIES_strings(); + ERR_load_CPK_strings(); ERR_load_SM2_strings(); + ERR_load_SKF_strings(); + ERR_load_CBCMAC_strings(); + ERR_load_OTP_strings(); + ERR_load_SM9_strings(); # endif #endif } diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec index 6323d840..6183700e 100644 --- a/crypto/err/openssl.ec +++ b/crypto/err/openssl.ec @@ -37,7 +37,11 @@ L CMS crypto/cms/cms.h crypto/cms/cms_err.c L JPAKE crypto/jpake/jpake.h crypto/jpake/jpake_err.c L ECIES crypto/ecies/ecies.h crypto/ecies/ecies_err.c L SM2 crypto/sm2/sm2.h crypto/sm2/sm2_err.c -L SKF crypto/skf/skf.h crypto/skf/skf_err.c +L SKF crypto/skf/skf_ex.h crypto/skf/skf_err.c +L CPK crypto/cpk/cpk.h crypto/cpk/cpk_err.c +L CBCMAC crypto/cbcmac/cbcmac.h crypto/cbcmac/cbcmac_err.c +L OTP crypto/otp/otp.h crypto/otp/otp_err.c +L SM9 crypto/sm9/sm9.h crypto/sm9/sm9_err.c # additional header files to be scanned for function names L NONE crypto/x509/x509_vfy.h NONE diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile index f06345db..d4096e71 100644 --- a/crypto/evp/Makefile +++ b/crypto/evp/Makefile @@ -144,53 +144,57 @@ c_all.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h c_all.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h c_all.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h c_all.o: ../../include/openssl/engine.h ../../include/openssl/err.h -c_all.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -c_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -c_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -c_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -c_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -c_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -c_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -c_all.o: ../cryptlib.h c_all.c +c_all.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +c_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +c_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +c_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +c_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +c_all.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +c_all.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +c_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +c_all.o: ../../include/openssl/x509_vfy.h ../cryptlib.h c_all.c c_allc.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h c_allc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h c_allc.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h c_allc.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h c_allc.o: ../../include/openssl/err.h ../../include/openssl/evp.h -c_allc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -c_allc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -c_allc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -c_allc.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -c_allc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -c_allc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -c_allc.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -c_allc.o: ../cryptlib.h c_allc.c +c_allc.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +c_allc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +c_allc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +c_allc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h +c_allc.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +c_allc.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +c_allc.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +c_allc.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +c_allc.o: ../../include/openssl/x509_vfy.h ../cryptlib.h c_allc.c c_alld.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h c_alld.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h c_alld.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h c_alld.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h c_alld.o: ../../include/openssl/err.h ../../include/openssl/evp.h -c_alld.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -c_alld.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -c_alld.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -c_alld.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -c_alld.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -c_alld.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -c_alld.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -c_alld.o: ../cryptlib.h c_alld.c +c_alld.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +c_alld.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +c_alld.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +c_alld.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h +c_alld.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +c_alld.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +c_alld.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +c_alld.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +c_alld.o: ../../include/openssl/x509_vfy.h ../cryptlib.h c_alld.c digest.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h digest.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h digest.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h digest.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h digest.o: ../../include/openssl/engine.h ../../include/openssl/err.h -digest.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -digest.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -digest.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -digest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -digest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -digest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -digest.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -digest.o: ../cryptlib.h digest.c +digest.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +digest.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +digest.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +digest.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +digest.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +digest.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +digest.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +digest.o: ../../include/openssl/x509_vfy.h ../cryptlib.h digest.c e_aes.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h e_aes.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h e_aes.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h @@ -306,7 +310,6 @@ e_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h e_null.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h e_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h e_null.o: ../cryptlib.h e_null.c -e_old.o: e_old.c e_rc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h e_rc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h e_rc2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h @@ -343,27 +346,6 @@ e_rc5.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h e_rc5.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h e_rc5.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h e_rc5.o: ../../include/openssl/symhacks.h ../cryptlib.h e_rc5.c - -e_sms4.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -e_sms4.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -e_sms4.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -e_sms4.o: ../../include/openssl/evp.h ../../include/openssl/sms4.h -e_sms4.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -e_sms4.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -e_sms4.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -e_sms4.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -e_sms4.o: ../../include/openssl/symhacks.h ../cryptlib.h e_sms4.c evp_locl.h - -e_zuc.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -e_zuc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -e_zuc.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -#e_zuc.o: ../../include/openssl/evp.h ../../include/openssl/zuc.h -e_zuc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -e_zuc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -e_zuc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -e_zuc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -e_zuc.o: ../../include/openssl/symhacks.h ../cryptlib.h e_zuc.c evp_locl.h - e_seed.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h e_seed.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h e_seed.o: ../../include/openssl/err.h ../../include/openssl/evp.h @@ -373,6 +355,16 @@ e_seed.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h e_seed.o: ../../include/openssl/safestack.h ../../include/openssl/seed.h e_seed.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h e_seed.o: e_seed.c evp_locl.h +e_sms4.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h +e_sms4.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h +e_sms4.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +e_sms4.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +e_sms4.o: ../../include/openssl/modes.h ../../include/openssl/obj_mac.h +e_sms4.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +e_sms4.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +e_sms4.o: ../../include/openssl/safestack.h ../../include/openssl/sms4.h +e_sms4.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +e_sms4.o: ../cryptlib.h ../modes/modes_lcl.h e_sms4.c evp_locl.h e_xcbc_d.o: ../../e_os.h ../../include/openssl/asn1.h e_xcbc_d.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h e_xcbc_d.o: ../../include/openssl/crypto.h ../../include/openssl/des.h @@ -385,6 +377,15 @@ e_xcbc_d.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h e_xcbc_d.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h e_xcbc_d.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_xcbc_d.c e_xcbc_d.o: evp_locl.h +e_zuc.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h +e_zuc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h +e_zuc.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +e_zuc.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +e_zuc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +e_zuc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +e_zuc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h +e_zuc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +e_zuc.o: ../../include/openssl/zuc.h ../cryptlib.h e_zuc.c evp_locl.h encode.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h encode.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h encode.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h @@ -410,28 +411,31 @@ evp_cnf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h evp_cnf.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h evp_cnf.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h evp_cnf.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -evp_cnf.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -evp_cnf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -evp_cnf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -evp_cnf.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -evp_cnf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -evp_cnf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -evp_cnf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -evp_cnf.o: ../../include/openssl/x509v3.h ../cryptlib.h evp_cnf.c +evp_cnf.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +evp_cnf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +evp_cnf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +evp_cnf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +evp_cnf.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +evp_cnf.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +evp_cnf.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +evp_cnf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +evp_cnf.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +evp_cnf.o: ../cryptlib.h evp_cnf.c evp_enc.o: ../../e_os.h ../../include/openssl/asn1.h evp_enc.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h evp_enc.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h evp_enc.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h evp_enc.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h evp_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h -evp_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -evp_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -evp_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -evp_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -evp_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -evp_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -evp_enc.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -evp_enc.o: ../cryptlib.h evp_enc.c evp_locl.h +evp_enc.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +evp_enc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +evp_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +evp_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +evp_enc.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h +evp_enc.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +evp_enc.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +evp_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +evp_enc.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_enc.c evp_locl.h evp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h evp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h evp_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h @@ -445,14 +449,16 @@ evp_key.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h evp_key.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h evp_key.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h evp_key.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -evp_key.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -evp_key.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -evp_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -evp_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -evp_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -evp_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -evp_key.o: ../../include/openssl/ui.h ../../include/openssl/x509.h -evp_key.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_key.c +evp_key.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +evp_key.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +evp_key.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +evp_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +evp_key.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +evp_key.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +evp_key.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +evp_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h +evp_key.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +evp_key.o: ../cryptlib.h evp_key.c evp_lib.o: ../../e_os.h ../../include/openssl/asn1.h evp_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h evp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h @@ -467,25 +473,28 @@ evp_pbe.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h evp_pbe.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h evp_pbe.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h evp_pbe.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -evp_pbe.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -evp_pbe.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -evp_pbe.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -evp_pbe.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h -evp_pbe.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -evp_pbe.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -evp_pbe.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -evp_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h evp_pbe.c +evp_pbe.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +evp_pbe.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +evp_pbe.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +evp_pbe.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +evp_pbe.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h +evp_pbe.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +evp_pbe.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +evp_pbe.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +evp_pbe.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +evp_pbe.o: ../cryptlib.h evp_locl.h evp_pbe.c evp_pkey.o: ../../e_os.h ../../include/openssl/asn1.h evp_pkey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h evp_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h evp_pkey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h evp_pkey.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -evp_pkey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -evp_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -evp_pkey.o: ../../include/openssl/opensslconf.h +evp_pkey.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +evp_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +evp_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h evp_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h evp_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h evp_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +evp_pkey.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h evp_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h evp_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h evp_pkey.o: ../asn1/asn1_locl.h ../cryptlib.h evp_pkey.c @@ -514,14 +523,15 @@ m_ecdsa.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h m_ecdsa.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h m_ecdsa.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h m_ecdsa.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -m_ecdsa.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -m_ecdsa.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -m_ecdsa.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -m_ecdsa.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -m_ecdsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -m_ecdsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -m_ecdsa.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -m_ecdsa.o: ../cryptlib.h m_ecdsa.c +m_ecdsa.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +m_ecdsa.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +m_ecdsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +m_ecdsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +m_ecdsa.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +m_ecdsa.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +m_ecdsa.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +m_ecdsa.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +m_ecdsa.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_ecdsa.c m_md2.o: ../../e_os.h ../../include/openssl/bio.h m_md2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h m_md2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h @@ -534,76 +544,75 @@ m_md4.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h m_md4.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h m_md4.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h m_md4.o: ../../include/openssl/err.h ../../include/openssl/evp.h -m_md4.o: ../../include/openssl/lhash.h ../../include/openssl/md4.h -m_md4.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -m_md4.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -m_md4.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -m_md4.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -m_md4.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -m_md4.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -m_md4.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_md4.c +m_md4.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +m_md4.o: ../../include/openssl/md4.h ../../include/openssl/obj_mac.h +m_md4.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +m_md4.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +m_md4.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h +m_md4.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +m_md4.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +m_md4.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +m_md4.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +m_md4.o: ../cryptlib.h evp_locl.h m_md4.c m_md5.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h m_md5.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h m_md5.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h m_md5.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h m_md5.o: ../../include/openssl/err.h ../../include/openssl/evp.h -m_md5.o: ../../include/openssl/lhash.h ../../include/openssl/md5.h -m_md5.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -m_md5.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -m_md5.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -m_md5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -m_md5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -m_md5.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -m_md5.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_md5.c +m_md5.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +m_md5.o: ../../include/openssl/md5.h ../../include/openssl/obj_mac.h +m_md5.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +m_md5.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +m_md5.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h +m_md5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +m_md5.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +m_md5.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +m_md5.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +m_md5.o: ../cryptlib.h evp_locl.h m_md5.c m_mdc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h m_mdc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h m_mdc2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h m_mdc2.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h m_mdc2.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h m_mdc2.o: ../../include/openssl/err.h ../../include/openssl/evp.h -m_mdc2.o: ../../include/openssl/lhash.h ../../include/openssl/mdc2.h -m_mdc2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -m_mdc2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -m_mdc2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -m_mdc2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -m_mdc2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -m_mdc2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -m_mdc2.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h -m_mdc2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_mdc2.c -m_sm3.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -m_sm3.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -m_sm3.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -m_sm3.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -m_sm3.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -m_sm3.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -m_sm3.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rsa.h -m_sm3.o: ../../include/openssl/safestack.h ../../include/openssl/sm3.h -m_sm3.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -m_sm3.o: ../cryptlib.h m_sm3.c +m_mdc2.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +m_mdc2.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h +m_mdc2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +m_mdc2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +m_mdc2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h +m_mdc2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +m_mdc2.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +m_mdc2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +m_mdc2.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h +m_mdc2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +m_mdc2.o: ../cryptlib.h evp_locl.h m_mdc2.c m_null.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h m_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h m_null.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h m_null.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h m_null.o: ../../include/openssl/err.h ../../include/openssl/evp.h -m_null.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -m_null.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -m_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -m_null.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -m_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -m_null.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -m_null.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_null.c +m_null.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +m_null.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +m_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +m_null.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +m_null.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +m_null.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +m_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +m_null.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +m_null.o: ../cryptlib.h m_null.c m_ripemd.o: ../../e_os.h ../../include/openssl/asn1.h m_ripemd.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h m_ripemd.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h m_ripemd.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h m_ripemd.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -m_ripemd.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -m_ripemd.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -m_ripemd.o: ../../include/openssl/opensslconf.h +m_ripemd.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +m_ripemd.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +m_ripemd.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h m_ripemd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h m_ripemd.o: ../../include/openssl/pkcs7.h ../../include/openssl/ripemd.h m_ripemd.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -m_ripemd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +m_ripemd.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +m_ripemd.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h m_ripemd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h m_ripemd.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_ripemd.o: m_ripemd.c @@ -612,14 +621,15 @@ m_sha.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h m_sha.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h m_sha.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h m_sha.o: ../../include/openssl/err.h ../../include/openssl/evp.h -m_sha.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -m_sha.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -m_sha.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -m_sha.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -m_sha.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -m_sha.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -m_sha.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -m_sha.o: ../cryptlib.h evp_locl.h m_sha.c +m_sha.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +m_sha.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +m_sha.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +m_sha.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +m_sha.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h +m_sha.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +m_sha.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +m_sha.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +m_sha.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_sha.c m_sha1.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h m_sha1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h m_sha1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h @@ -635,64 +645,85 @@ m_sigver.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h m_sigver.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h m_sigver.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h m_sigver.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -m_sigver.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -m_sigver.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -m_sigver.o: ../../include/openssl/opensslconf.h +m_sigver.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +m_sigver.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +m_sigver.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h m_sigver.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h m_sigver.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -m_sigver.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +m_sigver.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +m_sigver.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h m_sigver.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h m_sigver.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_sigver.o: m_sigver.c +m_sm3.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h +m_sm3.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h +m_sm3.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +m_sm3.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +m_sm3.o: ../../include/openssl/err.h ../../include/openssl/evp.h +m_sm3.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +m_sm3.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +m_sm3.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +m_sm3.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +m_sm3.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +m_sm3.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +m_sm3.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +m_sm3.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +m_sm3.o: ../cryptlib.h m_sm3.c m_wp.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h m_wp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h m_wp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h m_wp.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h m_wp.o: ../../include/openssl/err.h ../../include/openssl/evp.h -m_wp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -m_wp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -m_wp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -m_wp.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -m_wp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -m_wp.o: ../../include/openssl/symhacks.h ../../include/openssl/whrlpool.h -m_wp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -m_wp.o: ../cryptlib.h evp_locl.h m_wp.c +m_wp.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +m_wp.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +m_wp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +m_wp.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +m_wp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +m_wp.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +m_wp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +m_wp.o: ../../include/openssl/whrlpool.h ../../include/openssl/x509.h +m_wp.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_wp.c names.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h names.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h names.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h names.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h names.o: ../../include/openssl/err.h ../../include/openssl/evp.h -names.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -names.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -names.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -names.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -names.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -names.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -names.o: ../../include/openssl/x509_vfy.h ../cryptlib.h names.c +names.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +names.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +names.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +names.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +names.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +names.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +names.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +names.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +names.o: ../cryptlib.h names.c p5_crpt.o: ../../e_os.h ../../include/openssl/asn1.h p5_crpt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h p5_crpt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h p5_crpt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h p5_crpt.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p5_crpt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p5_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p5_crpt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -p5_crpt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -p5_crpt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p5_crpt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p5_crpt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p5_crpt.o: ../cryptlib.h p5_crpt.c +p5_crpt.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +p5_crpt.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +p5_crpt.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +p5_crpt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +p5_crpt.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +p5_crpt.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +p5_crpt.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +p5_crpt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +p5_crpt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p5_crpt.c p5_crpt2.o: ../../e_os.h ../../include/openssl/asn1.h p5_crpt2.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h p5_crpt2.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h p5_crpt2.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h p5_crpt2.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h p5_crpt2.o: ../../include/openssl/evp.h ../../include/openssl/hmac.h -p5_crpt2.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p5_crpt2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +p5_crpt2.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +p5_crpt2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +p5_crpt2.o: ../../include/openssl/opensslconf.h p5_crpt2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h p5_crpt2.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p5_crpt2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +p5_crpt2.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +p5_crpt2.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h p5_crpt2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h p5_crpt2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h p5_crpt2.o: p5_crpt2.c @@ -701,27 +732,31 @@ p_dec.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h p_dec.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h p_dec.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h p_dec.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p_dec.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p_dec.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p_dec.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p_dec.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -p_dec.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -p_dec.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p_dec.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p_dec.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_dec.c +p_dec.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +p_dec.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +p_dec.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +p_dec.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +p_dec.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h +p_dec.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p_dec.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +p_dec.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +p_dec.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +p_dec.o: ../cryptlib.h p_dec.c p_enc.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h p_enc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h p_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h p_enc.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h p_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -p_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -p_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p_enc.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_enc.c +p_enc.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +p_enc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +p_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +p_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +p_enc.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h +p_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p_enc.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +p_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +p_enc.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +p_enc.o: ../cryptlib.h p_enc.c p_lib.o: ../../e_os.h ../../include/openssl/asn1.h p_lib.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h p_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h @@ -730,63 +765,71 @@ p_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h p_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h p_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h p_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -p_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p_lib.o: ../asn1/asn1_locl.h ../cryptlib.h p_lib.c +p_lib.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +p_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +p_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +p_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +p_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h +p_lib.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +p_lib.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +p_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +p_lib.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h +p_lib.o: p_lib.c p_open.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h p_open.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h p_open.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h p_open.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h p_open.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p_open.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p_open.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p_open.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p_open.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -p_open.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p_open.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p_open.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p_open.o: ../cryptlib.h p_open.c +p_open.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +p_open.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +p_open.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +p_open.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +p_open.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h +p_open.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +p_open.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +p_open.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +p_open.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_open.c p_seal.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h p_seal.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h p_seal.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h p_seal.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h p_seal.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p_seal.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p_seal.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p_seal.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -p_seal.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -p_seal.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p_seal.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p_seal.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_seal.c +p_seal.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +p_seal.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +p_seal.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +p_seal.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +p_seal.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h +p_seal.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p_seal.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +p_seal.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +p_seal.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +p_seal.o: ../cryptlib.h p_seal.c p_sign.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h p_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h p_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h p_sign.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h p_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_sign.c +p_sign.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +p_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +p_sign.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +p_sign.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +p_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p_sign.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +p_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +p_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +p_sign.o: ../cryptlib.h p_sign.c p_verify.o: ../../e_os.h ../../include/openssl/asn1.h p_verify.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h p_verify.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h p_verify.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h p_verify.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p_verify.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p_verify.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p_verify.o: ../../include/openssl/opensslconf.h +p_verify.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +p_verify.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +p_verify.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h p_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h p_verify.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +p_verify.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +p_verify.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h p_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h p_verify.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_verify.c pmeth_fn.o: ../../e_os.h ../../include/openssl/asn1.h @@ -816,12 +859,13 @@ pmeth_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h pmeth_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h pmeth_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h pmeth_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pmeth_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pmeth_lib.o: ../../include/openssl/objects.h +pmeth_lib.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +pmeth_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h pmeth_lib.o: ../../include/openssl/opensslconf.h pmeth_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pmeth_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pmeth_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +pmeth_lib.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +pmeth_lib.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h pmeth_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h pmeth_lib.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h pmeth_lib.o: evp_locl.h pmeth_lib.c diff --git a/crypto/evp/e_sms4.c b/crypto/evp/e_sms4.c index 3c94a185..7a2a3e7f 100644 --- a/crypto/evp/e_sms4.c +++ b/crypto/evp/e_sms4.c @@ -348,7 +348,7 @@ const EVP_CIPHER *EVP_sms4_wrap(void) //TODO: EVP_sms4_256_xxx(); - +//TODO: EVP_sms4_ctr_avx2() #endif diff --git a/crypto/evp/p_dec.c b/crypto/evp/p_dec.c index 4e270316..eda21ba0 100644 --- a/crypto/evp/p_dec.c +++ b/crypto/evp/p_dec.c @@ -74,7 +74,6 @@ static int ossl_EVP_PKEY_decrypt_old(unsigned char *key, const unsigned char *ek #ifndef OPENSSL_NO_RSA if (priv->type != EVP_PKEY_RSA) { #endif - EVPerr(EVP_F_EVP_PKEY_DECRYPT_OLD, EVP_R_PUBLIC_KEY_NOT_RSA); #ifndef OPENSSL_NO_RSA goto err; } diff --git a/crypto/hmac/Makefile b/crypto/hmac/Makefile index 52e39e58..e027f67b 100644 --- a/crypto/hmac/Makefile +++ b/crypto/hmac/Makefile @@ -92,12 +92,13 @@ hm_pmeth.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h hm_pmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h hm_pmeth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h hm_pmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -hm_pmeth.o: ../../include/openssl/hmac.h ../../include/openssl/lhash.h -hm_pmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -hm_pmeth.o: ../../include/openssl/opensslconf.h +hm_pmeth.o: ../../include/openssl/hmac.h ../../include/openssl/kdf.h +hm_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +hm_pmeth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h hm_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h hm_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -hm_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +hm_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +hm_pmeth.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h hm_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h hm_pmeth.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h hm_pmeth.o: ../cryptlib.h ../evp/evp_locl.h hm_pmeth.c diff --git a/crypto/kdf/Makefile b/crypto/kdf/Makefile new file mode 100644 index 00000000..7c99c6a5 --- /dev/null +++ b/crypto/kdf/Makefile @@ -0,0 +1,86 @@ +# +# crypto/kdf/Makefile +# + +DIR= kdf +TOP= ../.. +CC= cc +INCLUDES= -I.. -I$(TOP) -I../../include +CFLAG=-g -Wall +MAKEFILE= Makefile +AR= ar r + +CFLAGS= $(INCLUDES) $(CFLAG) + +GENERAL=Makefile +TEST=kdftest.c +APPS= + +LIB=$(TOP)/libcrypto.a +LIBSRC= kdf_x9_63.c +LIBOBJ= kdf_x9_63.o + +SRC= $(LIBSRC) + +EXHEADER= kdf.h +HEADER= $(EXHEADER) + +ALL= $(GENERAL) $(SRC) $(HEADER) + +top: + (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) + +all: lib + +lib: $(LIBOBJ) + $(AR) $(LIB) $(LIBOBJ) + $(RANLIB) $(LIB) || echo Never mind. + @touch lib + +files: + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO + +links: + @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) + @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) + @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) + +install: + @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... + @headerlist="$(EXHEADER)"; for i in $$headerlist; \ + do \ + (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ + done; + +tags: + ctags $(SRC) + +tests: + +lint: + lint -DLINT $(INCLUDES) $(SRC)>fluff + +update: depend + +depend: + @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... + $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) + +dclean: + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + mv -f Makefile.new $(MAKEFILE) + +clean: + rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + +# DO NOT DELETE THIS LINE -- make depend depends on it. + +kdf_x9_63.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +kdf_x9_63.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +kdf_x9_63.o: ../../include/openssl/evp.h ../../include/openssl/obj_mac.h +kdf_x9_63.o: ../../include/openssl/objects.h +kdf_x9_63.o: ../../include/openssl/opensslconf.h +kdf_x9_63.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +kdf_x9_63.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +kdf_x9_63.o: ../../include/openssl/symhacks.h kdf.h kdf_x9_63.c diff --git a/crypto/ecies/kdf.h b/crypto/kdf/kdf.h similarity index 100% rename from crypto/ecies/kdf.h rename to crypto/kdf/kdf.h diff --git a/crypto/ecies/kdf_x9_63.c b/crypto/kdf/kdf_x9_63.c similarity index 90% rename from crypto/ecies/kdf_x9_63.c rename to crypto/kdf/kdf_x9_63.c index 505857a7..5170a852 100644 --- a/crypto/ecies/kdf_x9_63.c +++ b/crypto/kdf/kdf_x9_63.c @@ -1,4 +1,4 @@ -/* crypto/ecies/kdf_x9_63.c */ +/* crypto/kdf/kdf_x9_63.c */ /* ==================================================================== * Copyright (c) 2007 - 2015 The GmSSL Project. All rights reserved. * @@ -76,7 +76,6 @@ static void *x963_kdf(const EVP_MD *md, const void *in, size_t inlen, EVP_MD_CTX_init(&ctx); - //FIXME: it might be wrong while (rlen > 0) { counter_be = cpu_to_be32(counter); counter++; @@ -138,32 +137,47 @@ static void *x963_sha512kdf(const void *in, size_t inlen, return x963_kdf(EVP_sha512(), in, inlen, out, outlen); } +static void *x963_whirlpoolkdf(const void *in, size_t inlen, + void *out, size_t *outlen) +{ + return x963_kdf(EVP_whirlpool(), in, inlen, out, outlen); +} + static void *x963_sm3kdf(const void *in, size_t inlen, void *out, size_t *outlen) { return x963_kdf(EVP_sm3(), in, inlen, out, outlen); } -//FIXME: whirlpool - KDF_FUNC KDF_get_x9_63(const EVP_MD *md) { - if (md == EVP_md5()) + if (md == EVP_md5()) { return x963_md5kdf; - else if (md == EVP_ripemd160()) + + } else if (md == EVP_ripemd160()) { return x963_rmd160kdf; - else if (md == EVP_sha1()) + + } else if (md == EVP_sha1()) { return x963_sha1kdf; - else if (md == EVP_sha224()) + + } else if (md == EVP_sha224()) { return x963_sha224kdf; - else if (md == EVP_sha256()) + + } else if (md == EVP_sha256()) { return x963_sha256kdf; - else if (md == EVP_sha384()) + + } else if (md == EVP_sha384()) { return x963_sha384kdf; - else if (md == EVP_sha512()) + + } else if (md == EVP_sha512()) { return x963_sha512kdf; - else if (md == EVP_sm3()) + + } else if (md == EVP_whirlpool()) { + return x963_whirlpoolkdf; + + } else if (md == EVP_sm3()) { return x963_sm3kdf; + } return NULL; } diff --git a/crypto/ecies/kdftest.c b/crypto/kdf/kdftest.c similarity index 100% rename from crypto/ecies/kdftest.c rename to crypto/kdf/kdftest.c diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index c4772768..85718a43 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -62,12 +62,12 @@ * [including the GNU Public Licence.] */ -#define NUM_NID 1044 -#define NUM_SN 1020 -#define NUM_LN 1020 -#define NUM_OBJ 958 +#define NUM_NID 1045 +#define NUM_SN 1021 +#define NUM_LN 1021 +#define NUM_OBJ 959 -static const unsigned char lvalues[6753]={ +static const unsigned char lvalues[6762]={ 0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 0] OBJ_rsadsi */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 6] OBJ_pkcs */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x02, /* [ 13] OBJ_md2 */ @@ -1020,6 +1020,7 @@ static const unsigned char lvalues[6753]={ 0x2A,0x81,0x1C,0xCF,0x55,0x01,0x83,0x79, /* [6728] OBJ_sm2sign_with_sha224 */ 0x2A,0x81,0x1C,0xCF,0x55,0x01,0x83,0x7A, /* [6736] OBJ_sm2sign_with_sha384 */ 0x2A,0x81,0x1C,0xCF,0x55,0x01,0x83,0x7B, /* [6744] OBJ_sm2sign_with_rmd160 */ +0x2A,0x81,0x1C,0xCF,0x55,0x01,0x82,0x2D,0x65,/* [6752] OBJ_wapip192v1 */ }; static const ASN1_OBJECT nid_objs[NUM_NID]={ @@ -2695,6 +2696,7 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={ 8,&(lvalues[6736]),0}, {"SM2Sign-with-RMD160","sm2sign-with-rmd160",NID_sm2sign_with_rmd160, 8,&(lvalues[6744]),0}, +{"wapip192v1","wapip192v1",NID_wapip192v1,9,&(lvalues[6752]),0}, }; static const unsigned int sn_objs[NUM_SN]={ @@ -3711,6 +3713,7 @@ static const unsigned int sn_objs[NUM_SN]={ 740, /* "wap-wsg-idm-ecid-wtls7" */ 741, /* "wap-wsg-idm-ecid-wtls8" */ 742, /* "wap-wsg-idm-ecid-wtls9" */ +1044, /* "wapip192v1" */ 804, /* "whirlpool" */ 868, /* "x121Address" */ 503, /* "x500UniqueIdentifier" */ @@ -4732,6 +4735,7 @@ static const unsigned int ln_objs[NUM_LN]={ 740, /* "wap-wsg-idm-ecid-wtls7" */ 741, /* "wap-wsg-idm-ecid-wtls8" */ 742, /* "wap-wsg-idm-ecid-wtls9" */ +1044, /* "wapip192v1" */ 804, /* "whirlpool" */ 868, /* "x121Address" */ 503, /* "x500UniqueIdentifier" */ @@ -5394,6 +5398,7 @@ static const unsigned int obj_objs[NUM_OBJ]={ 970, /* OBJ_sm2sign 1 2 156 10197 1 301 1 */ 971, /* OBJ_sm2keyagreement 1 2 156 10197 1 301 2 */ 972, /* OBJ_sm2encrypt 1 2 156 10197 1 301 3 */ +1044, /* OBJ_wapip192v1 1 2 156 10197 1 301 101 */ 1008, /* OBJ_sm9sign 1 2 156 10197 1 302 1 */ 1009, /* OBJ_sm9keyagreement 1 2 156 10197 1 302 2 */ 1010, /* OBJ_sm9encrypt 1 2 156 10197 1 302 3 */ diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h index 908978d3..f119e25c 100644 --- a/crypto/objects/obj_mac.h +++ b/crypto/objects/obj_mac.h @@ -4493,6 +4493,10 @@ #define NID_sm2sign_with_rmd160 1043 #define OBJ_sm2sign_with_rmd160 OBJ_sm_scheme,507L +#define SN_wapip192v1 "wapip192v1" +#define NID_wapip192v1 1044 +#define OBJ_wapip192v1 OBJ_sm_scheme,301L,101L + #define SN_zuc "ZUC" #define LN_zuc "zuc" #define NID_zuc 1000 diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index ed40c23a..c7946cc8 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -1041,3 +1041,4 @@ sm2sign_with_sha512 1040 sm2sign_with_sha224 1041 sm2sign_with_sha384 1042 sm2sign_with_rmd160 1043 +wapip192v1 1044 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 5746b8c1..feb874a2 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1444,6 +1444,8 @@ sm-scheme 505 : SM2Sign-with-SHA224 : sm2sign-with-sha224 sm-scheme 506 : SM2Sign-with-SHA384 : sm2sign-with-sha384 sm-scheme 507 : SM2Sign-with-RMD160 : sm2sign-with-rmd160 +sm-scheme 301 101 : wapip192v1 + # GmSSL ZUC OID sm-scheme 800 : ZUC : zuc diff --git a/crypto/ocsp/Makefile b/crypto/ocsp/Makefile index 96a1b156..444cf5f2 100644 --- a/crypto/ocsp/Makefile +++ b/crypto/ocsp/Makefile @@ -84,12 +84,14 @@ ocsp_asn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h ocsp_asn.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h ocsp_asn.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ocsp_asn.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ocsp_asn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +ocsp_asn.o: ../../include/openssl/err.h ../../include/openssl/evp.h +ocsp_asn.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h ocsp_asn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h ocsp_asn.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h ocsp_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ocsp_asn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ocsp_asn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +ocsp_asn.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ocsp_asn.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h ocsp_asn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h ocsp_asn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h ocsp_asn.o: ocsp_asn.c @@ -99,27 +101,30 @@ ocsp_cl.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h ocsp_cl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ocsp_cl.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h ocsp_cl.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ocsp_cl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ocsp_cl.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h -ocsp_cl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -ocsp_cl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -ocsp_cl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -ocsp_cl.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -ocsp_cl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ocsp_cl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ocsp_cl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -ocsp_cl.o: ../cryptlib.h ocsp_cl.c +ocsp_cl.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +ocsp_cl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +ocsp_cl.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h +ocsp_cl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +ocsp_cl.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h +ocsp_cl.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h +ocsp_cl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +ocsp_cl.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +ocsp_cl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +ocsp_cl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +ocsp_cl.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_cl.c ocsp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h ocsp_err.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h ocsp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h ocsp_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h ocsp_err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ocsp_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ocsp_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ocsp_err.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h +ocsp_err.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +ocsp_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ocsp_err.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h +ocsp_err.o: ../../include/openssl/opensslconf.h ocsp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ocsp_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ocsp_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +ocsp_err.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ocsp_err.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h ocsp_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h ocsp_err.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h ocsp_err.o: ocsp_err.c @@ -129,12 +134,13 @@ ocsp_ext.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h ocsp_ext.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ocsp_ext.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h ocsp_ext.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ocsp_ext.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ocsp_ext.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h -ocsp_ext.o: ../../include/openssl/opensslconf.h +ocsp_ext.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +ocsp_ext.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +ocsp_ext.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h ocsp_ext.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ocsp_ext.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h ocsp_ext.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +ocsp_ext.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h ocsp_ext.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h ocsp_ext.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h ocsp_ext.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_ext.c @@ -144,27 +150,31 @@ ocsp_ht.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h ocsp_ht.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ocsp_ht.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h ocsp_ht.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ocsp_ht.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ocsp_ht.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h -ocsp_ht.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -ocsp_ht.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -ocsp_ht.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -ocsp_ht.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ocsp_ht.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ocsp_ht.o: ../../include/openssl/x509v3.h ocsp_ht.c +ocsp_ht.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +ocsp_ht.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +ocsp_ht.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h +ocsp_ht.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +ocsp_ht.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +ocsp_ht.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ocsp_ht.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +ocsp_ht.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +ocsp_ht.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +ocsp_ht.o: ocsp_ht.c ocsp_lib.o: ../../e_os.h ../../include/openssl/asn1.h ocsp_lib.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h ocsp_lib.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h ocsp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h ocsp_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h ocsp_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ocsp_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ocsp_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ocsp_lib.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h +ocsp_lib.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +ocsp_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ocsp_lib.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h +ocsp_lib.o: ../../include/openssl/opensslconf.h ocsp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ocsp_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h ocsp_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h ocsp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +ocsp_lib.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h ocsp_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h ocsp_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h ocsp_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_lib.c @@ -173,13 +183,15 @@ ocsp_prn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h ocsp_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h ocsp_prn.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h ocsp_prn.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ocsp_prn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ocsp_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ocsp_prn.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h +ocsp_prn.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +ocsp_prn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ocsp_prn.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h +ocsp_prn.o: ../../include/openssl/opensslconf.h ocsp_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ocsp_prn.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h ocsp_prn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ocsp_prn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +ocsp_prn.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ocsp_prn.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h ocsp_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h ocsp_prn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h ocsp_prn.o: ocsp_prn.c @@ -189,13 +201,14 @@ ocsp_srv.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h ocsp_srv.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ocsp_srv.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h ocsp_srv.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ocsp_srv.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ocsp_srv.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h -ocsp_srv.o: ../../include/openssl/opensslconf.h +ocsp_srv.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +ocsp_srv.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +ocsp_srv.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h ocsp_srv.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ocsp_srv.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h ocsp_srv.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h ocsp_srv.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +ocsp_srv.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h ocsp_srv.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h ocsp_srv.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h ocsp_srv.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_srv.c @@ -204,12 +217,14 @@ ocsp_vfy.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h ocsp_vfy.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h ocsp_vfy.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h ocsp_vfy.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ocsp_vfy.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ocsp_vfy.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ocsp_vfy.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h +ocsp_vfy.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +ocsp_vfy.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ocsp_vfy.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h +ocsp_vfy.o: ../../include/openssl/opensslconf.h ocsp_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ocsp_vfy.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ocsp_vfy.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +ocsp_vfy.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ocsp_vfy.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h ocsp_vfy.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h ocsp_vfy.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h ocsp_vfy.o: ocsp_vfy.c diff --git a/crypto/otp/Makefile b/crypto/otp/Makefile index f32ba41b..a9228d19 100644 --- a/crypto/otp/Makefile +++ b/crypto/otp/Makefile @@ -22,8 +22,8 @@ TEST=otptest.c APPS= LIB=$(TOP)/libcrypto.a -LIBSRC=otp.c -LIBOBJ=otp.o +LIBSRC=otp.c otp_err.c +LIBOBJ=otp.o otp_err.o SRC= $(LIBSRC) @@ -79,3 +79,20 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. +otp.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +otp.o: ../../include/openssl/cbcmac.h ../../include/openssl/crypto.h +otp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +otp.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +otp.o: ../../include/openssl/modes.h ../../include/openssl/obj_mac.h +otp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +otp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +otp.o: ../../include/openssl/otp.h ../../include/openssl/safestack.h +otp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +otp.o: ../modes/modes_lcl.h otp.c +otp_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h +otp_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +otp_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h +otp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +otp_err.o: ../../include/openssl/otp.h ../../include/openssl/safestack.h +otp_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +otp_err.o: otp_err.c diff --git a/crypto/otp/a.out b/crypto/otp/a.out deleted file mode 100755 index 7cdc6975..00000000 Binary files a/crypto/otp/a.out and /dev/null differ diff --git a/crypto/otp/otp.c b/crypto/otp/otp.c index ddc44081..0dbb7619 100644 --- a/crypto/otp/otp.c +++ b/crypto/otp/otp.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include "../modes/modes_lcl.h" @@ -51,7 +52,7 @@ int OTP_generate(const OTP_PARAMS *params, const void *event, size_t eventlen, OPENSSL_assert(sizeof(time_t) == 8); if (!check_params(params)) { - fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__); + OTPerr(OTP_F_OTP_GENERATE, OTP_R_INVALID_PARAMS); return 0; } @@ -60,7 +61,7 @@ int OTP_generate(const OTP_PARAMS *params, const void *event, size_t eventlen, idlen = 16; } if (!(id = OPENSSL_malloc(idlen))) { - fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__); + OTPerr(OTP_F_OTP_GENERATE, OTP_R_MALLOC_FAILED); goto end; } bzero(id, idlen); @@ -77,32 +78,41 @@ int OTP_generate(const OTP_PARAMS *params, const void *event, size_t eventlen, if (params->type == NID_sm3) { md = EVP_get_digestbynid(params->type); if (!(mdctx = EVP_MD_CTX_create())) { + OTPerr(OTP_F_OTP_GENERATE, ERR_R_EVP_LIB); goto end; } if (!EVP_DigestInit_ex(mdctx, md, NULL)) { + OTPerr(OTP_F_OTP_GENERATE, ERR_R_EVP_LIB); goto end; } if (!EVP_DigestUpdate(mdctx, key, keylen)) { + OTPerr(OTP_F_OTP_GENERATE, ERR_R_EVP_LIB); goto end; } if (!EVP_DigestUpdate(mdctx, id, idlen)) { + OTPerr(OTP_F_OTP_GENERATE, ERR_R_EVP_LIB); goto end; } if (!EVP_DigestFinal_ex(mdctx, s, (unsigned int *)&slen)) { + OTPerr(OTP_F_OTP_GENERATE, ERR_R_EVP_LIB); goto end; } } else if (params->type == NID_sms4_ecb) { cipher = EVP_get_cipherbynid(params->type); if (!(cmctx = CBCMAC_CTX_new())) { + OTPerr(OTP_F_OTP_GENERATE, ERR_R_CBCMAC_LIB); goto end; } if (!CBCMAC_Init(cmctx, key, keylen, cipher, NULL)) { + OTPerr(OTP_F_OTP_GENERATE, ERR_R_CBCMAC_LIB); goto end; } if (!CBCMAC_Update(cmctx, id, idlen)) { + OTPerr(OTP_F_OTP_GENERATE, ERR_R_CBCMAC_LIB); goto end; } if (!CBCMAC_Final(cmctx, s, &slen)) { + OTPerr(OTP_F_OTP_GENERATE, ERR_R_CBCMAC_LIB); goto end; } } else { diff --git a/crypto/otp/otp.h b/crypto/otp/otp.h index 4b3d482f..d050fe61 100644 --- a/crypto/otp/otp.h +++ b/crypto/otp/otp.h @@ -79,9 +79,23 @@ typedef struct OTP_PARAMS_st { int OTP_generate(const OTP_PARAMS *params, const void *event, size_t eventlen, unsigned int *otp, const unsigned char *key, size_t keylen); +/* BEGIN ERROR CODES */ +/* + * The following lines are auto generated by the script mkerr.pl. Any changes + * made after this point may be overwritten when the script is next run. + */ +void ERR_load_OTP_strings(void); -#ifdef __cplusplus -extern "C" { +/* Error codes for the OTP functions. */ + +/* Function codes. */ +# define OTP_F_OTP_GENERATE 100 + +/* Reason codes. */ +# define OTP_R_INVALID_PARAMS 101 +# define OTP_R_MALLOC_FAILED 100 + +#ifdef __cplusplus +} #endif #endif - diff --git a/crypto/otp/otp_err.c b/crypto/otp/otp_err.c new file mode 100644 index 00000000..a11572ed --- /dev/null +++ b/crypto/otp/otp_err.c @@ -0,0 +1,94 @@ +/* crypto/otp/otp_err.c */ +/* ==================================================================== + * Copyright (c) 1999-2016 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. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * + */ + +/* + * NOTE: this file was auto generated by the mkerr.pl script: any changes + * made to it will be overwritten when the script next updates this file, + * only reason strings will be preserved. + */ + +#include +#include +#include + +/* BEGIN ERROR CODES */ +#ifndef OPENSSL_NO_ERR + +# define ERR_FUNC(func) ERR_PACK(ERR_LIB_OTP,func,0) +# define ERR_REASON(reason) ERR_PACK(ERR_LIB_OTP,0,reason) + +static ERR_STRING_DATA OTP_str_functs[] = { + {ERR_FUNC(OTP_F_OTP_GENERATE), "OTP_generate"}, + {0, NULL} +}; + +static ERR_STRING_DATA OTP_str_reasons[] = { + {ERR_REASON(OTP_R_INVALID_PARAMS), "invalid params"}, + {ERR_REASON(OTP_R_MALLOC_FAILED), "malloc failed"}, + {0, NULL} +}; + +#endif + +void ERR_load_OTP_strings(void) +{ +#ifndef OPENSSL_NO_ERR + + if (ERR_func_error_string(OTP_str_functs[0].error) == NULL) { + ERR_load_strings(0, OTP_str_functs); + ERR_load_strings(0, OTP_str_reasons); + } +#endif +} diff --git a/engines/e_skf.h b/crypto/paillier/pai_lib.c similarity index 100% rename from engines/e_skf.h rename to crypto/paillier/pai_lib.c diff --git a/crypto/paillier/paillier.h b/crypto/paillier/paillier.h index f168f0bd..489c1d67 100644 --- a/crypto/paillier/paillier.h +++ b/crypto/paillier/paillier.h @@ -26,8 +26,7 @@ int PAILLIER_generate_key(PAILLIER *key, int bits); int PAILLIER_check_key(PAILLIER *key); int PAILLIER_encrypt(BIGNUM *out, const BIGNUM *in, PAILLIER *pub_key); int PAILLIER_decrypt(BIGNUM *out, const BIGNUM *in, PAILLIER *pri_key); -int PAILLIER_ciphertext_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, - PAILLIER *pub_key); +int PAILLIER_ciphertext_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, PAILLIER *pub_key); int PAILLIER_ciphertext_scalar_mul(BIGNUM *r, unsigned int k, const BIGNUM *a, PAILLIER *pub_key) diff --git a/crypto/pem/Makefile b/crypto/pem/Makefile index e8173a2c..87267eb8 100644 --- a/crypto/pem/Makefile +++ b/crypto/pem/Makefile @@ -18,10 +18,10 @@ APPS= LIB=$(TOP)/libcrypto.a LIBSRC= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c \ - pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c pem_sm2.c + pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c LIBOBJ= pem_sign.o pem_seal.o pem_info.o pem_lib.o pem_all.o pem_err.o \ - pem_x509.o pem_xaux.o pem_oth.o pem_pk8.o pem_pkey.o pvkfmt.o pem_sm2.o + pem_x509.o pem_xaux.o pem_oth.o pem_pk8.o pem_pkey.o pvkfmt.o SRC= $(LIBSRC) @@ -85,40 +85,46 @@ pem_all.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h pem_all.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h pem_all.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h pem_all.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pem_all.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pem_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pem_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -pem_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -pem_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -pem_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -pem_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pem_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pem_all.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_all.c +pem_all.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +pem_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +pem_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +pem_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +pem_all.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h +pem_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h +pem_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +pem_all.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +pem_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +pem_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +pem_all.o: ../cryptlib.h pem_all.c pem_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h pem_err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h pem_err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h pem_err.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h pem_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pem_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pem_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pem_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pem_err.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -pem_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pem_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pem_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pem_err.o: ../../include/openssl/x509_vfy.h pem_err.c +pem_err.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +pem_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +pem_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +pem_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h +pem_err.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h +pem_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +pem_err.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +pem_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +pem_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +pem_err.o: pem_err.c pem_info.o: ../../e_os.h ../../include/openssl/asn1.h pem_info.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h pem_info.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h pem_info.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h pem_info.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h pem_info.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pem_info.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pem_info.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +pem_info.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +pem_info.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +pem_info.o: ../../include/openssl/opensslconf.h pem_info.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pem_info.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h pem_info.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h pem_info.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +pem_info.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h pem_info.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h pem_info.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h pem_info.o: ../cryptlib.h pem_info.c @@ -129,60 +135,65 @@ pem_lib.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h pem_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h pem_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h pem_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pem_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pem_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pem_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pem_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -pem_lib.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -pem_lib.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -pem_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pem_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -pem_lib.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h -pem_lib.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h -pem_lib.o: pem_lib.c +pem_lib.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +pem_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +pem_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +pem_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h +pem_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h +pem_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h +pem_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +pem_lib.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +pem_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +pem_lib.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h +pem_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +pem_lib.o: ../asn1/asn1_locl.h ../cryptlib.h pem_lib.c pem_oth.o: ../../e_os.h ../../include/openssl/asn1.h pem_oth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h pem_oth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h pem_oth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h pem_oth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pem_oth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pem_oth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pem_oth.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -pem_oth.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -pem_oth.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -pem_oth.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -pem_oth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pem_oth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pem_oth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_oth.c +pem_oth.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +pem_oth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +pem_oth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +pem_oth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +pem_oth.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h +pem_oth.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h +pem_oth.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +pem_oth.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +pem_oth.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +pem_oth.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +pem_oth.o: ../cryptlib.h pem_oth.c pem_pk8.o: ../../e_os.h ../../include/openssl/asn1.h pem_pk8.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h pem_pk8.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h pem_pk8.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h pem_pk8.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pem_pk8.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pem_pk8.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pem_pk8.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -pem_pk8.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -pem_pk8.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h -pem_pk8.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -pem_pk8.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -pem_pk8.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -pem_pk8.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -pem_pk8.o: ../cryptlib.h pem_pk8.c +pem_pk8.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +pem_pk8.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +pem_pk8.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +pem_pk8.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +pem_pk8.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h +pem_pk8.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h +pem_pk8.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h +pem_pk8.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +pem_pk8.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +pem_pk8.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +pem_pk8.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_pk8.c pem_pkey.o: ../../e_os.h ../../include/openssl/asn1.h pem_pkey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h pem_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h pem_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h pem_pkey.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h pem_pkey.o: ../../include/openssl/engine.h ../../include/openssl/err.h -pem_pkey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pem_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pem_pkey.o: ../../include/openssl/opensslconf.h +pem_pkey.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +pem_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +pem_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h pem_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pem_pkey.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h pem_pkey.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h pem_pkey.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -pem_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +pem_pkey.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +pem_pkey.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h pem_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h pem_pkey.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h pem_pkey.o: pem_pkey.c @@ -191,14 +202,15 @@ pem_seal.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h pem_seal.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h pem_seal.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h pem_seal.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pem_seal.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pem_seal.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pem_seal.o: ../../include/openssl/opensslconf.h +pem_seal.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +pem_seal.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +pem_seal.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h pem_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pem_seal.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h pem_seal.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h pem_seal.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -pem_seal.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +pem_seal.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +pem_seal.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h pem_seal.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h pem_seal.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_seal.c pem_sign.o: ../../e_os.h ../../include/openssl/asn1.h @@ -206,13 +218,14 @@ pem_sign.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h pem_sign.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h pem_sign.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h pem_sign.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pem_sign.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pem_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pem_sign.o: ../../include/openssl/opensslconf.h +pem_sign.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +pem_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +pem_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h pem_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pem_sign.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h pem_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h pem_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +pem_sign.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h pem_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h pem_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h pem_sign.o: ../cryptlib.h pem_sign.c @@ -221,13 +234,14 @@ pem_x509.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h pem_x509.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h pem_x509.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h pem_x509.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pem_x509.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pem_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pem_x509.o: ../../include/openssl/opensslconf.h +pem_x509.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +pem_x509.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +pem_x509.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h pem_x509.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pem_x509.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h pem_x509.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pem_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +pem_x509.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +pem_x509.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h pem_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h pem_x509.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_x509.c pem_xaux.o: ../../e_os.h ../../include/openssl/asn1.h @@ -235,13 +249,14 @@ pem_xaux.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h pem_xaux.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h pem_xaux.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h pem_xaux.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pem_xaux.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pem_xaux.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pem_xaux.o: ../../include/openssl/opensslconf.h +pem_xaux.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +pem_xaux.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +pem_xaux.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h pem_xaux.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pem_xaux.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h pem_xaux.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pem_xaux.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +pem_xaux.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +pem_xaux.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h pem_xaux.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h pem_xaux.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_xaux.c pvkfmt.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h @@ -250,12 +265,14 @@ pvkfmt.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h pvkfmt.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h pvkfmt.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h pvkfmt.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pvkfmt.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pvkfmt.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pvkfmt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pvkfmt.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -pvkfmt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -pvkfmt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -pvkfmt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pvkfmt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pvkfmt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pvkfmt.c +pvkfmt.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +pvkfmt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +pvkfmt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +pvkfmt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h +pvkfmt.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h +pvkfmt.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h +pvkfmt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +pvkfmt.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +pvkfmt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +pvkfmt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +pvkfmt.o: ../cryptlib.h pvkfmt.c diff --git a/crypto/pem/pem_sm2.c b/crypto/pem/pem_sm2.c deleted file mode 100644 index c50d4cdb..00000000 --- a/crypto/pem/pem_sm2.c +++ /dev/null @@ -1,270 +0,0 @@ -/* crypto/pem/pem_sm2.c */ -/* ==================================================================== - * Copyright (c) 2016 The GmSSL 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 GmSSL Project. - * (http://gmssl.org/)" - * - * 4. The name "GmSSL Project" must not be used to endorse or promote - * products derived from this software without prior written - * permission. For written permission, please contact - * guanzhi1980@gmail.com. - * - * 5. Products derived from this software may not be called "GmSSL" - * nor may "GmSSL" appear in their names without prior written - * permission of the GmSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the GmSSL Project - * (http://gmssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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. - * ==================================================================== - * - */ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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 acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS 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 AUTHOR OR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ -/* ==================================================================== - * Copyright (c) 1998-2002 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. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - - -#include -#include "cryptlib.h" -#include -#include -#include -#include -#include - - -#ifndef OPENSSL_NO_SM2 -static EC_KEY *pkey_get_sm2key(EVP_PKEY *key, EC_KEY **eckey) -{ - EC_KEY *dtmp; - if (!key) - return NULL; - dtmp = EVP_PKEY_get1_SM2(key); - EVP_PKEY_free(key); - if (!dtmp) - return NULL; - if (eckey) { - EC_KEY_free(*eckey); - *eckey = dtmp; - } -fprintf(stderr, "GMSSL %s %d\n", __FILE__, __LINE__); - - return dtmp; -} - -EC_KEY *PEM_read_bio_SM2PrivateKey(BIO *bp, EC_KEY **key, pem_password_cb *cb, - void *u) -{ - EVP_PKEY *pktmp; - pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u); - return pkey_get_sm2key(pktmp, key); /* will free pktmp */ -} - -IMPLEMENT_PEM_rw_const(SM2PKParameters, EC_GROUP, PEM_STRING_SM2PARAMETERS, - ECPKParameters) -# ifdef OPENSSL_FIPS -int PEM_write_bio_SM2PrivateKey(BIO *bp, EC_KEY *x, const EVP_CIPHER *enc, - unsigned char *kstr, int klen, - pem_password_cb *cb, void *u) -{ - if (FIPS_mode()) { - EVP_PKEY *k; - int ret; - k = EVP_PKEY_new(); - if (!k) - return 0; - EVP_PKEY_set1_EC_KEY(k, x); - - ret = PEM_write_bio_PrivateKey(bp, k, enc, kstr, klen, cb, u); - EVP_PKEY_free(k); - return ret; - } else - return PEM_ASN1_write_bio((i2d_of_void *)i2d_ECPrivateKey, - PEM_STRING_SM2PRIVATEKEY, - bp, x, enc, kstr, klen, cb, u); -} - -# ifndef OPENSSL_NO_FP_API -int PEM_write_SM2PrivateKey(FILE *fp, EC_KEY *x, const EVP_CIPHER *enc, - unsigned char *kstr, int klen, - pem_password_cb *cb, void *u) -{ - if (FIPS_mode()) { - EVP_PKEY *k; - int ret; - k = EVP_PKEY_new(); - if (!k) - return 0; - EVP_PKEY_set1_EC_KEY(k, x); - ret = PEM_write_PrivateKey(fp, k, enc, kstr, klen, cb, u); - EVP_PKEY_free(k); - return ret; - } else - return PEM_ASN1_write((i2d_of_void *)i2d_ECPrivateKey, - PEM_STRING_SM2PRIVATEKEY, - fp, x, enc, kstr, klen, cb, u); -} -# endif - -# else - IMPLEMENT_PEM_write_cb(SM2PrivateKey, EC_KEY, PEM_STRING_SM2PRIVATEKEY, - ECPrivateKey) -# endif -IMPLEMENT_PEM_rw(SM2_PUBKEY, EC_KEY, PEM_STRING_PUBLIC, EC_PUBKEY) -# ifndef OPENSSL_NO_FP_API -EC_KEY *PEM_read_SM2PrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb, - void *u) -{ - EVP_PKEY *pktmp; - pktmp = PEM_read_PrivateKey(fp, NULL, cb, u); - - printf("GMSSL %s %d\n", __FILE__, __LINE__); - - BIO *out = BIO_new_fp(stderr, BIO_NOCLOSE); - EVP_PKEY_print_public(out, pktmp, 0, NULL); - EVP_PKEY_print_private(out, pktmp, 0, NULL); - EVP_PKEY_print_params(out, pktmp, 0, NULL); - - - return pkey_get_sm2key(pktmp, eckey); /* will free pktmp */ -} - -# endif - -#endif - diff --git a/crypto/pkcs12/Makefile b/crypto/pkcs12/Makefile index be5f8c5d..4e2d231b 100644 --- a/crypto/pkcs12/Makefile +++ b/crypto/pkcs12/Makefile @@ -87,39 +87,43 @@ p12_add.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h p12_add.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h p12_add.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h p12_add.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_add.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_add.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_add.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -p12_add.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h -p12_add.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p12_add.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p12_add.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p12_add.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_add.c +p12_add.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +p12_add.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +p12_add.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +p12_add.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +p12_add.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h +p12_add.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p12_add.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +p12_add.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +p12_add.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +p12_add.o: ../cryptlib.h p12_add.c p12_asn.o: ../../e_os.h ../../include/openssl/asn1.h p12_asn.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h p12_asn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h p12_asn.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h p12_asn.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h p12_asn.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p12_asn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p12_asn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p12_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p12_asn.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -p12_asn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p12_asn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p12_asn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p12_asn.o: ../cryptlib.h p12_asn.c +p12_asn.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +p12_asn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +p12_asn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +p12_asn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h +p12_asn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +p12_asn.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +p12_asn.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +p12_asn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +p12_asn.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_asn.c p12_attr.o: ../../e_os.h ../../include/openssl/asn1.h p12_attr.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h p12_attr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h p12_attr.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h p12_attr.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_attr.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_attr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_attr.o: ../../include/openssl/opensslconf.h +p12_attr.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +p12_attr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +p12_attr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h p12_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h p12_attr.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h p12_attr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p12_attr.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h p12_attr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h p12_attr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h p12_attr.o: ../cryptlib.h p12_attr.c @@ -128,12 +132,13 @@ p12_crpt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h p12_crpt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h p12_crpt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h p12_crpt.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_crpt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_crpt.o: ../../include/openssl/opensslconf.h +p12_crpt.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +p12_crpt.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +p12_crpt.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h p12_crpt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h p12_crpt.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h p12_crpt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p12_crpt.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h p12_crpt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h p12_crpt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h p12_crpt.o: ../cryptlib.h p12_crpt.c @@ -142,25 +147,28 @@ p12_crt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h p12_crt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h p12_crt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h p12_crt.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_crt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_crt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_crt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -p12_crt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h -p12_crt.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p12_crt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p12_crt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p12_crt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_crt.c +p12_crt.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +p12_crt.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +p12_crt.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +p12_crt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +p12_crt.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h +p12_crt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p12_crt.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +p12_crt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +p12_crt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +p12_crt.o: ../cryptlib.h p12_crt.c p12_decr.o: ../../e_os.h ../../include/openssl/asn1.h p12_decr.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h p12_decr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h p12_decr.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h p12_decr.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_decr.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_decr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_decr.o: ../../include/openssl/opensslconf.h +p12_decr.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +p12_decr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +p12_decr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h p12_decr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h p12_decr.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h p12_decr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p12_decr.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h p12_decr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h p12_decr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h p12_decr.o: ../cryptlib.h p12_decr.c @@ -169,12 +177,13 @@ p12_init.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h p12_init.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h p12_init.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h p12_init.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_init.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_init.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_init.o: ../../include/openssl/opensslconf.h +p12_init.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +p12_init.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +p12_init.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h p12_init.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h p12_init.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h p12_init.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p12_init.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h p12_init.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h p12_init.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h p12_init.o: ../cryptlib.h p12_init.c @@ -184,25 +193,27 @@ p12_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h p12_key.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h p12_key.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h p12_key.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p12_key.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p12_key.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p12_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p12_key.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -p12_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p12_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p12_key.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p12_key.o: ../cryptlib.h p12_key.c +p12_key.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +p12_key.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +p12_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +p12_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h +p12_key.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +p12_key.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +p12_key.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +p12_key.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +p12_key.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_key.c p12_kiss.o: ../../e_os.h ../../include/openssl/asn1.h p12_kiss.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h p12_kiss.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h p12_kiss.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h p12_kiss.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_kiss.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_kiss.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_kiss.o: ../../include/openssl/opensslconf.h +p12_kiss.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +p12_kiss.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +p12_kiss.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h p12_kiss.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h p12_kiss.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h p12_kiss.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p12_kiss.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h p12_kiss.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h p12_kiss.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h p12_kiss.o: ../cryptlib.h p12_kiss.c @@ -212,12 +223,14 @@ p12_mutl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h p12_mutl.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h p12_mutl.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h p12_mutl.o: ../../include/openssl/evp.h ../../include/openssl/hmac.h -p12_mutl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p12_mutl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +p12_mutl.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +p12_mutl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +p12_mutl.o: ../../include/openssl/opensslconf.h p12_mutl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h p12_mutl.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h p12_mutl.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -p12_mutl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +p12_mutl.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +p12_mutl.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h p12_mutl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h p12_mutl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_mutl.c p12_npas.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h @@ -225,12 +238,14 @@ p12_npas.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h p12_npas.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h p12_npas.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h p12_npas.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p12_npas.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p12_npas.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +p12_npas.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +p12_npas.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +p12_npas.o: ../../include/openssl/opensslconf.h p12_npas.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h p12_npas.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h p12_npas.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h p12_npas.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p12_npas.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h p12_npas.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h p12_npas.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h p12_npas.o: p12_npas.c @@ -239,50 +254,57 @@ p12_p8d.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h p12_p8d.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h p12_p8d.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h p12_p8d.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_p8d.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_p8d.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_p8d.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -p12_p8d.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h -p12_p8d.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p12_p8d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p12_p8d.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p12_p8d.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_p8d.c +p12_p8d.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +p12_p8d.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +p12_p8d.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +p12_p8d.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +p12_p8d.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h +p12_p8d.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p12_p8d.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +p12_p8d.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +p12_p8d.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +p12_p8d.o: ../cryptlib.h p12_p8d.c p12_p8e.o: ../../e_os.h ../../include/openssl/asn1.h p12_p8e.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h p12_p8e.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h p12_p8e.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h p12_p8e.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_p8e.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_p8e.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_p8e.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -p12_p8e.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h -p12_p8e.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p12_p8e.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p12_p8e.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p12_p8e.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_p8e.c +p12_p8e.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +p12_p8e.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +p12_p8e.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +p12_p8e.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +p12_p8e.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h +p12_p8e.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p12_p8e.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +p12_p8e.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +p12_p8e.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +p12_p8e.o: ../cryptlib.h p12_p8e.c p12_utl.o: ../../e_os.h ../../include/openssl/asn1.h p12_utl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h p12_utl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h p12_utl.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h p12_utl.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_utl.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_utl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_utl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -p12_utl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h -p12_utl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p12_utl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p12_utl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p12_utl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_utl.c +p12_utl.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +p12_utl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +p12_utl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +p12_utl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +p12_utl.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h +p12_utl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +p12_utl.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +p12_utl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +p12_utl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +p12_utl.o: ../cryptlib.h p12_utl.c pk12err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h pk12err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h pk12err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h pk12err.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h pk12err.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pk12err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pk12err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pk12err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pk12err.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -pk12err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -pk12err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -pk12err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -pk12err.o: pk12err.c +pk12err.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +pk12err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +pk12err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +pk12err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h +pk12err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +pk12err.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +pk12err.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +pk12err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +pk12err.o: ../../include/openssl/x509_vfy.h pk12err.c diff --git a/crypto/pkcs7/Makefile b/crypto/pkcs7/Makefile index decf5e02..0e5c3e09 100644 --- a/crypto/pkcs7/Makefile +++ b/crypto/pkcs7/Makefile @@ -95,11 +95,13 @@ pk7_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h pk7_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h pk7_asn1.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h pk7_asn1.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pk7_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pk7_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +pk7_asn1.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +pk7_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +pk7_asn1.o: ../../include/openssl/opensslconf.h pk7_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pk7_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pk7_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +pk7_asn1.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +pk7_asn1.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h pk7_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h pk7_asn1.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pk7_asn1.c pk7_attr.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h @@ -107,13 +109,14 @@ pk7_attr.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h pk7_attr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h pk7_attr.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h pk7_attr.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pk7_attr.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pk7_attr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pk7_attr.o: ../../include/openssl/opensslconf.h +pk7_attr.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +pk7_attr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +pk7_attr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h pk7_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pk7_attr.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h pk7_attr.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pk7_attr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +pk7_attr.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +pk7_attr.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h pk7_attr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h pk7_attr.o: ../../include/openssl/x509_vfy.h pk7_attr.c pk7_doit.o: ../../e_os.h ../../include/openssl/asn1.h @@ -122,11 +125,13 @@ pk7_doit.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h pk7_doit.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h pk7_doit.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h pk7_doit.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pk7_doit.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pk7_doit.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +pk7_doit.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +pk7_doit.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +pk7_doit.o: ../../include/openssl/opensslconf.h pk7_doit.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pk7_doit.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h pk7_doit.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +pk7_doit.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h pk7_doit.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h pk7_doit.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h pk7_doit.o: ../../include/openssl/x509v3.h ../cryptlib.h pk7_doit.c @@ -135,25 +140,28 @@ pk7_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h pk7_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h pk7_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h pk7_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pk7_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pk7_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pk7_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -pk7_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -pk7_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -pk7_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -pk7_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -pk7_lib.o: ../asn1/asn1_locl.h ../cryptlib.h pk7_lib.c +pk7_lib.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +pk7_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +pk7_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +pk7_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +pk7_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +pk7_lib.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +pk7_lib.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +pk7_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +pk7_lib.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h +pk7_lib.o: pk7_lib.c pk7_mime.o: ../../e_os.h ../../include/openssl/asn1.h pk7_mime.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h pk7_mime.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h pk7_mime.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h pk7_mime.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pk7_mime.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pk7_mime.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pk7_mime.o: ../../include/openssl/opensslconf.h +pk7_mime.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +pk7_mime.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +pk7_mime.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h pk7_mime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pk7_mime.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h pk7_mime.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +pk7_mime.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h pk7_mime.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h pk7_mime.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h pk7_mime.o: ../cryptlib.h pk7_mime.c @@ -163,12 +171,13 @@ pk7_smime.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h pk7_smime.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h pk7_smime.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h pk7_smime.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pk7_smime.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pk7_smime.o: ../../include/openssl/objects.h +pk7_smime.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +pk7_smime.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h pk7_smime.o: ../../include/openssl/opensslconf.h pk7_smime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pk7_smime.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pk7_smime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +pk7_smime.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +pk7_smime.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h pk7_smime.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h pk7_smime.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h pk7_smime.o: ../cryptlib.h pk7_smime.c diff --git a/crypto/rand/Makefile b/crypto/rand/Makefile index df44369a..ff502995 100644 --- a/crypto/rand/Makefile +++ b/crypto/rand/Makefile @@ -105,11 +105,13 @@ rand_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h rand_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h rand_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h rand_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -rand_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -rand_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +rand_lib.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +rand_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +rand_lib.o: ../../include/openssl/opensslconf.h rand_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h rand_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h rand_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +rand_lib.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h rand_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h rand_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h rand_lib.o: ../cryptlib.h rand_lib.c diff --git a/crypto/rsa/Makefile b/crypto/rsa/Makefile index e292e84d..3d84ce57 100644 --- a/crypto/rsa/Makefile +++ b/crypto/rsa/Makefile @@ -89,12 +89,13 @@ rsa_ameth.o: ../../include/openssl/cms.h ../../include/openssl/crypto.h rsa_ameth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h rsa_ameth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h rsa_ameth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -rsa_ameth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -rsa_ameth.o: ../../include/openssl/objects.h +rsa_ameth.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +rsa_ameth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h rsa_ameth.o: ../../include/openssl/opensslconf.h rsa_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h rsa_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h rsa_ameth.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +rsa_ameth.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h rsa_ameth.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h rsa_ameth.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h rsa_ameth.o: ../asn1/asn1_locl.h ../cryptlib.h rsa_ameth.c @@ -104,12 +105,13 @@ rsa_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h rsa_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h rsa_asn1.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h rsa_asn1.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -rsa_asn1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -rsa_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -rsa_asn1.o: ../../include/openssl/opensslconf.h +rsa_asn1.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +rsa_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +rsa_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h rsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h rsa_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h rsa_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +rsa_asn1.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h rsa_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h rsa_asn1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h rsa_asn1.o: ../cryptlib.h rsa_asn1.c @@ -127,13 +129,14 @@ rsa_crpt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h rsa_crpt.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h rsa_crpt.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h rsa_crpt.o: ../../include/openssl/engine.h ../../include/openssl/err.h -rsa_crpt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -rsa_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -rsa_crpt.o: ../../include/openssl/opensslconf.h +rsa_crpt.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +rsa_crpt.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +rsa_crpt.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h rsa_crpt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h rsa_crpt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h rsa_crpt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -rsa_crpt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +rsa_crpt.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +rsa_crpt.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h rsa_crpt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h rsa_crpt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h rsa_crpt.c rsa_depr.o: ../../e_os.h ../../include/openssl/asn1.h @@ -176,15 +179,16 @@ rsa_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h rsa_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h rsa_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h rsa_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h -rsa_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -rsa_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -rsa_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -rsa_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -rsa_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h -rsa_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -rsa_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rsa_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -rsa_lib.o: ../cryptlib.h rsa_lib.c +rsa_lib.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +rsa_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +rsa_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +rsa_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +rsa_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h +rsa_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h +rsa_lib.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +rsa_lib.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +rsa_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +rsa_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h rsa_lib.c rsa_none.o: ../../e_os.h ../../include/openssl/asn1.h rsa_none.o: ../../include/openssl/bio.h ../../include/openssl/bn.h rsa_none.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h @@ -232,12 +236,14 @@ rsa_pmeth.o: ../../include/openssl/cms.h ../../include/openssl/conf.h rsa_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h rsa_pmeth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h rsa_pmeth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -rsa_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -rsa_pmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +rsa_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +rsa_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +rsa_pmeth.o: ../../include/openssl/objects.h rsa_pmeth.o: ../../include/openssl/opensslconf.h rsa_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h rsa_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h rsa_pmeth.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +rsa_pmeth.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h rsa_pmeth.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h rsa_pmeth.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h rsa_pmeth.o: ../../include/openssl/x509v3.h ../cryptlib.h ../evp/evp_locl.h @@ -269,11 +275,13 @@ rsa_saos.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h rsa_saos.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h rsa_saos.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h rsa_saos.o: ../../include/openssl/err.h ../../include/openssl/evp.h -rsa_saos.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -rsa_saos.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +rsa_saos.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +rsa_saos.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +rsa_saos.o: ../../include/openssl/opensslconf.h rsa_saos.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h rsa_saos.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h rsa_saos.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +rsa_saos.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h rsa_saos.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h rsa_saos.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h rsa_saos.o: ../cryptlib.h rsa_saos.c @@ -283,11 +291,13 @@ rsa_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h rsa_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h rsa_sign.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h rsa_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h -rsa_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -rsa_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +rsa_sign.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +rsa_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +rsa_sign.o: ../../include/openssl/opensslconf.h rsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h rsa_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h rsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +rsa_sign.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h rsa_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h rsa_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h rsa_sign.o: ../cryptlib.h rsa_locl.h rsa_sign.c diff --git a/crypto/skf/Makefile b/crypto/skf/Makefile new file mode 100644 index 00000000..c450745e --- /dev/null +++ b/crypto/skf/Makefile @@ -0,0 +1,244 @@ +# +# OpenSSL/crypto/skf/Makefile +# + +DIR= skf +TOP= ../.. +CC= cc +INCLUDES= +CFLAG=-g +MAKEFILE= Makefile +AR= ar r + +CFLAGS= $(INCLUDES) $(CFLAG) + +GENERAL=Makefile +TEST= +APPS= + +LIB=$(TOP)/libcrypto.a +LIBSRC= skf_dev.c skf_token.c skf_dgst.c skf_ec.c skf_enc.c \ + skf_err.c skf_errstr.c skf_handle.c skf_mac.c skf_rand.c \ + skf_rsa.c skf_sesskey.c +LIBOBJ= skf_dev.o skf_token.o skf_dgst.o skf_ec.o skf_enc.o \ + skf_err.o skf_errstr.o skf_handle.o skf_mac.o skf_rand.o \ + skf_rsa.o skf_sesskey.o + +SRC= $(LIBSRC) + +EXHEADER= skf.h skf_ex.h +HEADER= skf_lcl.h $(EXHEADER) + +ALL= $(GENERAL) $(SRC) $(HEADER) + +top: + (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) + +all: lib + +lib: $(LIBOBJ) + $(AR) $(LIB) $(LIBOBJ) + $(RANLIB) $(LIB) || echo Never mind. + @touch lib + +files: + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO + +links: + @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) + @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) + @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) + +install: + @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... + @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ + do \ + (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ + done; + +tags: + ctags $(SRC) + +tests: + +lint: + lint -DLINT $(INCLUDES) $(SRC)>fluff + +depend: + @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... + $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) + +dclean: + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + mv -f Makefile.new $(MAKEFILE) + +clean: + rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + +# DO NOT DELETE THIS LINE -- make depend depends on it. + +skf_dev.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +skf_dev.o: ../../include/openssl/buffer.h ../../include/openssl/cbcmac.h +skf_dev.o: ../../include/openssl/cmac.h ../../include/openssl/crypto.h +skf_dev.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +skf_dev.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +skf_dev.o: ../../include/openssl/err.h ../../include/openssl/evp.h +skf_dev.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +skf_dev.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +skf_dev.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +skf_dev.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +skf_dev.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +skf_dev.o: ../../include/openssl/skf.h ../../include/openssl/skf_ex.h +skf_dev.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +skf_dev.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +skf_dev.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +skf_dev.o: skf_dev.c skf_lcl.h +skf_dgst.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +skf_dgst.o: ../../include/openssl/buffer.h ../../include/openssl/cbcmac.h +skf_dgst.o: ../../include/openssl/cmac.h ../../include/openssl/crypto.h +skf_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +skf_dgst.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +skf_dgst.o: ../../include/openssl/err.h ../../include/openssl/evp.h +skf_dgst.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +skf_dgst.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +skf_dgst.o: ../../include/openssl/opensslconf.h +skf_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +skf_dgst.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +skf_dgst.o: ../../include/openssl/sha.h ../../include/openssl/skf.h +skf_dgst.o: ../../include/openssl/skf_ex.h ../../include/openssl/sm2.h +skf_dgst.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +skf_dgst.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +skf_dgst.o: ../../include/openssl/x509_vfy.h skf_dgst.c skf_lcl.h +skf_ec.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +skf_ec.o: ../../include/openssl/buffer.h ../../include/openssl/cbcmac.h +skf_ec.o: ../../include/openssl/cmac.h ../../include/openssl/crypto.h +skf_ec.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +skf_ec.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +skf_ec.o: ../../include/openssl/err.h ../../include/openssl/evp.h +skf_ec.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +skf_ec.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +skf_ec.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +skf_ec.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +skf_ec.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +skf_ec.o: ../../include/openssl/skf.h ../../include/openssl/skf_ex.h +skf_ec.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +skf_ec.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +skf_ec.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +skf_ec.o: skf_ec.c skf_lcl.h +skf_enc.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +skf_enc.o: ../../include/openssl/buffer.h ../../include/openssl/cbcmac.h +skf_enc.o: ../../include/openssl/cmac.h ../../include/openssl/crypto.h +skf_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +skf_enc.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +skf_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h +skf_enc.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +skf_enc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +skf_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +skf_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +skf_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +skf_enc.o: ../../include/openssl/skf.h ../../include/openssl/skf_ex.h +skf_enc.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +skf_enc.o: ../../include/openssl/sms4.h ../../include/openssl/stack.h +skf_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +skf_enc.o: ../../include/openssl/x509_vfy.h skf_enc.c skf_lcl.h +skf_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +skf_err.o: ../../include/openssl/buffer.h ../../include/openssl/cbcmac.h +skf_err.o: ../../include/openssl/cmac.h ../../include/openssl/crypto.h +skf_err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +skf_err.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +skf_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h +skf_err.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +skf_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +skf_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +skf_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +skf_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +skf_err.o: ../../include/openssl/skf.h ../../include/openssl/skf_ex.h +skf_err.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +skf_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +skf_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +skf_err.o: skf_err.c +skf_errstr.o: ../../include/openssl/skf.h skf_errstr.c +skf_handle.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +skf_handle.o: ../../include/openssl/buffer.h ../../include/openssl/cbcmac.h +skf_handle.o: ../../include/openssl/cmac.h ../../include/openssl/crypto.h +skf_handle.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +skf_handle.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +skf_handle.o: ../../include/openssl/err.h ../../include/openssl/evp.h +skf_handle.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +skf_handle.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +skf_handle.o: ../../include/openssl/opensslconf.h +skf_handle.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +skf_handle.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +skf_handle.o: ../../include/openssl/sha.h ../../include/openssl/skf.h +skf_handle.o: ../../include/openssl/skf_ex.h ../../include/openssl/sm2.h +skf_handle.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +skf_handle.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +skf_handle.o: ../../include/openssl/x509_vfy.h skf_handle.c skf_lcl.h +skf_mac.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +skf_mac.o: ../../include/openssl/buffer.h ../../include/openssl/cbcmac.h +skf_mac.o: ../../include/openssl/cmac.h ../../include/openssl/crypto.h +skf_mac.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +skf_mac.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +skf_mac.o: ../../include/openssl/err.h ../../include/openssl/evp.h +skf_mac.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +skf_mac.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +skf_mac.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +skf_mac.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +skf_mac.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +skf_mac.o: ../../include/openssl/skf.h ../../include/openssl/skf_ex.h +skf_mac.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +skf_mac.o: ../../include/openssl/sms4.h ../../include/openssl/stack.h +skf_mac.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +skf_mac.o: ../../include/openssl/x509_vfy.h skf_lcl.h skf_mac.c +skf_rand.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +skf_rand.o: ../../include/openssl/buffer.h ../../include/openssl/cbcmac.h +skf_rand.o: ../../include/openssl/cmac.h ../../include/openssl/crypto.h +skf_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +skf_rand.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +skf_rand.o: ../../include/openssl/err.h ../../include/openssl/evp.h +skf_rand.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +skf_rand.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +skf_rand.o: ../../include/openssl/opensslconf.h +skf_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +skf_rand.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h +skf_rand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +skf_rand.o: ../../include/openssl/skf.h ../../include/openssl/skf_ex.h +skf_rand.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +skf_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +skf_rand.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +skf_rand.o: skf_lcl.h skf_rand.c +skf_rsa.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +skf_rsa.o: ../../include/openssl/buffer.h ../../include/openssl/cbcmac.h +skf_rsa.o: ../../include/openssl/cmac.h ../../include/openssl/crypto.h +skf_rsa.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +skf_rsa.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +skf_rsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h +skf_rsa.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +skf_rsa.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +skf_rsa.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +skf_rsa.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +skf_rsa.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h +skf_rsa.o: ../../include/openssl/sha.h ../../include/openssl/skf.h +skf_rsa.o: ../../include/openssl/skf_ex.h ../../include/openssl/sm2.h +skf_rsa.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +skf_rsa.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +skf_rsa.o: ../../include/openssl/x509_vfy.h skf_lcl.h skf_rsa.c +skf_sesskey.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +skf_sesskey.o: ../../include/openssl/buffer.h ../../include/openssl/cbcmac.h +skf_sesskey.o: ../../include/openssl/cmac.h ../../include/openssl/crypto.h +skf_sesskey.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +skf_sesskey.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +skf_sesskey.o: ../../include/openssl/err.h ../../include/openssl/evp.h +skf_sesskey.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +skf_sesskey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +skf_sesskey.o: ../../include/openssl/opensslconf.h +skf_sesskey.o: ../../include/openssl/opensslv.h +skf_sesskey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +skf_sesskey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +skf_sesskey.o: ../../include/openssl/skf.h ../../include/openssl/skf_ex.h +skf_sesskey.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +skf_sesskey.o: ../../include/openssl/sms4.h ../../include/openssl/stack.h +skf_sesskey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +skf_sesskey.o: ../../include/openssl/x509_vfy.h skf_lcl.h skf_sesskey.c +skf_token.o: ../../include/openssl/skf.h skf_token.c diff --git a/crypto/skf/skf.h b/crypto/skf/skf.h index c63d1627..5e11b404 100644 --- a/crypto/skf/skf.h +++ b/crypto/skf/skf.h @@ -48,7 +48,9 @@ * ==================================================================== * */ - +/* This header file is from the official specification with minor + * modification. + */ #ifndef HEADER_SKF_H #define HEADER_SKF_H @@ -150,7 +152,7 @@ typedef HANDLE HCONTAINER; extern "C" { #endif - + typedef struct Struct_Version{ BYTE major; BYTE minor; @@ -247,12 +249,12 @@ typedef struct Struct_FILEATTRIBUTE { ULONG WriteRights; } FILEATTRIBUTE, *PFILEATTRIBUTE; - + ULONG DEVAPI SKF_WaitForDevEvent(LPSTR szDevName, ULONG *pulDevNameLen, ULONG *pulEvent); -ULONG DEVAPI SKF_CancelWaitForDevEvent(); +ULONG DEVAPI SKF_CancelWaitForDevEvent(void); ULONG DEVAPI SKF_EnumDev(BOOL bPresent, LPSTR szNameList, @@ -305,39 +307,39 @@ ULONG DEVAPI SKF_ChangePIN(HAPPLICATION hApplication, LONG DEVAPI SKF_GetPINInfo(HAPPLICATION hApplication, ULONG ulPINType, - ULONG *pulMaxRetryCount, - ULONG *pulRemainRetryCount, + ULONG *pulMaxRetryCount, + ULONG *pulRemainRetryCount, BOOL *pbDefaultPin); ULONG DEVAPI SKF_VerifyPIN(HAPPLICATION hApplication, ULONG ulPINType, - LPSTR szPIN, + LPSTR szPIN, ULONG *pulRetryCount); ULONG DEVAPI SKF_UnblockPIN(HAPPLICATION hApplication, LPSTR szAdminPIN, - LPSTR szNewUserPIN, + LPSTR szNewUserPIN, ULONG *pulRetryCount); ULONG DEVAPI SKF_ClearSecureState(HAPPLICATION hApplication); ULONG DEVAPI SKF_CreateApplication(DEVHANDLE hDev, LPSTR szAppName, - LPSTR szAdminPin, + LPSTR szAdminPin, DWORD dwAdminPinRetryCount, - LPSTR szUserPin, + LPSTR szUserPin, DWORD dwUserPinRetryCount, - DWORD dwCreateFileRights, + DWORD dwCreateFileRights, HAPPLICATION *phApplication); ULONG DEVAPI SKF_EnumApplication(DEVHANDLE hDev, LPSTR szAppName, ULONG *pulSize); -ULONG DEVAPI SKF_DeleteApplication(DEVHANDLE hDev, +ULONG DEVAPI SKF_DeleteApplication(DEVHANDLE hDev, LPSTR szAppName); -ULONG DEVAPI SKF_OpenApplication(DEVHANDLE hDev, +ULONG DEVAPI SKF_OpenApplication(DEVHANDLE hDev, LPSTR szAppName, HAPPLICATION *phApplication); @@ -345,14 +347,14 @@ ULONG DEVAPI SKF_CloseApplication(HAPPLICATION hApplication); ULONG DEVAPI SKF_CreateFile(HAPPLICATION hApplication, LPSTR szFileName, - ULONG ulFileSize, + ULONG ulFileSize, ULONG ulReadRights, ULONG ulWriteRights); ULONG DEVAPI SKF_DeleteFile(HAPPLICATION hApplication, LPSTR szFileName); -ULONG DEVAPI SKF_EnumFiles(HAPPLICATION hApplication, +ULONG DEVAPI SKF_EnumFiles(HAPPLICATION hApplication, LPSTR szFileList, ULONG *pulSize); @@ -362,14 +364,14 @@ ULONG DEVAPI SKF_GetFileInfo(HAPPLICATION hApplication, ULONG DEVAPI SKF_ReadFile(HAPPLICATION hApplication, LPSTR szFileName, - ULONG ulOffset, - ULONG ulSize, - BYTE *pbOutData, + ULONG ulOffset, + ULONG ulSize, + BYTE *pbOutData, ULONG *pulOutLen); -ULONG DEVAPI SKF_WriteFile(HAPPLICATION hApplication, +ULONG DEVAPI SKF_WriteFile(HAPPLICATION hApplication, LPSTR szFileName, - ULONG ulOffset, + ULONG ulOffset, BYTE *pbData, ULONG ulSize); @@ -377,7 +379,7 @@ ULONG DEVAPI SKF_CreateContainer(HAPPLICATION hApplication, LPSTR szContainerName, HCONTAINER *phContainer); -ULONG DEVAPI SKF_DeleteContainer(HAPPLICATION hApplication, +ULONG DEVAPI SKF_DeleteContainer(HAPPLICATION hApplication, LPSTR szContainerName); ULONG DEVAPI SKF_EnumContainer(HAPPLICATION hApplication, @@ -399,7 +401,7 @@ ULONG DEVAPI SKF_CloseContainer(HCONTAINER hContainer); ULONG DEVAPI SKF_GetContainerType(HCONTAINER hContainer, ULONG *pulContainerType); -ULONG DEVAPI SKF_ImportCertificate(HCONTAINER hContainer, +ULONG DEVAPI SKF_ImportCertificate(HCONTAINER hContainer, BOOL bExportSignKey, BYTE *pbCert, ULONG ulCertLen); @@ -409,7 +411,7 @@ ULONG DEVAPI SKF_ExportCertificate(HCONTAINER hContainer, BYTE *pbCert, ULONG *pulCertLen); -ULONG DEVAPI SKF_ExportPublicKey(HCONTAINER hContainer, +ULONG DEVAPI SKF_ExportPublicKey(HCONTAINER hContainer, BOOL bSignFlag, BYTE *pbBlob, ULONG *pulBlobLen); @@ -418,42 +420,42 @@ ULONG DEVAPI SKF_GenRandom(DEVHANDLE hDev, BYTE *pbRandom, ULONG ulRandomLen); -ULONG DEVAPI SKF_GenExtRSAKey(DEVHANDLE hDev, +ULONG DEVAPI SKF_GenExtRSAKey(DEVHANDLE hDev, ULONG ulBitsLen, RSAPRIVATEKEYBLOB *pBlob); -ULONG DEVAPI SKF_GenRSAKeyPair(HCONTAINER hContainer, +ULONG DEVAPI SKF_GenRSAKeyPair(HCONTAINER hContainer, ULONG ulBitsLen, RSAPUBLICKEYBLOB *pBlob); -ULONG DEVAPI SKF_ImportRSAKeyPair(HCONTAINER hContainer, +ULONG DEVAPI SKF_ImportRSAKeyPair(HCONTAINER hContainer, ULONG ulSymAlgId, BYTE *pbWrappedKey, ULONG ulWrappedKeyLen, BYTE *pbEncryptedData, ULONG ulEncryptedDataLen); -ULONG DEVAPI SKF_RSASignData(HCONTAINER hContainer, +ULONG DEVAPI SKF_RSASignData(HCONTAINER hContainer, BYTE *pbData, ULONG ulDataLen, BYTE *pbSignature, ULONG *pulSignLen); -ULONG DEVAPI SKF_RSAVerify(DEVHANDLE hDev, +ULONG DEVAPI SKF_RSAVerify(DEVHANDLE hDev, RSAPUBLICKEYBLOB *pRSAPubKeyBlob, BYTE *pbData, ULONG ulDataLen, - BYTE *pbSignature, + BYTE *pbSignature, ULONG ulSignLen); -ULONG DEVAPI SKF_RSAExportSessionKey(HCONTAINER hContainer, +ULONG DEVAPI SKF_RSAExportSessionKey(HCONTAINER hContainer, ULONG ulAlgId, RSAPUBLICKEYBLOB *pPubKey, BYTE *pbData, ULONG *pulDataLen, HANDLE *phSessionKey); -ULONG DEVAPI SKF_ExtRSAPubKeyOperation(DEVHANDLE hDev, +ULONG DEVAPI SKF_ExtRSAPubKeyOperation(DEVHANDLE hDev, RSAPUBLICKEYBLOB *pRSAPubKeyBlob, BYTE *pbInput, ULONG ulInputLen, @@ -482,7 +484,7 @@ ULONG DEVAPI SKF_ECCSignData(HCONTAINER hContainer, ULONG DEVAPI SKF_ECCVerify(DEVHANDLE hDev, ECCPUBLICKEYBLOB *pECCPubKeyBlob, BYTE *pbData, - ULONG ulDataLen, + ULONG ulDataLen, ECCSIGNATUREBLOB *pSignature); ULONG DEVAPI SKF_ECCExportSessionKey(HCONTAINER hContainer, @@ -522,7 +524,7 @@ ULONG DEVAPI SKF_GenerateAgreementDataWithECC(HCONTAINER hContainer, ULONG ulIDLen, HANDLE *phAgreementHandle); -ULONG DEVAPI SKF_GenerateAgreementDataAndKeyWithECC(HANDLE hContainer, +ULONG DEVAPI SKF_GenerateAgreementDataAndKeyWithECC(HANDLE hContainer, ULONG ulAlgId, ECCPUBLICKEYBLOB *pSponsorECCPubKeyBlob, ECCPUBLICKEYBLOB *pSponsorTempECCPubKeyBlob, @@ -540,13 +542,13 @@ ULONG DEVAPI SKF_GenerateKeyWithECC(HANDLE hAgreementHandle, ULONG ulIDLen, HANDLE *phKeyHandle); -ULONG DEVAPI SKF_ImportSessionKey(HCONTAINER hContainer, +ULONG DEVAPI SKF_ImportSessionKey(HCONTAINER hContainer, ULONG ulAlgId, BYTE *pbWrapedData, ULONG ulWrapedLen, HANDLE *phKey); -ULONG DEVAPI SKF_SetSymmKey(DEVHANDLE hDev, +ULONG DEVAPI SKF_SetSymmKey(DEVHANDLE hDev, BYTE *pbKey, ULONG ulAlgID, HANDLE *phKey); @@ -570,39 +572,39 @@ ULONG DEVAPI SKF_EncryptFinal(HANDLE hKey, BYTE *pbEncryptedData, ULONG *pulEncryptedDataLen); -ULONG DEVAPI SKF_DecryptInit(HANDLE hKey, +ULONG DEVAPI SKF_DecryptInit(HANDLE hKey, BLOCKCIPHERPARAM DecryptParam); -ULONG DEVAPI SKF_Decrypt(HANDLE hKey, +ULONG DEVAPI SKF_Decrypt(HANDLE hKey, BYTE *pbEncryptedData, ULONG ulEncryptedLen, BYTE *pbData, ULONG *pulDataLen); -ULONG DEVAPI SKF_DecryptUpdate(HANDLE hKey, +ULONG DEVAPI SKF_DecryptUpdate(HANDLE hKey, BYTE *pbEncryptedData, ULONG ulEncryptedLen, BYTE *pbData, ULONG *pulDataLen); -ULONG DEVAPI SKF_DecryptFinal(HANDLE hKey, +ULONG DEVAPI SKF_DecryptFinal(HANDLE hKey, BYTE *pbDecryptedData, ULONG *pulDecryptedDataLen); -ULONG DEVAPI SKF_DigestInit(DEVHANDLE hDev, +ULONG DEVAPI SKF_DigestInit(DEVHANDLE hDev, ULONG ulAlgID, ECCPUBLICKEYBLOB *pPubKey, BYTE *pbID, ULONG ulIDLen, HANDLE *phHash); -ULONG DEVAPI SKF_Digest(HANDLE hHash, +ULONG DEVAPI SKF_Digest(HANDLE hHash, BYTE *pbData, ULONG ulDataLen, BYTE *pbHashData, ULONG *pulHashLen); -ULONG DEVAPI SKF_DigestUpdate(HANDLE hHash, +ULONG DEVAPI SKF_DigestUpdate(HANDLE hHash, BYTE *pbData, ULONG ulDataLen); @@ -631,7 +633,6 @@ ULONG DEVAPI SKF_MacFinal(HANDLE hMac, ULONG DEVAPI SKF_CloseHandle(HANDLE hHandle); - #define SAR_OK 0x00000000 #define SAR_FAIL 0x0A000001 #define SAR_UNKNOWNERR 0x0A000002 @@ -660,7 +661,6 @@ ULONG DEVAPI SKF_CloseHandle(HANDLE hHandle); #define SAR_RSADECERR 0x0A000019 #define SAR_HASHNOTEQUALERR 0x0A00001A #define SAR_KEYNOTFOUNTERR 0x0A00001B -#define SAR_KEYNOTFOUNDERR 0x0A00001B #define SAR_CERTNOTFOUNTERR 0x0A00001C #define SAR_NOTEXPORTERR 0x0A00001D #define SAR_DECRYPTPADERR 0x0A00001E diff --git a/crypto/skf/skf_dev.c b/crypto/skf/skf_dev.c new file mode 100644 index 00000000..ef446010 --- /dev/null +++ b/crypto/skf/skf_dev.c @@ -0,0 +1,135 @@ +/* crypto/skf/skf_dev.c */ +/* ==================================================================== + * Copyright (c) 2015-2016 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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 +#include +#include +#include +#include "skf_lcl.h" + +#define DEV_NAME "pseudo_dev" +#define DEV_NAME_LIST DEV_NAME"\0" + + +ULONG DEVAPI SKF_EnumDev(BOOL bPresent, + LPSTR szNameList, + ULONG *pulSize) +{ + if (!szNameList) { + *pulSize = sizeof(DEV_NAME_LIST); + return SAR_OK; + } + + if (*pulSize < sizeof(DEV_NAME_LIST)) { + return SAR_FAIL; + } + + memcpy(szNameList, DEV_NAME_LIST, sizeof(DEV_NAME_LIST)); + return SAR_OK; +} + +ULONG DEVAPI SKF_ConnectDev(LPSTR szName, + DEVHANDLE *phDev) +{ + return SAR_OK; +} + +ULONG DEVAPI SKF_DisConnectDev(DEVHANDLE hDev) +{ + return SAR_OK; +} + +ULONG DEVAPI SKF_GetDevState(LPSTR szDevName, + ULONG *pulDevState) +{ + if (!pulDevState) { + SKFerr(SKF_F_SKF_GETDEVSTATE, SKF_R_NULL_ARGUMENT); + return SAR_INVALIDPARAMERR; + } + + *pulDevState = DEV_PRESENT_STATE; + return SAR_OK; +} + +ULONG DEVAPI SKF_GetDevInfo(DEVHANDLE hDev, + DEVINFO *pDevInfo) +{ + DEVINFO devInfo; + + if (!pDevInfo) { + SKFerr(SKF_F_SKF_GETDEVINFO, SKF_R_NULL_ARGUMENT); + return SAR_INVALIDPARAMERR; + } + + bzero(&devInfo, sizeof(DEVINFO)); + devInfo.Version.major = 1; + devInfo.Version.minor = 0; + strcpy((char *)&devInfo.Manufacturer, "GmSSL Project (http://gmssl.org)"); + strcpy((char *)&devInfo.Issuer, "GmSSL Project (http://gmssl.org)"); + strcpy((char *)&devInfo.Label, "SKF Softotken"); + strcpy((char *)&devInfo.SerialNumber, "1"); + devInfo.HWVersion.major = 1; + devInfo.HWVersion.minor = 0; + devInfo.FirmwareVersion.major = 1; + devInfo.FirmwareVersion.minor = 0; + devInfo.AlgSymCap = 0x0000041F; + devInfo.AlgAsymCap = 0x00030700; + devInfo.AlgHashCap = 0x00000007; + devInfo.DevAuthAlgId = SGD_SM4_CBC; + devInfo.TotalSpace = 0; + devInfo.FreeSpace = 0; + devInfo.MaxECCBufferSize = 0; /* FIXME: max inlen of ECC encrypt */ + devInfo.MaxBufferSize = 0; /* FIXME: max inlen of SM4 encrypt */ + + memcpy(pDevInfo, &devInfo, sizeof(DEVINFO)); + return SAR_OK; +} + diff --git a/crypto/skf/skf_dgst.c b/crypto/skf/skf_dgst.c new file mode 100644 index 00000000..f9dec0d7 --- /dev/null +++ b/crypto/skf/skf_dgst.c @@ -0,0 +1,235 @@ +/* crypto/skf/skf_dgst.c */ +/* ==================================================================== + * Copyright (c) 2015-2016 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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 +#include +#include +#include +#include "skf_lcl.h" + + +ULONG DEVAPI SKF_DigestInit(DEVHANDLE hDev, + ULONG ulAlgID, + ECCPUBLICKEYBLOB *pPubKey, + BYTE *pbID, + ULONG ulIDLen, + HANDLE *phHash) +{ + ULONG ret = SAR_FAIL; + const EVP_MD *md; + EVP_MD_CTX *mdctx = NULL; + EC_KEY *ec_key = NULL; + SKF_HANDLE *handle; + unsigned char dgst[EVP_MAX_MD_SIZE]; + unsigned int dgstlen = 0; + + switch (ulAlgID) { + case SGD_SM3: + md = EVP_sm3(); + break; + case SGD_SHA1: + md = EVP_sha1(); + break; + case SGD_SHA256: + md = EVP_sha256(); + break; + default: + SKFerr(SKF_F_SKF_DIGESTINIT, SKF_R_INVALID_ALGID); + return SAR_INVALIDPARAMERR; + } + + if (!(mdctx = EVP_MD_CTX_create())) { + SKFerr(SKF_F_SKF_DIGESTINIT, SKF_R_MALLOC_FAILED); + return SAR_FAIL; + } + + if (!EVP_DigestInit_ex(mdctx, md, NULL)) { + SKFerr(SKF_F_SKF_DIGESTINIT, ERR_R_EVP_LIB); + goto end; + } + + if (pPubKey) { + + if (!(ec_key = EC_KEY_new_from_ECCPUBLICKEYBLOB(pPubKey))) { + SKFerr(SKF_F_SKF_DIGESTINIT, SKF_R_INVALID_BLOB); + ret = SAR_INVALIDPARAMERR; + goto end; + } + + if (pbID) { + if (ulIDLen <= 0 || ulIDLen > SM2_MAX_ID_LENGTH) { + SKFerr(SKF_F_SKF_DIGESTINIT, SKF_R_INVALID_ID_LENGTH); + ret = SAR_INVALIDPARAMERR; + goto end; + } + + OPENSSL_assert(strlen((char *)pbID) == ulIDLen); + if (!SM2_set_id(ec_key, (char *)pbID)) { + SKFerr(SKF_F_SKF_DIGESTINIT, ERR_R_SM2_LIB); + ret = SAR_FAIL; + goto end; + } + } + + dgstlen = sizeof(dgst); + if (!SM2_compute_id_digest(md, dgst, &dgstlen, ec_key)) { + SKFerr(SKF_F_SKF_DIGESTINIT, ERR_R_SM2_LIB); + goto end; + } + + if (!EVP_DigestUpdate(mdctx, dgst, dgstlen)) { + goto end; + } + + } else { + if (pbID) { + SKFerr(SKF_F_SKF_DIGESTINIT, SKF_R_NO_PUBLIC_KEY); + ret = SAR_INVALIDPARAMERR; + goto end; + } + } + + if (!(handle = SKF_HANDLE_new(SKF_HASH_HANDLE))) { + SKFerr(SKF_F_SKF_DIGESTINIT, SKF_R_MALLOC_FAILED); + ret = SAR_MEMORYERR; + goto end; + } + + handle->u.md_ctx = mdctx; + mdctx = NULL; + + ret = SAR_OK; + +end: + EVP_MD_CTX_destroy(mdctx); + EC_KEY_free(ec_key); + return ret; +} + + +ULONG DEVAPI SKF_DigestUpdate(HANDLE hHash, + BYTE *pbData, + ULONG ulDataLen) +{ + EVP_MD_CTX *md_ctx; + + if (!(md_ctx = SKF_HANDLE_get_md_ctx(hHash))) { + SKFerr(SKF_F_SKF_DIGESTUPDATE, SKF_R_INVALID_HASH_HANDLE); + return SAR_INVALIDPARAMERR; + } + + if (!pbData) { + SKFerr(SKF_F_SKF_DIGESTUPDATE, SKF_R_INVALID_ARGUMENTS); + return SAR_INVALIDPARAMERR; + } + + if (ulDataLen == 0) { + return SAR_OK; + } + + if (!EVP_DigestUpdate(md_ctx, pbData, ulDataLen)) { + SKFerr(SKF_F_SKF_DIGESTUPDATE, ERR_R_EVP_LIB); + return SAR_FAIL; + } + + return SAR_OK; +} + +ULONG DEVAPI SKF_DigestFinal(HANDLE hHash, + BYTE *pHashData, + ULONG *pulHashLen) +{ + EVP_MD_CTX *mdctx; + + if (!(mdctx = SKF_HANDLE_get_md_ctx(hHash))) { + SKFerr(SKF_F_SKF_DIGESTFINAL, SKF_R_INVALID_HANDLE); + return SAR_INVALIDPARAMERR; + } + + if (!pulHashLen) { + SKFerr(SKF_F_SKF_DIGESTFINAL, SKF_R_NULL_ARGUMENT); + return SAR_INVALIDPARAMERR; + } + + if (!EVP_DigestFinal_ex(mdctx, pHashData, pulHashLen)) { + SKFerr(SKF_F_SKF_DIGESTFINAL, ERR_R_EVP_LIB); + return SAR_FAIL; + } + + if (!SKF_HANDLE_free(hHash)) { + SKFerr(SKF_F_SKF_DIGESTFINAL, SKF_R_FREE_HANDLE_FAILED); + return SAR_FAIL; + } + + return SAR_OK; +} + +ULONG DEVAPI SKF_Digest(HANDLE hHash, + BYTE *pbData, + ULONG ulDataLen, + BYTE *pbHashData, + ULONG *pulHashLen) +{ + ULONG rv; + + if ((rv = SKF_DigestUpdate(hHash, pbData, ulDataLen)) != SAR_OK) { + SKFerr(SKF_F_SKF_DIGEST, ERR_R_SKF_LIB); + return rv; + } + + if ((rv = SKF_DigestFinal(hHash, pbHashData, pulHashLen)) != SAR_OK) { + SKFerr(SKF_F_SKF_DIGEST, ERR_R_SKF_LIB); + return rv; + } + + return SAR_OK; +} + diff --git a/crypto/skf/skf_ec.c b/crypto/skf/skf_ec.c new file mode 100644 index 00000000..9c3f8c43 --- /dev/null +++ b/crypto/skf/skf_ec.c @@ -0,0 +1,690 @@ +/* crypto/skf/skf_ec.c */ +/* ==================================================================== + * Copyright (c) 2015-2016 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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 +#include +#include +#include +#include +#include "skf_lcl.h" + + +ULONG DEVAPI SKF_ExtECCSign(DEVHANDLE hDev, + ECCPRIVATEKEYBLOB *pECCPriKeyBlob, + BYTE *pbData, + ULONG ulDataLen, + ECCSIGNATUREBLOB *pSignature) +{ + ULONG ret = SAR_FAIL; + EC_KEY *ec_key = NULL; + ECDSA_SIG *sig = NULL; + + if (!pECCPriKeyBlob || !pbData || !pSignature) { + SKFerr(SKF_F_SKF_EXTECCSIGN, SKF_R_NULL_ARGUMENT); + return SAR_INVALIDPARAMERR; + } + + if (ulDataLen != SM3_DIGEST_LENGTH) { + SKFerr(SKF_F_SKF_EXTECCSIGN, SKF_R_INVALID_DIGEST_LENGTH); + return SAR_INVALIDPARAMERR; + } + + if (!(ec_key = EC_KEY_new_from_ECCPRIVATEKEYBLOB(pECCPriKeyBlob))) { + SKFerr(SKF_F_SKF_EXTECCSIGN, SKF_R_INVALID_ECC_PRIVATE_KEY); + goto end; + } + + if (!(sig = SM2_do_sign(pbData, (int)ulDataLen, ec_key))) { + SKFerr(SKF_F_SKF_EXTECCSIGN, SKF_R_SIGN_FAILED); + goto end; + } + + if (!ECDSA_SIG_get_ECCSIGNATUREBLOB(sig, pSignature)) { + SKFerr(SKF_F_SKF_EXTECCSIGN, SKF_R_ENCODE_SIGNATURE_FAILED); + goto end; + } + + ret = SAR_OK; +end: + EC_KEY_free(ec_key); + ECDSA_SIG_free(sig); + return ret; +} + +ULONG DEVAPI SKF_ExtECCVerify(DEVHANDLE hDev, + ECCPUBLICKEYBLOB *pECCPubKeyBlob, + BYTE *pbData, + ULONG ulDataLen, + ECCSIGNATUREBLOB *pSignature) +{ + ULONG ret = SAR_FAIL; + EC_KEY *ec_key = NULL; + ECDSA_SIG *sig = NULL; + + if (!pECCPubKeyBlob || !pbData || pSignature) { + SKFerr(SKF_F_SKF_EXTECCVERIFY, SKF_R_NULL_ARGUMENT); + return SAR_INVALIDPARAMERR; + } + + if (ulDataLen != SM3_DIGEST_LENGTH) { + SKFerr(SKF_F_SKF_EXTECCVERIFY, SKF_R_INVALID_DIGEST_LENGTH); + return SAR_INVALIDPARAMERR; + } + + if (!(ec_key = EC_KEY_new_from_ECCPUBLICKEYBLOB(pECCPubKeyBlob))) { + SKFerr(SKF_F_SKF_EXTECCVERIFY, SKF_R_INVALID_ECC_PUBLIC_KEY); + goto end; + } + + if (!(sig = ECDSA_SIG_new_from_ECCSIGNATUREBLOB(pSignature))) { + SKFerr(SKF_F_SKF_EXTECCVERIFY, SKF_R_INVALID_SIGNATURE); + goto end; + } + + if (1 != SM2_do_verify(pbData, (int)ulDataLen, sig, ec_key)) { + SKFerr(SKF_F_SKF_EXTECCVERIFY, SKF_R_VERIFY_NOT_PASS); + goto end; + } + + ret = SAR_OK; + +end: + EC_KEY_free(ec_key); + ECDSA_SIG_free(sig); + return ret; +} + +ULONG DEVAPI SKF_ECCVerify(DEVHANDLE hDev, + ECCPUBLICKEYBLOB *pECCPubKeyBlob, + BYTE *pbData, + ULONG ulDataLen, + ECCSIGNATUREBLOB *pSignature) +{ + return SKF_ExtECCVerify(hDev, pECCPubKeyBlob, pbData, ulDataLen, pSignature); +} + +ULONG DEVAPI SKF_ExtECCEncrypt(DEVHANDLE hDev, + ECCPUBLICKEYBLOB *pECCPubKeyBlob, + BYTE *pbPlainText, + ULONG ulPlainTextLen, + ECCCIPHERBLOB *pCipherText) +{ + ULONG ret = SAR_FAIL; + EC_KEY *ec_key = NULL; + SM2_CIPHERTEXT_VALUE *cv = NULL; + SM2_ENC_PARAMS params; + + if (!pECCPubKeyBlob || !pbPlainText || !pCipherText) { + SKFerr(SKF_F_SKF_EXTECCENCRYPT, SKF_R_NULL_ARGUMENT); + return SAR_INVALIDPARAMERR; + } + + if (ulPlainTextLen <= 0) { + SKFerr(SKF_F_SKF_EXTECCENCRYPT, SKF_R_INVALID_PLAINTEXT_LENGTH); + return SAR_INVALIDPARAMERR; + } + + if (!(ec_key = EC_KEY_new_from_ECCPUBLICKEYBLOB(pECCPubKeyBlob))) { + SKFerr(SKF_F_SKF_EXTECCENCRYPT, SKF_R_INVALID_EC_PUBLIC_KEY); + goto end; + } + + SM2_ENC_PARAMS_init_with_recommended(¶ms); + if (!(cv = SM2_do_encrypt(¶ms, pbPlainText, ulPlainTextLen, ec_key))) { + SKFerr(SKF_F_SKF_EXTECCENCRYPT, SKF_R_ENCRYPT_FAILED); + goto end; + } + + if (!SM2_CIPHERTEXT_VALUE_get_ECCCIPHERBLOB(cv, pCipherText)) { + SKFerr(SKF_F_SKF_EXTECCENCRYPT, SKF_R_ENCODE_CIPHERTEXT_FAILED); + goto end; + } + + ret = SAR_OK; + +end: + EC_KEY_free(ec_key); + SM2_CIPHERTEXT_VALUE_free(cv); + return ret; +} + +ULONG DEVAPI SKF_ExtECCDecrypt(DEVHANDLE hDev, + ECCPRIVATEKEYBLOB *pECCPriKeyBlob, + ECCCIPHERBLOB *pCipherText, + BYTE *pbPlainText, + ULONG *pulPlainTextLen) +{ + ULONG ret = SAR_FAIL; + EC_KEY *ec_key = NULL; + SM2_CIPHERTEXT_VALUE *cv = NULL; + SM2_ENC_PARAMS params; + size_t len; + + if (!pECCPriKeyBlob || !pCipherText || !pulPlainTextLen) { + SKFerr(SKF_F_SKF_EXTECCDECRYPT, SKF_R_NULL_ARGUMENT); + return SAR_INVALIDPARAMERR; + } + + if (pCipherText->CipherLen <= 0) { + SKFerr(SKF_F_SKF_EXTECCDECRYPT, SKF_R_INVALID_CIPHERTEXT_LENGTH); + return SAR_INVALIDPARAMERR; + } + + if (!pbPlainText) { + *pulPlainTextLen = pCipherText->CipherLen; + return SAR_OK; + } + + if (!(ec_key = EC_KEY_new_from_ECCPRIVATEKEYBLOB(pECCPriKeyBlob))) { + SKFerr(SKF_F_SKF_EXTECCDECRYPT, SKF_R_INVALID_EC_PRIVATE_KEY); + goto end; + } + + if (!(cv = SM2_CIPHERTEXT_VALUE_new_from_ECCCIPHERBLOB(pCipherText))) { + SKFerr(SKF_F_SKF_EXTECCDECRYPT, SKF_R_INVALID_CIPHERTEXT); + goto end; + } + + SM2_ENC_PARAMS_init_with_recommended(¶ms); + len = *pulPlainTextLen; //FIXME: check length? + if (!SM2_do_decrypt(¶ms, cv, pbPlainText, &len, ec_key)) { + SKFerr(SKF_F_SKF_EXTECCDECRYPT, SKF_R_DECRYPT_FAILED); + goto end; + } + *pulPlainTextLen = (ULONG)len; + + ret = SAR_OK; + +end: + EC_KEY_free(ec_key); + SM2_CIPHERTEXT_VALUE_free(cv); + return ret; +} + +/* Wrapper Functions */ + +EC_KEY *EC_KEY_new_from_ECCPUBLICKEYBLOB(const ECCPUBLICKEYBLOB *blob) +{ + EC_KEY *ret; + + if (!(ret = EC_KEY_new_by_curve_name(NID_sm2p256v1))) { + SKFerr(SKF_F_EC_KEY_NEW_FROM_ECCPUBLICKEYBLOB, ERR_R_EC_LIB); + return NULL; + } + + if (!EC_KEY_set_ECCPUBLICKEYBLOB(ret, blob)) { + SKFerr(SKF_F_EC_KEY_NEW_FROM_ECCPUBLICKEYBLOB, + SKF_R_DECODE_EC_PUBLIC_KEY_FAILED); + EC_KEY_free(ret); + return NULL; + } + + return ret; +} + +EC_KEY *EC_KEY_new_from_ECCPRIVATEKEYBLOB(const ECCPRIVATEKEYBLOB *blob) +{ + EC_KEY *ret; + + if (!(ret = EC_KEY_new_by_curve_name(NID_sm2p256v1))) { + SKFerr(SKF_F_EC_KEY_NEW_FROM_ECCPRIVATEKEYBLOB, ERR_R_EC_LIB); + return NULL; + } + + if (!EC_KEY_set_ECCPRIVATEKEYBLOB(ret, blob)) { + SKFerr(SKF_F_EC_KEY_NEW_FROM_ECCPRIVATEKEYBLOB, + SKF_R_DECODE_EC_PRIVATE_KEY_FAILED); + EC_KEY_free(ret); + return NULL; + } + + return ret; +} + +int EC_KEY_set_ECCPUBLICKEYBLOB(EC_KEY *ec_key, const ECCPUBLICKEYBLOB *blob) +{ + int ret = 0; + BIGNUM *x = NULL; + BIGNUM *y = NULL; + int nbytes; + + if (blob->BitLen != EC_GROUP_get_degree(EC_KEY_get0_group(ec_key))) { + SKFerr(SKF_F_EC_KEY_SET_ECCPUBLICKEYBLOB, SKF_R_INVALID_KEY_LENGTH); + return 0; + } + + nbytes = (blob->BitLen + 7)/8; + + if (!(x = BN_bin2bn(blob->XCoordinate, nbytes, NULL))) { + SKFerr(SKF_F_EC_KEY_SET_ECCPUBLICKEYBLOB, ERR_R_BN_LIB); + goto end; + } + if (!(y = BN_bin2bn(blob->YCoordinate, nbytes, NULL))) { + SKFerr(SKF_F_EC_KEY_SET_ECCPUBLICKEYBLOB, ERR_R_BN_LIB); + goto end; + } + if (!EC_KEY_set_public_key_affine_coordinates(ec_key, x, y)) { + SKFerr(SKF_F_EC_KEY_SET_ECCPUBLICKEYBLOB, SKF_R_INVALID_PUBLIC_KEY); + goto end; + } + + ret = 1; +end: + BN_free(x); + BN_free(y); + return ret; +} + +int EC_KEY_get_ECCPUBLICKEYBLOB(EC_KEY *ec_key, ECCPUBLICKEYBLOB *blob) +{ + int ret = 0; + int nbytes; + BIGNUM *x = NULL; + BIGNUM *y = NULL; + BN_CTX *bn_ctx = NULL; + const EC_GROUP *group = EC_KEY_get0_group(ec_key); + const EC_POINT *point = EC_KEY_get0_public_key(ec_key); + + nbytes = (EC_GROUP_get_degree(group) + 7)/8; + if (nbytes > ECC_MAX_MODULUS_BITS_LEN/8) { + SKFerr(SKF_F_EC_KEY_GET_ECCPUBLICKEYBLOB, SKF_R_INVALID_KEY_LENGTH); + goto end; + } + + x = BN_new(); + y = BN_new(); + bn_ctx = BN_CTX_new(); + if (!x || !y || !bn_ctx) { + SKFerr(SKF_F_EC_KEY_GET_ECCPUBLICKEYBLOB, ERR_R_BN_LIB); + goto end; + } + + if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) { + if (!EC_POINT_get_affine_coordinates_GFp(group, point, x, y, bn_ctx)) { + SKFerr(SKF_F_EC_KEY_GET_ECCPUBLICKEYBLOB, ERR_R_EC_LIB); + goto end; + } + } else { + if (!EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, bn_ctx)) { + SKFerr(SKF_F_EC_KEY_GET_ECCPUBLICKEYBLOB, ERR_R_EC_LIB); + goto end; + } + } + + bzero(blob, sizeof(*blob)); + blob->BitLen = EC_GROUP_get_degree(group); + if (!BN_bn2bin(x, blob->XCoordinate + nbytes - BN_num_bytes(x))) { + SKFerr(SKF_F_EC_KEY_GET_ECCPUBLICKEYBLOB, ERR_R_BN_LIB); + goto end; + } + if (!BN_bn2bin(y, blob->YCoordinate + nbytes - BN_num_bytes(y))) { + SKFerr(SKF_F_EC_KEY_GET_ECCPUBLICKEYBLOB, ERR_R_BN_LIB); + goto end; + } + + ret = 1; +end: + BN_free(x); + BN_free(y); + BN_CTX_free(bn_ctx); + return ret; +} + +int EC_KEY_set_ECCPRIVATEKEYBLOB(EC_KEY *ec_key, const ECCPRIVATEKEYBLOB *blob) +{ + int ret = 0; + BIGNUM *d = NULL; + int nbytes; + + //FIXME: is this right? + if (blob->BitLen != EC_GROUP_get_degree(EC_KEY_get0_group(ec_key))) { + SKFerr(SKF_F_EC_KEY_SET_ECCPRIVATEKEYBLOB, SKF_R_INVALID_KEY_LENGTH); + goto end; + } + + nbytes = (blob->BitLen + 7)/8; + + if (!(d = BN_bin2bn(blob->PrivateKey, nbytes, NULL))) { + SKFerr(SKF_F_EC_KEY_SET_ECCPRIVATEKEYBLOB, ERR_R_BN_LIB); + goto end; + } + if (!EC_KEY_set_private_key(ec_key, d)) { + SKFerr(SKF_F_EC_KEY_SET_ECCPRIVATEKEYBLOB, SKF_R_INVALID_PRIVATE_KEY); + goto end; + } + + ret = 1; +end: + BN_clear_free(d); + return ret; +} + +int EC_KEY_get_ECCPRIVATEKEYBLOB(EC_KEY *ec_key, ECCPRIVATEKEYBLOB *blob) +{ + int ret = 0; + BIGNUM *order = NULL; + const BIGNUM *d; + int nbytes; + + if (!(order = BN_new())) { + SKFerr(SKF_F_EC_KEY_GET_ECCPRIVATEKEYBLOB, SKF_R_MALLOC_FAILED); + goto end; + } + + if (!EC_GROUP_get_order(EC_KEY_get0_group(ec_key), order, NULL)) { + SKFerr(SKF_F_EC_KEY_GET_ECCPRIVATEKEYBLOB, ERR_R_EC_LIB); + goto end; + } + + nbytes = BN_num_bytes(order); + if (nbytes > ECC_MAX_MODULUS_BITS_LEN/8) { + SKFerr(SKF_F_EC_KEY_GET_ECCPRIVATEKEYBLOB, SKF_R_INVALID_KEY_LENGTH); + goto end; + } + + if (!(d = EC_KEY_get0_private_key(ec_key))) { + SKFerr(SKF_F_EC_KEY_GET_ECCPRIVATEKEYBLOB, SKF_R_INVALID_EC_KEY); + goto end; + } + + if (!BN_bn2bin(d, blob->PrivateKey + nbytes - BN_num_bytes(d))) { + SKFerr(SKF_F_EC_KEY_GET_ECCPRIVATEKEYBLOB, ERR_R_BN_LIB); + goto end; + } + + ret = 1; + +end: + BN_free(order); + return ret; +} + +SM2_CIPHERTEXT_VALUE *SM2_CIPHERTEXT_VALUE_new_from_ECCCIPHERBLOB( + const ECCCIPHERBLOB *blob) +{ + int ok = 0; + SM2_CIPHERTEXT_VALUE *ret = NULL; + EC_GROUP *group = NULL; + + if (!(group = EC_GROUP_new_by_curve_name(NID_sm2p256v1))) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_NEW_FROM_ECCCIPHERBLOB, + ERR_R_EC_LIB); + goto end; + } + + if (!(ret = SM2_CIPHERTEXT_VALUE_new(group))) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_NEW_FROM_ECCCIPHERBLOB, + SKF_R_MALLOC_FAILED); + goto end; + } + + if (!SM2_CIPHERTEXT_VALUE_set_ECCCIPHERBLOB(ret, blob)) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_NEW_FROM_ECCCIPHERBLOB, + SKF_R_INVALID_EC_PUBLIC_KEY); + goto end; + } + + ok = 1; + +end: + if (!ok) { + SM2_CIPHERTEXT_VALUE_free(ret); + ret = NULL; + } + EC_GROUP_free(group); + return ret; +} + +int SM2_CIPHERTEXT_VALUE_set_ECCCIPHERBLOB(SM2_CIPHERTEXT_VALUE *cv, + const ECCCIPHERBLOB *blob) +{ + int ret = 0; + EC_GROUP *group = NULL; + BIGNUM *x = NULL; + BIGNUM *y = NULL; + BN_CTX *bn_ctx = NULL; + int nbytes; + + if (!(group = EC_GROUP_new_by_curve_name(NID_sm2p256v1))) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_SET_ECCCIPHERBLOB, + ERR_R_EC_LIB); + return 0; + } + + nbytes = (EC_GROUP_get_degree(group) + 7)/8; + if (nbytes > ECC_MAX_XCOORDINATE_BITS_LEN/8) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_SET_ECCCIPHERBLOB, + SKF_R_INVALID_KEY_LENGTH); + goto end; + } + + if (!(x = BN_bin2bn(blob->XCoordinate, nbytes, NULL))) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_SET_ECCCIPHERBLOB, ERR_R_BN_LIB); + goto end; + } + if (!(y = BN_bin2bn(blob->YCoordinate, nbytes, NULL))) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_SET_ECCCIPHERBLOB, ERR_R_BN_LIB); + goto end; + } + if (!(bn_ctx = BN_CTX_new())) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_SET_ECCCIPHERBLOB, ERR_R_BN_LIB); + goto end; + } + + if (!cv->ephem_point) { + if (!(cv->ephem_point = EC_POINT_new(group))) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_SET_ECCCIPHERBLOB, ERR_R_EC_LIB); + goto end; + } + } + if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) { + if (!EC_POINT_set_affine_coordinates_GFp(group, cv->ephem_point, x, y, bn_ctx)) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_SET_ECCCIPHERBLOB, ERR_R_EC_LIB); + goto end; + } + } else { + if (!EC_POINT_get_affine_coordinates_GF2m(group, cv->ephem_point, x, y, bn_ctx)) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_SET_ECCCIPHERBLOB, ERR_R_EC_LIB); + goto end; + } + } + + memcpy(cv->mactag, blob->HASH, 32); + cv->mactag_size = 32; + + if ((cv->ciphertext_size = blob->CipherLen) <= 0) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_SET_ECCCIPHERBLOB, + SKF_R_INVALID_CIPHERTEXT_LENGTH); + goto end; + } + if (!(cv->ciphertext = OPENSSL_realloc(cv->ciphertext, blob->CipherLen))) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_SET_ECCCIPHERBLOB, + SKF_R_MALLOC_FAILED); + goto end; + } + memcpy(cv->ciphertext, blob->Cipher, blob->CipherLen); + + ret = 0; + +end: + EC_GROUP_free(group); + BN_free(x); + BN_free(y); + BN_CTX_free(bn_ctx); + return ret; +} + +int SM2_CIPHERTEXT_VALUE_get_ECCCIPHERBLOB(const SM2_CIPHERTEXT_VALUE *cv, + ECCCIPHERBLOB *blob) +{ + int ret = 0; + EC_GROUP *group = NULL; + BIGNUM *x = NULL; + BIGNUM *y = NULL; + BN_CTX *bn_ctx = NULL; + + if (!(group = EC_GROUP_new_by_curve_name(NID_sm2p256v1))) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_GET_ECCCIPHERBLOB, ERR_R_EC_LIB); + return 0; + } + + x = BN_new(); + y = BN_new(); + bn_ctx = BN_CTX_new(); + if (!x || !y || !bn_ctx) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_GET_ECCCIPHERBLOB, ERR_R_BN_LIB); + goto end; + } + + if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) { + if (!EC_POINT_get_affine_coordinates_GFp(group, cv->ephem_point, x, y, bn_ctx)) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_GET_ECCCIPHERBLOB, ERR_R_EC_LIB); + goto end; + } + } else { + if (!EC_POINT_get_affine_coordinates_GF2m(group, cv->ephem_point, x, y, bn_ctx)) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_GET_ECCCIPHERBLOB, ERR_R_EC_LIB); + goto end; + } + } + + if ((BN_num_bytes(x) > 256/8) || (BN_num_bytes(y) > 256/8)) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_GET_ECCCIPHERBLOB, + SKF_R_INVALID_CIPHERTEXT_POINT); + goto end; + } + if (!BN_bn2bin(x, blob->XCoordinate + 256/8 - BN_num_bytes(x))) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_GET_ECCCIPHERBLOB, ERR_R_BN_LIB); + goto end; + } + if (!BN_bn2bin(y, blob->YCoordinate + 256/8 - BN_num_bytes(y))) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_GET_ECCCIPHERBLOB, ERR_R_BN_LIB); + goto end; + } + + if (cv->mactag_size != 32) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_GET_ECCCIPHERBLOB, + SKF_R_INVALID_CIPHERTEXT_MAC); + goto end; + } + memcpy(blob->HASH, cv->mactag, cv->mactag_size); + + if (cv->ciphertext_size <= 0) { + SKFerr(SKF_F_SM2_CIPHERTEXT_VALUE_GET_ECCCIPHERBLOB, + SKF_R_INVALID_CIPHERTEXT_LENGTH); + goto end; + } + memcpy(blob->Cipher, cv->ciphertext, cv->ciphertext_size); + + ret = 1; +end: + EC_GROUP_free(group); + BN_free(x); + BN_free(y); + BN_CTX_free(bn_ctx); + return ret; +} + +ECDSA_SIG *ECDSA_SIG_new_from_ECCSIGNATUREBLOB(const ECCSIGNATUREBLOB *blob) +{ + ECDSA_SIG *ret = NULL; + + if (!(ret = ECDSA_SIG_new())) { + SKFerr(SKF_F_ECDSA_SIG_NEW_FROM_ECCSIGNATUREBLOB, + SKF_R_MALLOC_FAILED); + return NULL; + } + + if (!ECDSA_SIG_set_ECCSIGNATUREBLOB(ret, blob)) { + SKFerr(SKF_F_ECDSA_SIG_NEW_FROM_ECCSIGNATUREBLOB, + SKF_R_INVALID_SIGNATURE); + ECDSA_SIG_free(ret); + return NULL; + } + + return ret; +} + +int ECDSA_SIG_get_ECCSIGNATUREBLOB(const ECDSA_SIG *sig, ECCSIGNATUREBLOB *blob) +{ + if ((BN_num_bytes(sig->r) > 256/8) || (BN_num_bytes(sig->s) > 256/8)) { + SKFerr(SKF_F_ECDSA_SIG_GET_ECCSIGNATUREBLOB, SKF_R_INVALID_BIGNUM_LENGTH); + return SAR_FAIL; + } + + if (!BN_bn2bin(sig->r, blob->r + 256/8 - BN_num_bytes(sig->r))) { + SKFerr(SKF_F_ECDSA_SIG_GET_ECCSIGNATUREBLOB, ERR_R_BN_LIB); + return SAR_FAIL; + } + + if (!BN_bn2bin(sig->s, blob->s + 256/8 - BN_num_bytes(sig->s))) { + SKFerr(SKF_F_ECDSA_SIG_GET_ECCSIGNATUREBLOB, ERR_R_BN_LIB); + return SAR_FAIL; + } + + return SAR_OK; +} + +int ECDSA_SIG_set_ECCSIGNATUREBLOB(ECDSA_SIG *sig, const ECCSIGNATUREBLOB *blob) +{ + if (!(sig->r = BN_bin2bn(blob->r, 256/8, sig->r))) { + SKFerr(SKF_F_ECDSA_SIG_SET_ECCSIGNATUREBLOB, ERR_R_BN_LIB); + return SAR_FAIL; + } + + if (!(sig->s = BN_bin2bn(blob->s, 256/8, sig->s))) { + SKFerr(SKF_F_ECDSA_SIG_SET_ECCSIGNATUREBLOB, ERR_R_BN_LIB); + return SAR_FAIL; + } + + return SAR_OK; +} + diff --git a/crypto/skf/skf_enc.c b/crypto/skf/skf_enc.c new file mode 100644 index 00000000..57ef9d0a --- /dev/null +++ b/crypto/skf/skf_enc.c @@ -0,0 +1,310 @@ +/* crypto/skf/skf_enc.c */ +/* ==================================================================== + * Copyright (c) 2015-2016 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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 +#include +#include +#include +#include +#include "skf_lcl.h" + +#define PADDING_TYPE_NO_PADDING 0 +#define PADDING_TYPE_PKCS5 1 + + +ULONG DEVAPI SKF_EncryptInit(HANDLE hKey, + BLOCKCIPHERPARAM encryptParam) +{ + ULONG ret = SAR_FAIL; + BLOCKCIPHERPARAM *encparam = &encryptParam; + EVP_CIPHER_CTX *ctx = NULL; + const EVP_CIPHER *cipher; + unsigned char *key; + unsigned char *iv; + + //FIXME: CFB bits! + + if (!(key = SKF_HANDLE_get_key(hKey))) { + SKFerr(SKF_F_SKF_ENCRYPTINIT, SKF_R_INVALID_KEY_HANDLE); + ret = SAR_INVALIDPARAMERR; + goto end; + } + + if (encparam->IVLen != SMS4_IV_LENGTH) { + SKFerr(SKF_F_SKF_ENCRYPTINIT, SKF_R_INVALID_IV_LENGTH); + ret = SAR_INVALIDPARAMERR; + goto end; + } + + iv = encparam->IV; + + if (!(ctx = EVP_CIPHER_CTX_new())) { + SKFerr(SKF_F_SKF_ENCRYPTINIT, ERR_R_EVP_LIB); + goto end; + } + + if (!EVP_EncryptInit_ex(ctx, cipher, NULL, key, iv)) { + SKFerr(SKF_F_SKF_ENCRYPTINIT, ERR_R_EVP_LIB); + goto end; + } + + if (!SKF_HANDLE_set1_cipher_ctx(hKey, ctx)) { + SKFerr(SKF_F_SKF_ENCRYPTINIT, SKF_R_SET_CIPHER_CTX_FAILED); + goto end; + } + ctx = NULL; + + ret = SAR_OK; +end: + EVP_CIPHER_CTX_free(ctx); + return ret; +} + +ULONG DEVAPI SKF_EncryptUpdate(HANDLE hKey, + BYTE *pbData, + ULONG ulDataLen, + BYTE *pbEncryptedData, + ULONG *pulEncryptedLen) +{ + EVP_CIPHER_CTX *ctx; + int inlen, outlen; + + if (!(ctx = SKF_HANDLE_get_cipher_ctx(hKey))) { + SKFerr(SKF_F_SKF_ENCRYPTUPDATE, SKF_R_INVALID_CIPHER_CTX_HANDLE); + return SAR_INVALIDPARAMERR; + } + + //FIXME: check INT_MAX + inlen = ulDataLen; + outlen = *pulEncryptedLen; + if (!EVP_EncryptUpdate(ctx, pbEncryptedData, &outlen, pbData, inlen)) { + SKFerr(SKF_F_SKF_ENCRYPTUPDATE, ERR_R_EVP_LIB); + return SAR_FAIL; + } + + *pulEncryptedLen = outlen; + return SAR_OK; +} + +ULONG DEVAPI SKF_EncryptFinal(HANDLE hKey, + BYTE *pbEncryptedData, + ULONG *pulEncryptedDataLen) +{ + EVP_CIPHER_CTX *ctx; + int outlen; + + if (!(ctx = SKF_HANDLE_get_cipher_ctx(hKey))) { + SKFerr(SKF_F_SKF_ENCRYPTFINAL, SKF_R_INVALID_CIPHER_CTX_HANDLE); + return SAR_INVALIDPARAMERR; + } + + outlen = *pulEncryptedDataLen; + if (!EVP_EncryptFinal(ctx, pbEncryptedData, &outlen)) { + SKFerr(SKF_F_SKF_ENCRYPTFINAL, ERR_R_EVP_LIB); + return SAR_FAIL; + } + + *pulEncryptedDataLen = outlen; + SKF_HANDLE_free_cipher_ctx(hKey); + return SAR_OK; +} + +ULONG DEVAPI SKF_DecryptInit(HANDLE hKey, + BLOCKCIPHERPARAM DecryptParam) +{ + ULONG ret = SAR_FAIL; + BLOCKCIPHERPARAM *param = &DecryptParam; + EVP_CIPHER_CTX *ctx = NULL; + const EVP_CIPHER *cipher; + unsigned char *key; + unsigned char *iv; + + if (!(key = SKF_HANDLE_get_key(hKey))) { + SKFerr(SKF_F_SKF_DECRYPTINIT, SKF_R_INVALID_KEY_HANDLE); + ret = SAR_INVALIDPARAMERR; + goto end; + } + + if (param->IVLen != SMS4_IV_LENGTH) { + SKFerr(SKF_F_SKF_DECRYPTINIT, SKF_R_INVALID_IV_LENGTH); + ret = SAR_INVALIDPARAMERR; + goto end; + } + + iv = param->IV; + + if (!(ctx = EVP_CIPHER_CTX_new())) { + SKFerr(SKF_F_SKF_DECRYPTINIT, ERR_R_EVP_LIB); + goto end; + } + + if (!EVP_DecryptInit_ex(ctx, cipher, NULL, key, iv)) { + SKFerr(SKF_F_SKF_DECRYPTINIT, ERR_R_EVP_LIB); + goto end; + } + + if (!SKF_HANDLE_set1_cipher_ctx(hKey, ctx)) { + SKFerr(SKF_F_SKF_DECRYPTINIT, SKF_R_SET_CIPHER_CTX_FAILED); + goto end; + } + ctx = NULL; + + ret = SAR_OK; +end: + EVP_CIPHER_CTX_free(ctx); + return ret; + + return SAR_OK; +} + +ULONG DEVAPI SKF_DecryptUpdate(HANDLE hKey, + BYTE *pbEncryptedData, + ULONG ulEncryptedLen, + BYTE *pbData, + ULONG *pulDataLen) +{ + EVP_CIPHER_CTX *ctx; + int inlen, outlen; + + if (!(ctx = SKF_HANDLE_get_cipher_ctx(hKey))) { + SKFerr(SKF_F_SKF_DECRYPTUPDATE, SKF_R_INVALID_CIPHER_CTX_HANDLE); + return SAR_INVALIDPARAMERR; + } + + //FIXME: check INT_MAX + inlen = ulEncryptedLen; + outlen = *pulDataLen; + if (!EVP_DecryptUpdate(ctx, pbData, &outlen, pbEncryptedData, inlen)) { + SKFerr(SKF_F_SKF_DECRYPTUPDATE, ERR_R_EVP_LIB); + return SAR_FAIL; + } + + *pulDataLen = outlen; + return SAR_OK; +} + +ULONG DEVAPI SKF_DecryptFinal(HANDLE hKey, + BYTE *pbDecryptedData, + ULONG *pulDecryptedDataLen) +{ + EVP_CIPHER_CTX *ctx; + int len; + + if (!(ctx = SKF_HANDLE_get_cipher_ctx(hKey))) { + SKFerr(SKF_F_SKF_DECRYPTFINAL, SKF_R_INVALID_KEY_HANDLE); + return SAR_INVALIDPARAMERR; + } + + if (!EVP_DecryptFinal(ctx, pbDecryptedData, &len)) { + return SAR_FAIL; + } + + *pulDecryptedDataLen = len; + SKF_HANDLE_free_cipher_ctx(hKey); + return SAR_OK; +} + +ULONG DEVAPI SKF_Encrypt(HANDLE hKey, + BYTE *pbData, + ULONG ulDataLen, + BYTE *pbEncryptedData, + ULONG *pulEncryptedLen) +{ + ULONG rv; + BYTE *p; + ULONG len; + + p = pbEncryptedData; + len = *pulEncryptedLen; + if ((rv = SKF_EncryptUpdate(hKey, pbData, ulDataLen, p, &len)) != SAR_OK) { + SKFerr(SKF_F_SKF_ENCRYPT, ERR_R_SKF_LIB); + return rv; + } + + p += len; + len = *pulEncryptedLen - len; + if ((rv = SKF_EncryptFinal(hKey, p, &len)) != SAR_OK) { + SKFerr(SKF_F_SKF_ENCRYPT, ERR_R_SKF_LIB); + return rv; + } + + *pulEncryptedLen = p + len - pbEncryptedData; + return SAR_OK; +} + +ULONG DEVAPI SKF_Decrypt(HANDLE hKey, + BYTE *pbEncryptedData, + ULONG ulEncryptedLen, + BYTE *pbData, + ULONG *pulDataLen) +{ + ULONG rv; + BYTE *p; + ULONG len; + + p = pbData; + len = *pulDataLen; + if ((rv = SKF_DecryptUpdate(hKey, pbEncryptedData, ulEncryptedLen, p, &len)) != SAR_OK) { + SKFerr(SKF_F_SKF_DECRYPT, ERR_R_SKF_LIB); + return rv; + } + + p += len; + len = *pulDataLen - len; + if ((rv = SKF_DecryptFinal(hKey, p, &len)) != SAR_OK) { + SKFerr(SKF_F_SKF_DECRYPT, ERR_R_SKF_LIB); + return rv; + } + + *pulDataLen = p + len - pbData; + return SAR_OK; +} + diff --git a/crypto/skf/skf_err.c b/crypto/skf/skf_err.c new file mode 100644 index 00000000..3306f9e7 --- /dev/null +++ b/crypto/skf/skf_err.c @@ -0,0 +1,238 @@ +/* crypto/skf/skf_err.c */ +/* ==================================================================== + * Copyright (c) 1999-2016 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. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * + */ + +/* + * NOTE: this file was auto generated by the mkerr.pl script: any changes + * made to it will be overwritten when the script next updates this file, + * only reason strings will be preserved. + */ + +#include +#include +#include + +/* BEGIN ERROR CODES */ +#ifndef OPENSSL_NO_ERR + +# define ERR_FUNC(func) ERR_PACK(ERR_LIB_SKF,func,0) +# define ERR_REASON(reason) ERR_PACK(ERR_LIB_SKF,0,reason) + +static ERR_STRING_DATA SKF_str_functs[] = { + {ERR_FUNC(SKF_F_ECDSA_SIG_GET_ECCSIGNATUREBLOB), + "ECDSA_SIG_get_ECCSIGNATUREBLOB"}, + {ERR_FUNC(SKF_F_ECDSA_SIG_NEW_FROM_ECCSIGNATUREBLOB), + "ECDSA_SIG_new_from_ECCSIGNATUREBLOB"}, + {ERR_FUNC(SKF_F_ECDSA_SIG_SET_ECCSIGNATUREBLOB), + "ECDSA_SIG_set_ECCSIGNATUREBLOB"}, + {ERR_FUNC(SKF_F_EC_KEY_GET_ECCPRIVATEKEYBLOB), + "EC_KEY_get_ECCPRIVATEKEYBLOB"}, + {ERR_FUNC(SKF_F_EC_KEY_GET_ECCPUBLICKEYBLOB), + "EC_KEY_get_ECCPUBLICKEYBLOB"}, + {ERR_FUNC(SKF_F_EC_KEY_NEW_FROM_ECCPRIVATEKEYBLOB), + "EC_KEY_new_from_ECCPRIVATEKEYBLOB"}, + {ERR_FUNC(SKF_F_EC_KEY_NEW_FROM_ECCPUBLICKEYBLOB), + "EC_KEY_new_from_ECCPUBLICKEYBLOB"}, + {ERR_FUNC(SKF_F_EC_KEY_SET_ECCPRIVATEKEYBLOB), + "EC_KEY_set_ECCPRIVATEKEYBLOB"}, + {ERR_FUNC(SKF_F_EC_KEY_SET_ECCPUBLICKEYBLOB), + "EC_KEY_set_ECCPUBLICKEYBLOB"}, + {ERR_FUNC(SKF_F_RSA_GET_RSAPRIVATEKEYBLOB), "RSA_get_RSAPRIVATEKEYBLOB"}, + {ERR_FUNC(SKF_F_RSA_NEW_FROM_RSAPRIVATEKEYBLOB), + "RSA_new_from_RSAPRIVATEKEYBLOB"}, + {ERR_FUNC(SKF_F_RSA_NEW_FROM_RSAPUBLICKEYBLOB), + "RSA_new_from_RSAPUBLICKEYBLOB"}, + {ERR_FUNC(SKF_F_RSA_SET_RSAPRIVATEKEYBLOB), "RSA_set_RSAPRIVATEKEYBLOB"}, + {ERR_FUNC(SKF_F_RSA_SET_RSAPUBLICKEYBLOB), "RSA_set_RSAPUBLICKEYBLOB"}, + {ERR_FUNC(SKF_F_SKF_CHANGEDEVAUTHKEY), "SKF_CHANGEDEVAUTHKEY"}, + {ERR_FUNC(SKF_F_SKF_CHANGEPIN), "SKF_CHANGEPIN"}, + {ERR_FUNC(SKF_F_SKF_CLEARSECURESTATE), "SKF_CLEARSECURESTATE"}, + {ERR_FUNC(SKF_F_SKF_CLOSEHANDLE), "SKF_CLOSEHANDLE"}, + {ERR_FUNC(SKF_F_SKF_CONNECTDEV), "SKF_CONNECTDEV"}, + {ERR_FUNC(SKF_F_SKF_CREATEAPPLICATION), "SKF_CREATEAPPLICATION"}, + {ERR_FUNC(SKF_F_SKF_CREATEFILE), "SKF_CREATEFILE"}, + {ERR_FUNC(SKF_F_SKF_DECRYPT), "SKF_DECRYPT"}, + {ERR_FUNC(SKF_F_SKF_DECRYPTFINAL), "SKF_DECRYPTFINAL"}, + {ERR_FUNC(SKF_F_SKF_DECRYPTINIT), "SKF_DECRYPTINIT"}, + {ERR_FUNC(SKF_F_SKF_DECRYPTUPDATE), "SKF_DECRYPTUPDATE"}, + {ERR_FUNC(SKF_F_SKF_DELETEAPPLICATION), "SKF_DELETEAPPLICATION"}, + {ERR_FUNC(SKF_F_SKF_DELETEFILE), "SKF_DELETEFILE"}, + {ERR_FUNC(SKF_F_SKF_DEVAUTH), "SKF_DEVAUTH"}, + {ERR_FUNC(SKF_F_SKF_DIGEST), "SKF_DIGEST"}, + {ERR_FUNC(SKF_F_SKF_DIGESTFINAL), "SKF_DIGESTFINAL"}, + {ERR_FUNC(SKF_F_SKF_DIGESTINIT), "SKF_DIGESTINIT"}, + {ERR_FUNC(SKF_F_SKF_DIGESTUPDATE), "SKF_DIGESTUPDATE"}, + {ERR_FUNC(SKF_F_SKF_DISCONNECTDEV), "SKF_DISCONNECTDEV"}, + {ERR_FUNC(SKF_F_SKF_ENCRYPT), "SKF_ENCRYPT"}, + {ERR_FUNC(SKF_F_SKF_ENCRYPTFINAL), "SKF_ENCRYPTFINAL"}, + {ERR_FUNC(SKF_F_SKF_ENCRYPTINIT), "SKF_ENCRYPTINIT"}, + {ERR_FUNC(SKF_F_SKF_ENCRYPTUPDATE), "SKF_ENCRYPTUPDATE"}, + {ERR_FUNC(SKF_F_SKF_ENUMAPPLICATION), "SKF_ENUMAPPLICATION"}, + {ERR_FUNC(SKF_F_SKF_ENUMDEV), "SKF_ENUMDEV"}, + {ERR_FUNC(SKF_F_SKF_ENUMFILES), "SKF_ENUMFILES"}, + {ERR_FUNC(SKF_F_SKF_EXTECCDECRYPT), "SKF_EXTECCDECRYPT"}, + {ERR_FUNC(SKF_F_SKF_EXTECCENCRYPT), "SKF_EXTECCENCRYPT"}, + {ERR_FUNC(SKF_F_SKF_EXTECCSIGN), "SKF_EXTECCSIGN"}, + {ERR_FUNC(SKF_F_SKF_EXTECCVERIFY), "SKF_EXTECCVERIFY"}, + {ERR_FUNC(SKF_F_SKF_EXTRSAPRIKEYOPERATION), "SKF_EXTRSAPRIKEYOPERATION"}, + {ERR_FUNC(SKF_F_SKF_EXTRSAPUBKEYOPERATION), "SKF_EXTRSAPUBKEYOPERATION"}, + {ERR_FUNC(SKF_F_SKF_GENEXTRSAKEY), "SKF_GENEXTRSAKEY"}, + {ERR_FUNC(SKF_F_SKF_GENRANDOM), "SKF_GENRANDOM"}, + {ERR_FUNC(SKF_F_SKF_GETDEVINFO), "SKF_GETDEVINFO"}, + {ERR_FUNC(SKF_F_SKF_GETDEVSTATE), "SKF_GETDEVSTATE"}, + {ERR_FUNC(SKF_F_SKF_GETFILEINFO), "SKF_GETFILEINFO"}, + {ERR_FUNC(SKF_F_SKF_GETPININFO), "SKF_GETPININFO"}, + {ERR_FUNC(SKF_F_SKF_HANDLE_GET_CBCMAC_CTX), "SKF_HANDLE_GET_CBCMAC_CTX"}, + {ERR_FUNC(SKF_F_SKF_HANDLE_GET_CIPHER_CTX), "SKF_HANDLE_GET_CIPHER_CTX"}, + {ERR_FUNC(SKF_F_SKF_HANDLE_GET_MD_CTX), "SKF_HANDLE_GET_MD_CTX"}, + {ERR_FUNC(SKF_F_SKF_LOCKDEV), "SKF_LOCKDEV"}, + {ERR_FUNC(SKF_F_SKF_MAC), "SKF_MAC"}, + {ERR_FUNC(SKF_F_SKF_MACFINAL), "SKF_MACFINAL"}, + {ERR_FUNC(SKF_F_SKF_MACINIT), "SKF_MACINIT"}, + {ERR_FUNC(SKF_F_SKF_MACUPDATE), "SKF_MACUPDATE"}, + {ERR_FUNC(SKF_F_SKF_READFILE), "SKF_READFILE"}, + {ERR_FUNC(SKF_F_SKF_SETLABEL), "SKF_SETLABEL"}, + {ERR_FUNC(SKF_F_SKF_SETSYMMKEY), "SKF_SETSYMMKEY"}, + {ERR_FUNC(SKF_F_SKF_TRANSMIT), "SKF_TRANSMIT"}, + {ERR_FUNC(SKF_F_SKF_UNBLOCKPIN), "SKF_UNBLOCKPIN"}, + {ERR_FUNC(SKF_F_SKF_UNLOCKDEV), "SKF_UNLOCKDEV"}, + {ERR_FUNC(SKF_F_SKF_VERIFYPIN), "SKF_VERIFYPIN"}, + {ERR_FUNC(SKF_F_SKF_WRITEFILE), "SKF_WRITEFILE"}, + {ERR_FUNC(SKF_F_SM2_CIPHERTEXT_VALUE_GET_ECCCIPHERBLOB), + "SM2_CIPHERTEXT_VALUE_get_ECCCIPHERBLOB"}, + {ERR_FUNC(SKF_F_SM2_CIPHERTEXT_VALUE_NEW_FROM_ECCCIPHERBLOB), + "SM2_CIPHERTEXT_VALUE_new_from_ECCCIPHERBLOB"}, + {ERR_FUNC(SKF_F_SM2_CIPHERTEXT_VALUE_SET_ECCCIPHERBLOB), + "SM2_CIPHERTEXT_VALUE_set_ECCCIPHERBLOB"}, + {0, NULL} +}; + +static ERR_STRING_DATA SKF_str_reasons[] = { + {ERR_REASON(SKF_R_ALGOR_NOT_SUPPORTED), "algor not supported"}, + {ERR_REASON(SKF_R_BAD_ARGUMENT), "bad argument"}, + {ERR_REASON(SKF_R_BUFFER_TOO_SMALL), "buffer too small"}, + {ERR_REASON(SKF_R_CMAC_LIB), "cmac lib"}, + {ERR_REASON(SKF_R_CTX_NOT_CREATED), "ctx not created"}, + {ERR_REASON(SKF_R_DECODE_EC_PRIVATE_KEY_FAILED), + "decode ec private key failed"}, + {ERR_REASON(SKF_R_DECODE_EC_PUBLIC_KEY_FAILED), + "decode ec public key failed"}, + {ERR_REASON(SKF_R_DECRYPT_FAILED), "decrypt failed"}, + {ERR_REASON(SKF_R_ENCODE_CIPHERTEXT_FAILED), "encode ciphertext failed"}, + {ERR_REASON(SKF_R_ENCODE_FAILED), "encode failed"}, + {ERR_REASON(SKF_R_ENCODE_SIGNATURE_FAILED), "encode signature failed"}, + {ERR_REASON(SKF_R_ENCRYPT_FAILED), "encrypt failed"}, + {ERR_REASON(SKF_R_FAIL), "fail"}, + {ERR_REASON(SKF_R_FREE_HANDLE_FAILED), "free handle failed"}, + {ERR_REASON(SKF_R_GEN_RSA_FAILED), "gen rsa failed"}, + {ERR_REASON(SKF_R_INVALID_ALGID), "invalid algid"}, + {ERR_REASON(SKF_R_INVALID_ALGOR), "invalid algor"}, + {ERR_REASON(SKF_R_INVALID_APP_HANDLE), "invalid app handle"}, + {ERR_REASON(SKF_R_INVALID_ARGUMENTS), "invalid arguments"}, + {ERR_REASON(SKF_R_INVALID_BIGNUM_LENGTH), "invalid bignum length"}, + {ERR_REASON(SKF_R_INVALID_BLOB), "invalid blob"}, + {ERR_REASON(SKF_R_INVALID_CIPHERTEXT), "invalid ciphertext"}, + {ERR_REASON(SKF_R_INVALID_CIPHERTEXT_LENGTH), "invalid ciphertext length"}, + {ERR_REASON(SKF_R_INVALID_CIPHERTEXT_MAC), "invalid ciphertext mac"}, + {ERR_REASON(SKF_R_INVALID_CIPHERTEXT_POINT), "invalid ciphertext point"}, + {ERR_REASON(SKF_R_INVALID_CIPHER_CTX_HANDLE), "invalid cipher ctx handle"}, + {ERR_REASON(SKF_R_INVALID_DEV_HANDLE), "invalid dev handle"}, + {ERR_REASON(SKF_R_INVALID_DIGEST_LENGTH), "invalid digest length"}, + {ERR_REASON(SKF_R_INVALID_ECC_PRIVATE_KEY), "invalid ecc private key"}, + {ERR_REASON(SKF_R_INVALID_ECC_PUBLIC_KEY), "invalid ecc public key"}, + {ERR_REASON(SKF_R_INVALID_EC_KEY), "invalid ec key"}, + {ERR_REASON(SKF_R_INVALID_EC_PRIVATE_KEY), "invalid ec private key"}, + {ERR_REASON(SKF_R_INVALID_EC_PUBLIC_KEY), "invalid ec public key"}, + {ERR_REASON(SKF_R_INVALID_HANDLE), "invalid handle"}, + {ERR_REASON(SKF_R_INVALID_HANDLE_MAGIC), "invalid handle magic"}, + {ERR_REASON(SKF_R_INVALID_HANDLE_TYPE), "invalid handle type"}, + {ERR_REASON(SKF_R_INVALID_HASH_HANDLE), "invalid hash handle"}, + {ERR_REASON(SKF_R_INVALID_ID_LENGTH), "invalid id length"}, + {ERR_REASON(SKF_R_INVALID_INPUT_LENGTH), "invalid input length"}, + {ERR_REASON(SKF_R_INVALID_IV_LENGTH), "invalid iv length"}, + {ERR_REASON(SKF_R_INVALID_KEY_HANDLE), "invalid key handle"}, + {ERR_REASON(SKF_R_INVALID_KEY_LENGTH), "invalid key length"}, + {ERR_REASON(SKF_R_INVALID_MAC_HANDLE), "invalid mac handle"}, + {ERR_REASON(SKF_R_INVALID_PLAINTEXT_LENGTH), "invalid plaintext length"}, + {ERR_REASON(SKF_R_INVALID_PRIVATE_KEY), "invalid private key"}, + {ERR_REASON(SKF_R_INVALID_PUBLIC_KEY), "invalid public key"}, + {ERR_REASON(SKF_R_INVALID_RANDOM_LENGTH), "invalid random length"}, + {ERR_REASON(SKF_R_INVALID_RSA_PRIVATE_KEY), "invalid rsa private key"}, + {ERR_REASON(SKF_R_INVALID_RSA_PUBLIC_KEY), "invalid rsa public key"}, + {ERR_REASON(SKF_R_INVALID_SIGNATURE), "invalid signature"}, + {ERR_REASON(SKF_R_MALLOC_FAILED), "malloc failed"}, + {ERR_REASON(SKF_R_NO_PUBLIC_KEY), "no public key"}, + {ERR_REASON(SKF_R_NULL_ARGUMENT), "null argument"}, + {ERR_REASON(SKF_R_SAR_FAIL), "sar fail"}, + {ERR_REASON(SKF_R_SAR_OK), "sar ok"}, + {ERR_REASON(SKF_R_SET_CIPHER_CTX_FAILED), "set cipher ctx failed"}, + {ERR_REASON(SKF_R_SIGN_FAILED), "sign failed"}, + {ERR_REASON(SKF_R_UNKNOWN_ALGOR), "unknown algor"}, + {ERR_REASON(SKF_R_UNKNOWN_APP), "unknown app"}, + {ERR_REASON(SKF_R_VERIFY_NOT_PASS), "verify not pass"}, + {0, NULL} +}; + +#endif + +void ERR_load_SKF_strings(void) +{ +#ifndef OPENSSL_NO_ERR + + if (ERR_func_error_string(SKF_str_functs[0].error) == NULL) { + ERR_load_strings(0, SKF_str_functs); + ERR_load_strings(0, SKF_str_reasons); + } +#endif +} diff --git a/crypto/skf/skf_err2.c b/crypto/skf/skf_err2.c deleted file mode 100644 index 6e80dbf1..00000000 --- a/crypto/skf/skf_err2.c +++ /dev/null @@ -1,133 +0,0 @@ -#include "skf/skf.h" - - - -/* - * about the filename err2: this is manually written err file - */ - - - -int skf_err2openssl(int err) -{ - switch (err) { - case SAR_OK: return SKF_R_SAR_OK; - case SAR_FAIL: return SKF_R_SAR_FAIL; - case SAR_UNKNOWNERR: return SKF_R_ - case SAR_NOTSUPPORTYETERR: return SKF_R_ - case SAR_FILEERR: return SKF_R_ - case SAR_INVALIDHANDLEERR: return SKF_R_ - case SAR_INVALIDPARAMERR: return SKF_R_ - case SAR_READFILEERR: return SKF_R_ - case SAR_WRITEFILEERR: return SKF_R_ - case SAR_NAMELENERR: return SKF_R_ - case SAR_KEYUSAGEERR: return SKF_R_ - case SAR_MODULUSLENERR: return SKF_R_ - case SAR_NOTINITIALIZEERR: return SKF_R_ - case SAR_OBJERR: return SKF_R_ - case SAR_MEMORYERR: return SKF_R_ - case SAR_TIMEOUTERR: return SKF_R_ - case SAR_INDATALENERR: return SKF_R_ - case SAR_INDATAERR: return SKF_R_ - case SAR_GENRANDERR: return SKF_R_ - case SAR_HASHOBJERR: return SKF_R_ - case SAR_HASHERR: return SKF_R_ - case SAR_GENRSAKEYERR: return SKF_R_ - case SAR_RSAMODULUSLENERR: return SKF_R_ - case SAR_CSPIMPRTPUBKEYERR: return SKF_R_ - case SAR_RSAENCERR: return SKF_R_ - case SAR_RSADECERR: return SKF_R_ - case SAR_HASHNOTEQUALERR: return SKF_R_ - case SAR_KEYNOTFOUNTERR: return SKF_R_ - case SAR_CERTNOTFOUNTERR: return SKF_R_ - case SAR_NOTEXPORTERR: return SKF_R_ - case SAR_DECRYPTPADERR: return SKF_R_ - case SAR_MACLENERR: return SKF_R_ - case SAR_BUFFER_TOO_SMALL: return SKF_R_ - case SAR_KEYINFOTYPEERR: return SKF_R_ - case SAR_NOT_EVENTERR: return SKF_R_ - case SAR_DEVICE_REMOVED: return SKF_R_ - case SAR_PIN_INCORRECT: return SKF_R_ - case SAR_PIN_LOCKED: return SKF_R_ - case SAR_PIN_INVALID: return SKF_R_ - case SAR_PIN_LEN_RANGE: return SKF_R_ - case SAR_USER_ALREADY_LOGGED_IN: return SKF_R_ - case SAR_USER_PIN_NOT_INITIALIZED: return SKF_R_ - case SAR_USER_TYPE_INVALID: return SKF_R_ - case SAR_APPLICATION_NAME_INVALID: return SKF_R_ - case SAR_APPLICATION_EXISTS: return SKF_R_ - case SAR_USER_NOT_LOGGED_IN: return SKF_R_ - case SAR_APPLICATION_NOT_EXISTS: return SKF_R_ - case SAR_FILE_ALREADY_EXIST: return SKF_R_ - case SAR_NO_ROOM: return SKF_R_ - case SAR_FILE_NOT_EXIST: return SKF_R_ - } - return 0; -} - - - - -typedef struct { - int err_no; - char *err_str; -} skf_errstr[] = { - { SAR_OK, "Success" }, - { SAR_FAIL, "Failure" }, - { SAR_UNKNOWNERR, "Unknown error" }, - { SAR_NOTSUPPORTYETERR, "Not supported" }, - { SAR_FILEERR, "File error" }, - { SAR_INVALIDHANDLEERR, "Invalid handler" }, - { SAR_INVALIDPARAMERR, "Invalid parameter" }, - { SAR_READFILEERR, "Read file error" }, - { SAR_WRITEFILEERR "Write file error" }, - { SAR_NAMELENERR, "Name length error" }, - { SAR_KEYUSAGEERR, "Key usage error" }, - { SAR_MODULUSLENERR, "Modulus length error" }, - { SAR_NOTINITIALIZEERR, "Not initialized" }, - { SAR_OBJERR, "Object error" }, - { SAR_MEMORYERR, "Memory error" }, - { SAR_TIMEOUTERR, "Time out" }, - { SAR_INDATALENERR, "Input data length error" }, - { SAR_INDATAERR, "Input data error" }, - { SAR_GENRANDERR, "Generate randomness error" }, - { SAR_HASHOBJERR, "Hash object error" }, - { SAR_HASHERR, "Hash error" }, - { SAR_GENRSAKEYERR, "Genenerate RSA key error" }, - { SAR_RSAMODULUSLENERR, "RSA modulus length error" }, - { SAR_CSPIMPRTPUBKEYERR, "CSP import public key error" }, - { SAR_RSAENCERR, "RSA encryption error" }, - { SAR_RSADECERR, "RSA decryption error" }, - { SAR_HASHNOTEQUALERR, "Hash not equal" }, - { SAR_KEYNOTFOUNTERR, "Key not found" }, - { SAR_CERTNOTFOUNTERR, "Certificate not found" }, - { SAR_NOTEXPORTERR, "Not exported" }, - { SAR_DECRYPTPADERR, "Decrypt pad error" }, - { SAR_MACLENERR, "MAC length error" }, - { SAR_BUFFER_TOO_SMALL, "Buffer too small" }, - { SAR_KEYINFOTYPEERR, "Key info type error" }, - { SAR_NOT_EVENTERR, "No event error" }, - { SAR_DEVICE_REMOVED "Device removed" }, - { SAR_PIN_INCORRECT, "PIN incorrect" }, - { SAR_PIN_LOCKED, "PIN locked" }, - { SAR_PIN_INVALID, "PIN invalid" }, - { SAR_PIN_LEN_RANGE, "PIN length error" }, - { SAR_USER_ALREADY_LOGGED_IN, "User already logged in" }, - { SAR_USER_PIN_NOT_INITIALIZED, "User PIN not initialized" }, - { SAR_USER_TYPE_INVALID, "User type invalid" }, - { SAR_APPLICATION_NAME_INVALID, "Application name invalid" }, - { SAR_APPLICATION_EXISTS, "Application already exist" }, - { SAR_USER_NOT_LOGGED_IN, "User not logged in" }, - { SAR_APPLICATION_NOT_EXISTS, "Application not exist" }, - { SAR_FILE_ALREADY_EXIST, "File already exist" }, - { SAR_NO_ROOM, "No file space" }, - { SAR_FILE_NOT_EXIST, "File not exist" } -}; - - -LPSTR DEVAPI SKF_GetErrorString(ULONG ulError) -{ - return NULL; -} - - diff --git a/crypto/skf/skf_errstr.c b/crypto/skf/skf_errstr.c new file mode 100644 index 00000000..86aa9692 --- /dev/null +++ b/crypto/skf/skf_errstr.c @@ -0,0 +1,123 @@ +/* crypto/skf/skf_errstr.c */ +/* ==================================================================== + * Copyright (c) 2014 - 2016 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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 + +typedef struct { + int err_no; + char *err_str; +} skf_errinfo; + + +skf_errinfo skf_errstr[] = { + { SAR_OK, "Success" }, + { SAR_FAIL, "Failure" }, + { SAR_UNKNOWNERR, "Unknown error" }, + { SAR_NOTSUPPORTYETERR, "Not supported" }, + { SAR_FILEERR, "File error" }, + { SAR_INVALIDHANDLEERR, "Invalid handle" }, + { SAR_INVALIDPARAMERR, "Invalid parameter" }, + { SAR_READFILEERR, "Read file error" }, + { SAR_WRITEFILEERR, "Write file error" }, + { SAR_NAMELENERR, "Name length error" }, + { SAR_KEYUSAGEERR, "Key usage error" }, + { SAR_MODULUSLENERR, "Modulus length error" }, + { SAR_NOTINITIALIZEERR, "Not initialized" }, + { SAR_OBJERR, "Object error" }, + { SAR_MEMORYERR, "Memory error" }, + { SAR_TIMEOUTERR, "Time out" }, + { SAR_INDATALENERR, "Input data length error" }, + { SAR_INDATAERR, "Input data error" }, + { SAR_GENRANDERR, "Generate randomness error" }, + { SAR_HASHOBJERR, "Hash object error" }, + { SAR_HASHERR, "Hash error" }, + { SAR_GENRSAKEYERR, "Genenerate RSA key error" }, + { SAR_RSAMODULUSLENERR, "RSA modulus length error" }, + { SAR_CSPIMPRTPUBKEYERR, "CSP import public key error" }, + { SAR_RSAENCERR, "RSA encryption error" }, + { SAR_RSADECERR, "RSA decryption error" }, + { SAR_HASHNOTEQUALERR, "Hash not equal" }, + { SAR_KEYNOTFOUNTERR, "Key not found" }, + { SAR_CERTNOTFOUNTERR, "Certificate not found" }, + { SAR_NOTEXPORTERR, "Not exported" }, + { SAR_DECRYPTPADERR, "Decrypt pad error" }, + { SAR_MACLENERR, "MAC length error" }, + { SAR_BUFFER_TOO_SMALL, "Buffer too small" }, + { SAR_KEYINFOTYPEERR, "Key info type error" }, + { SAR_NOT_EVENTERR, "No event error" }, + { SAR_DEVICE_REMOVED, "Device removed" }, + { SAR_PIN_INCORRECT, "PIN incorrect" }, + { SAR_PIN_LOCKED, "PIN locked" }, + { SAR_PIN_INVALID, "PIN invalid" }, + { SAR_PIN_LEN_RANGE, "PIN length error" }, + { SAR_USER_ALREADY_LOGGED_IN, "User already logged in" }, + { SAR_USER_PIN_NOT_INITIALIZED, "User PIN not initialized" }, + { SAR_USER_TYPE_INVALID, "User type invalid" }, + { SAR_APPLICATION_NAME_INVALID, "Application name invalid" }, + { SAR_APPLICATION_EXISTS, "Application already exist" }, + { SAR_USER_NOT_LOGGED_IN, "User not logged in" }, + { SAR_APPLICATION_NOT_EXISTS, "Application not exist" }, + { SAR_FILE_ALREADY_EXIST, "File already exist" }, + { SAR_NO_ROOM, "No file space" }, + { SAR_FILE_NOT_EXIST, "File not exist" } +}; + +LPSTR DEVAPI SKF_GetErrorString(ULONG ulError) +{ + int i; + for (i = 0; i < sizeof(skf_errstr)/sizeof(skf_errstr[0]); i++) { + if (ulError == skf_errstr[i].err_no) { + return (LPSTR)skf_errstr[i].err_str; + } + } + return (LPSTR)"(undef)"; +} + diff --git a/crypto/skf/skf_ex.h b/crypto/skf/skf_ex.h new file mode 100644 index 00000000..aacef416 --- /dev/null +++ b/crypto/skf/skf_ex.h @@ -0,0 +1,237 @@ +/* crypto/skf/skf_ex.h */ +/* ==================================================================== + * Copyright (c) 2016 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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. + * ==================================================================== + * + */ + +#ifndef HEADER_SKF_EX_H +#define HEADER_SKF_EX_H + +#include +#include +#include +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + + +RSA *RSA_new_from_RSAPUBLICKEYBLOB(const RSAPUBLICKEYBLOB *blob); +RSA *RSA_new_from_RSAPRIVATEKEYBLOB(const RSAPRIVATEKEYBLOB *blob); +int RSA_set_RSAPUBLICKEYBLOB(RSA *rsa, const RSAPUBLICKEYBLOB *blob); +int RSA_get_RSAPUBLICKEYBLOB(RSA *rsa, RSAPUBLICKEYBLOB *blob); +int RSA_set_RSAPRIVATEKEYBLOB(RSA *rsa, const RSAPRIVATEKEYBLOB *blob); +int RSA_get_RSAPRIVATEKEYBLOB(RSA *rsa, RSAPRIVATEKEYBLOB *blob); + +EC_KEY *EC_KEY_new_from_ECCPUBLICKEYBLOB(const ECCPUBLICKEYBLOB *blob); +EC_KEY *EC_KEY_new_from_ECCPRIVATEKEYBLOB(const ECCPRIVATEKEYBLOB *blob); +int EC_KEY_set_ECCPUBLICKEYBLOB(EC_KEY *ec_key, const ECCPUBLICKEYBLOB *blob); +int EC_KEY_get_ECCPUBLICKEYBLOB(EC_KEY *ec_key, ECCPUBLICKEYBLOB *blob); +int EC_KEY_set_ECCPRIVATEKEYBLOB(EC_KEY *ec_key, const ECCPRIVATEKEYBLOB *blob); +int EC_KEY_get_ECCPRIVATEKEYBLOB(EC_KEY *ec_key, ECCPRIVATEKEYBLOB *blob); + +SM2_CIPHERTEXT_VALUE *SM2_CIPHERTEXT_VALUE_new_from_ECCCIPHERBLOB(const ECCCIPHERBLOB *blob); +int SM2_CIPHERTEXT_VALUE_set_ECCCIPHERBLOB(SM2_CIPHERTEXT_VALUE *cv, const ECCCIPHERBLOB *blob); +int SM2_CIPHERTEXT_VALUE_get_ECCCIPHERBLOB(const SM2_CIPHERTEXT_VALUE *cv, ECCCIPHERBLOB *blob); + +ECDSA_SIG *ECDSA_SIG_new_from_ECCSIGNATUREBLOB(const ECCSIGNATUREBLOB *blob); +int ECDSA_SIG_get_ECCSIGNATUREBLOB(const ECDSA_SIG *sig, ECCSIGNATUREBLOB *blob); +int ECDSA_SIG_set_ECCSIGNATUREBLOB(ECDSA_SIG *sig, const ECCSIGNATUREBLOB *blob); + +/* BEGIN ERROR CODES */ +/* + * The following lines are auto generated by the script mkerr.pl. Any changes + * made after this point may be overwritten when the script is next run. + */ +void ERR_load_SKF_strings(void); + +/* Error codes for the SKF functions. */ + +/* Function codes. */ +# define SKF_F_ECDSA_SIG_GET_ECCSIGNATUREBLOB 143 +# define SKF_F_ECDSA_SIG_NEW_FROM_ECCSIGNATUREBLOB 144 +# define SKF_F_ECDSA_SIG_SET_ECCSIGNATUREBLOB 145 +# define SKF_F_EC_KEY_GET_ECCPRIVATEKEYBLOB 155 +# define SKF_F_EC_KEY_GET_ECCPUBLICKEYBLOB 156 +# define SKF_F_EC_KEY_NEW_FROM_ECCPRIVATEKEYBLOB 146 +# define SKF_F_EC_KEY_NEW_FROM_ECCPUBLICKEYBLOB 147 +# define SKF_F_EC_KEY_SET_ECCPRIVATEKEYBLOB 157 +# define SKF_F_EC_KEY_SET_ECCPUBLICKEYBLOB 158 +# define SKF_F_RSA_GET_RSAPRIVATEKEYBLOB 169 +# define SKF_F_RSA_NEW_FROM_RSAPRIVATEKEYBLOB 163 +# define SKF_F_RSA_NEW_FROM_RSAPUBLICKEYBLOB 164 +# define SKF_F_RSA_SET_RSAPRIVATEKEYBLOB 170 +# define SKF_F_RSA_SET_RSAPUBLICKEYBLOB 165 +# define SKF_F_SKF_CHANGEDEVAUTHKEY 100 +# define SKF_F_SKF_CHANGEPIN 101 +# define SKF_F_SKF_CLEARSECURESTATE 102 +# define SKF_F_SKF_CLOSEHANDLE 136 +# define SKF_F_SKF_CONNECTDEV 103 +# define SKF_F_SKF_CREATEAPPLICATION 104 +# define SKF_F_SKF_CREATEFILE 105 +# define SKF_F_SKF_DECRYPT 159 +# define SKF_F_SKF_DECRYPTFINAL 130 +# define SKF_F_SKF_DECRYPTINIT 160 +# define SKF_F_SKF_DECRYPTUPDATE 161 +# define SKF_F_SKF_DELETEAPPLICATION 106 +# define SKF_F_SKF_DELETEFILE 107 +# define SKF_F_SKF_DEVAUTH 108 +# define SKF_F_SKF_DIGEST 137 +# define SKF_F_SKF_DIGESTFINAL 109 +# define SKF_F_SKF_DIGESTINIT 138 +# define SKF_F_SKF_DIGESTUPDATE 139 +# define SKF_F_SKF_DISCONNECTDEV 110 +# define SKF_F_SKF_ENCRYPT 162 +# define SKF_F_SKF_ENCRYPTFINAL 131 +# define SKF_F_SKF_ENCRYPTINIT 111 +# define SKF_F_SKF_ENCRYPTUPDATE 112 +# define SKF_F_SKF_ENUMAPPLICATION 113 +# define SKF_F_SKF_ENUMDEV 114 +# define SKF_F_SKF_ENUMFILES 115 +# define SKF_F_SKF_EXTECCDECRYPT 148 +# define SKF_F_SKF_EXTECCENCRYPT 149 +# define SKF_F_SKF_EXTECCSIGN 150 +# define SKF_F_SKF_EXTECCVERIFY 151 +# define SKF_F_SKF_EXTRSAPRIKEYOPERATION 166 +# define SKF_F_SKF_EXTRSAPUBKEYOPERATION 167 +# define SKF_F_SKF_GENEXTRSAKEY 132 +# define SKF_F_SKF_GENRANDOM 133 +# define SKF_F_SKF_GETDEVINFO 116 +# define SKF_F_SKF_GETDEVSTATE 117 +# define SKF_F_SKF_GETFILEINFO 118 +# define SKF_F_SKF_GETPININFO 119 +# define SKF_F_SKF_HANDLE_GET_CBCMAC_CTX 140 +# define SKF_F_SKF_HANDLE_GET_CIPHER_CTX 141 +# define SKF_F_SKF_HANDLE_GET_MD_CTX 142 +# define SKF_F_SKF_LOCKDEV 120 +# define SKF_F_SKF_MAC 168 +# define SKF_F_SKF_MACFINAL 134 +# define SKF_F_SKF_MACINIT 121 +# define SKF_F_SKF_MACUPDATE 135 +# define SKF_F_SKF_READFILE 122 +# define SKF_F_SKF_SETLABEL 123 +# define SKF_F_SKF_SETSYMMKEY 124 +# define SKF_F_SKF_TRANSMIT 125 +# define SKF_F_SKF_UNBLOCKPIN 126 +# define SKF_F_SKF_UNLOCKDEV 127 +# define SKF_F_SKF_VERIFYPIN 128 +# define SKF_F_SKF_WRITEFILE 129 +# define SKF_F_SM2_CIPHERTEXT_VALUE_GET_ECCCIPHERBLOB 152 +# define SKF_F_SM2_CIPHERTEXT_VALUE_NEW_FROM_ECCCIPHERBLOB 153 +# define SKF_F_SM2_CIPHERTEXT_VALUE_SET_ECCCIPHERBLOB 154 + +/* Reason codes. */ +# define SKF_R_ALGOR_NOT_SUPPORTED 100 +# define SKF_R_BAD_ARGUMENT 101 +# define SKF_R_BUFFER_TOO_SMALL 102 +# define SKF_R_CMAC_LIB 103 +# define SKF_R_CTX_NOT_CREATED 121 +# define SKF_R_DECODE_EC_PRIVATE_KEY_FAILED 131 +# define SKF_R_DECODE_EC_PUBLIC_KEY_FAILED 132 +# define SKF_R_DECRYPT_FAILED 133 +# define SKF_R_ENCODE_CIPHERTEXT_FAILED 134 +# define SKF_R_ENCODE_FAILED 114 +# define SKF_R_ENCODE_SIGNATURE_FAILED 135 +# define SKF_R_ENCRYPT_FAILED 136 +# define SKF_R_FAIL 104 +# define SKF_R_FREE_HANDLE_FAILED 128 +# define SKF_R_GEN_RSA_FAILED 115 +# define SKF_R_INVALID_ALGID 122 +# define SKF_R_INVALID_ALGOR 156 +# define SKF_R_INVALID_APP_HANDLE 105 +# define SKF_R_INVALID_ARGUMENTS 123 +# define SKF_R_INVALID_BIGNUM_LENGTH 137 +# define SKF_R_INVALID_BLOB 124 +# define SKF_R_INVALID_CIPHERTEXT 138 +# define SKF_R_INVALID_CIPHERTEXT_LENGTH 139 +# define SKF_R_INVALID_CIPHERTEXT_MAC 140 +# define SKF_R_INVALID_CIPHERTEXT_POINT 141 +# define SKF_R_INVALID_CIPHER_CTX_HANDLE 154 +# define SKF_R_INVALID_DEV_HANDLE 106 +# define SKF_R_INVALID_DIGEST_LENGTH 142 +# define SKF_R_INVALID_ECC_PRIVATE_KEY 143 +# define SKF_R_INVALID_ECC_PUBLIC_KEY 144 +# define SKF_R_INVALID_EC_KEY 151 +# define SKF_R_INVALID_EC_PRIVATE_KEY 145 +# define SKF_R_INVALID_EC_PUBLIC_KEY 146 +# define SKF_R_INVALID_HANDLE 107 +# define SKF_R_INVALID_HANDLE_MAGIC 125 +# define SKF_R_INVALID_HANDLE_TYPE 126 +# define SKF_R_INVALID_HASH_HANDLE 127 +# define SKF_R_INVALID_ID_LENGTH 129 +# define SKF_R_INVALID_INPUT_LENGTH 157 +# define SKF_R_INVALID_IV_LENGTH 108 +# define SKF_R_INVALID_KEY_HANDLE 116 +# define SKF_R_INVALID_KEY_LENGTH 117 +# define SKF_R_INVALID_MAC_HANDLE 118 +# define SKF_R_INVALID_PLAINTEXT_LENGTH 147 +# define SKF_R_INVALID_PRIVATE_KEY 152 +# define SKF_R_INVALID_PUBLIC_KEY 153 +# define SKF_R_INVALID_RANDOM_LENGTH 119 +# define SKF_R_INVALID_RSA_PRIVATE_KEY 158 +# define SKF_R_INVALID_RSA_PUBLIC_KEY 159 +# define SKF_R_INVALID_SIGNATURE 148 +# define SKF_R_MALLOC_FAILED 120 +# define SKF_R_NO_PUBLIC_KEY 130 +# define SKF_R_NULL_ARGUMENT 109 +# define SKF_R_SAR_FAIL 110 +# define SKF_R_SAR_OK 111 +# define SKF_R_SET_CIPHER_CTX_FAILED 155 +# define SKF_R_SIGN_FAILED 149 +# define SKF_R_UNKNOWN_ALGOR 112 +# define SKF_R_UNKNOWN_APP 113 +# define SKF_R_VERIFY_NOT_PASS 150 + +#ifdef __cplusplus +} +#endif +#endif diff --git a/crypto/skf/skf_gmssl.c b/crypto/skf/skf_gmssl.c deleted file mode 100644 index eb0aec5a..00000000 --- a/crypto/skf/skf_gmssl.c +++ /dev/null @@ -1,722 +0,0 @@ -/* engines/skf/skf_gmssl.c */ -/* ==================================================================== - * Copyright (c) 2015-2016 The GmSSL 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 GmSSL Project. - * (http://gmssl.org/)" - * - * 4. The name "GmSSL Project" must not be used to endorse or promote - * products derived from this software without prior written - * permission. For written permission, please contact - * guanzhi1980@gmail.com. - * - * 5. Products derived from this software may not be called "GmSSL" - * nor may "GmSSL" appear in their names without prior written - * permission of the GmSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the GmSSL Project - * (http://gmssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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. - * ==================================================================== - * - */ -/* - * this should be the SKF soft-token based on GmSSL libcrypto. - */ - -#include -#include -#include "skf.h" - -#define DEV_NAME "skf-soft-token" -#define DEV_NAME_LIST DEV_NAME"\0" -#define APP_NAME "default-app" -#define APP_NAME_LIST APP_NAME"\0" -#define CONTAINER_NAME "container0" -#define CONTAINER_NAME_LIST CONTAINER_NAME"\0" - - -ULONG DEVAPI SKF_WaitForDevEvent(LPSTR szDevName, - ULONG *pulDevNameLen, ULONG *pulEvent) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_CancelWaitForDevEvent() -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_EnumDev(BOOL bPresent, - LPSTR szNameList, - ULONG *pulSize) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_ConnectDev(LPSTR szName, - DEVHANDLE *phDev) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_DisConnectDev(DEVHANDLE hDev) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_GetDevState(LPSTR szDevName, - ULONG *pulDevState) -{ - if (!pulDevState) { - return SAR_INVALIDPARAMERR; - } - *pulDevState = DEV_PRESENT_STATE; - return SAR_OK; -} - -ULONG DEVAPI SKF_SetLabel(DEVHANDLE hDev, - LPSTR szLabel) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_GetDevInfo(DEVHANDLE hDev, - DEVINFO *pDevInfo) -{ - DEVINFO devInfo; - - bzero(&devInfo, sizeof(DEVINFO)); - devInfo.Version.major = 1; - devInfo.Version.minor = 0; - strcpy((char *)&devInfo.Manufacturer, "GmSSL Project (http://gmssl.org)"); - strcpy((char *)&devInfo.Issuer, "GmSSL Project (http://gmssl.org)"); - strcpy((char *)&devInfo.Label, "SKF Softotken"); - strcpy((char *)&devInfo.SerialNumber, "000001"); - devInfo.HWVersion.major = 1; - devInfo.HWVersion.minor = 0; - devInfo.FirmwareVersion.major = 1; - devInfo.FirmwareVersion.minor = 0; - devInfo.AlgSymCap = 0x0000041F; - devInfo.AlgAsymCap = 0x00030700; - devInfo.AlgHashCap = 0x00000007; - devInfo.DevAuthAlgId = SGD_SM4_CBC; - devInfo.TotalSpace = 0; - devInfo.FreeSpace = 0; - devInfo.MaxECCBufferSize = 0; /* FIXME: max inlen of ECC encrypt */ - devInfo.MaxBufferSize = 0; /* FIXME: max inlen of SM4 encrypt */ - - memcpy(pDevInfo, &devInfo, sizeof(DEVINFO)); - return SAR_OK; -} - -ULONG DEVAPI SKF_LockDev(DEVHANDLE hDev, - ULONG ulTimeOut) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_UnlockDev(DEVHANDLE hDev) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_Transmit(DEVHANDLE hDev, - BYTE *pbCommand, - ULONG ulCommandLen, - BYTE *pbData, - ULONG *pulDataLen) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_ChangeDevAuthKey(DEVHANDLE hDev, - BYTE *pbKeyValue, - ULONG ulKeyLen) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_DevAuth(DEVHANDLE hDev, - BYTE *pbAuthData, - ULONG ulLen) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_ChangePIN(HAPPLICATION hApplication, - ULONG ulPINType, - LPSTR szOldPin, - LPSTR szNewPin, - ULONG *pulRetryCount) -{ - return SAR_OK; -} - -LONG DEVAPI SKF_GetPINInfo(HAPPLICATION hApplication, - ULONG ulPINType, - ULONG *pulMaxRetryCount, - ULONG *pulRemainRetryCount, - BOOL *pbDefaultPin) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_VerifyPIN(HAPPLICATION hApplication, - ULONG ulPINType, - LPSTR szPIN, - ULONG *pulRetryCount) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_UnblockPIN(HAPPLICATION hApplication, - LPSTR szAdminPIN, - LPSTR szNewUserPIN, - ULONG *pulRetryCount) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_ClearSecureState(HAPPLICATION hApplication) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_CreateApplication(DEVHANDLE hDev, - LPSTR szAppName, - LPSTR szAdminPin, - DWORD dwAdminPinRetryCount, - LPSTR szUserPin, - DWORD dwUserPinRetryCount, - DWORD dwCreateFileRights, - HAPPLICATION *phApplication) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_EnumApplication(DEVHANDLE hDev, - LPSTR szAppName, - ULONG *pulSize) -{ - if (!szAppName) { - *pulSize = sizeof(APP_NAME_LIST); - return SAR_OK; - } - if (*pulSize < sizeof(APP_NAME_LIST)) { - return SAR_BUFFER_TOO_SMALL; - } - memcpy(szAppName, APP_NAME_LIST, sizeof(APP_NAME_LIST)); - return SAR_OK; -} - -ULONG DEVAPI SKF_DeleteApplication(DEVHANDLE hDev, - LPSTR szAppName) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_OpenApplication(DEVHANDLE hDev, - LPSTR szAppName, - HAPPLICATION *phApplication) -{ - if (!phApplication) { - return SAR_INVALIDPARAMERR; - } - return SAR_OK; -} - -ULONG DEVAPI SKF_CloseApplication(HAPPLICATION hApplication) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_CreateFile(HAPPLICATION hApplication, - LPSTR szFileName, - ULONG ulFileSize, - ULONG ulReadRights, - ULONG ulWriteRights) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_DeleteFile(HAPPLICATION hApplication, - LPSTR szFileName) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_EnumFiles(HAPPLICATION hApplication, - LPSTR szFileList, - ULONG *pulSize) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_GetFileInfo(HAPPLICATION hApplication, - LPSTR szFileName, - FILEATTRIBUTE *pFileInfo) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_ReadFile(HAPPLICATION hApplication, - LPSTR szFileName, - ULONG ulOffset, - ULONG ulSize, - BYTE * pbOutData, - ULONG *pulOutLen) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_WriteFile(HAPPLICATION hApplication, - LPSTR szFileName, - ULONG ulOffset, - BYTE *pbData, - ULONG ulSize) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_CreateContainer(HAPPLICATION hApplication, - LPSTR szContainerName, - HCONTAINER *phContainer) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_DeleteContainer(HAPPLICATION hApplication, - LPSTR szContainerName) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_EnumContainer(HAPPLICATION hApplication, - LPSTR szContainerName, - ULONG *pulSize) -{ - if (!pulSize) { - return SAR_INVALIDPARAMERR; - } - if (!szContainerName) { - *pulSize = sizeof(CONTAINER_NAME_LIST); - return SAR_OK; - } - if (*pulSize < sizeof(CONTAINER_NAME_LIST)) { - return SAR_BUFFER_TOO_SMALL; - } - memcpy(szContainerName, CONTAINER_NAME_LIST, sizeof(CONTAINER_NAME_LIST)); - return SAR_OK; -} - -ULONG DEVAPI SKF_OpenContainer(HAPPLICATION hApplication, - LPSTR szContainerName, - HCONTAINER *phContainer) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_CloseContainer(HCONTAINER hContainer) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_GetContainerType(HCONTAINER hContainer, - ULONG *pulContainerType) -{ - if (!pulContainerType) { - return SAR_INVALIDPARAMERR; - } - *pulContainerType = CONTAINER_TYPE_ECC; - return SAR_OK; -} - -ULONG DEVAPI SKF_ImportCertificate(HCONTAINER hContainer, - BOOL bSignFlag, - BYTE *pbCert, - ULONG ulCertLen) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_ExportCertificate(HCONTAINER hContainer, - BOOL bSignFlag, - BYTE* pbCert, - ULONG *pulCertLen) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_GenRandom(DEVHANDLE hDev, - BYTE *pbRandom, - ULONG ulRandomLen) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_GenExtRSAKey(DEVHANDLE hDev, - ULONG ulBitsLen, - RSAPRIVATEKEYBLOB *pBlob) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_GenRSAKeyPair(HCONTAINER hContainer, - ULONG ulBitsLen, - RSAPUBLICKEYBLOB *pBlob) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_ImportRSAKeyPair(HCONTAINER hContainer, - ULONG ulSymAlgId, - BYTE *pbWrappedKey, - ULONG ulWrappedKeyLen, - BYTE *pbEncryptedData, - ULONG ulEncryptedDataLen) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_RSASignData(HCONTAINER hContainer, - BYTE *pbData, - ULONG ulDataLen, - BYTE *pbSignature, - ULONG *pulSignLen) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_RSAVerify(DEVHANDLE hDev, - RSAPUBLICKEYBLOB *pRSAPubKeyBlob, - BYTE *pbData, - ULONG ulDataLen, - BYTE *pbSignature, - ULONG ulSignLen) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_RSAExportSessionKey(HCONTAINER hContainer, - ULONG ulAlgId, - RSAPUBLICKEYBLOB *pPubKey, - BYTE *pbData, - ULONG *pulDataLen, - HANDLE *phSessionKey) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_ExtRSAPubKeyOperation(DEVHANDLE hDev, - RSAPUBLICKEYBLOB *pRSAPubKeyBlob, - BYTE *pbInput, - ULONG ulInputLen, - BYTE *pbOutput, - ULONG *pulOutputLen) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_ExtRSAPriKeyOperation(DEVHANDLE hDev, - RSAPRIVATEKEYBLOB *pRSAPriKeyBlob, - BYTE *pbInput, - ULONG ulInputLen, - BYTE *pbOutput, - ULONG *pulOutputLen) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_GenECCKeyPair(HCONTAINER hContainer, - ULONG ulAlgId, - ECCPUBLICKEYBLOB *pBlob) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_ImportECCKeyPair(HCONTAINER hContainer, - PENVELOPEDKEYBLOB pEnvelopedKeyBlob) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_ECCSignData(HCONTAINER hContainer, - BYTE *pbData, - ULONG ulDataLen, - PECCSIGNATUREBLOB pSignature) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_ECCVerify(DEVHANDLE hDev, - ECCPUBLICKEYBLOB *pECCPubKeyBlob, - BYTE *pbData, - ULONG ulDataLen, - PECCSIGNATUREBLOB pSignature) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_ECCExportSessionKey(HCONTAINER hContainer, - ULONG ulAlgId, - ECCPUBLICKEYBLOB *pPubKey, - PECCCIPHERBLOB pData, - HANDLE *phSessionKey) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_ExtECCEncrypt(DEVHANDLE hDev, - ECCPUBLICKEYBLOB *pECCPubKeyBlob, - BYTE *pbPlainText, - ULONG ulPlainTextLen, - PECCCIPHERBLOB pCipherText) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_ExtECCDecrypt(DEVHANDLE hDev, - ECCPRIVATEKEYBLOB *pECCPriKeyBlob, - PECCCIPHERBLOB pCipherText, - BYTE *pbPlainText, - ULONG *pulPlainTextLen) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_ExtECCSign(DEVHANDLE hDev, - ECCPRIVATEKEYBLOB *pECCPriKeyBlob, - BYTE *pbData, - ULONG ulDataLen, - PECCSIGNATUREBLOB pSignature) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_ExtECCVerify(DEVHANDLE hDev, - ECCPUBLICKEYBLOB *pECCPubKeyBlob, - BYTE *pbData, - ULONG ulDataLen, - PECCSIGNATUREBLOB pSignature) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_GenerateAgreementDataWithECC(HCONTAINER hContainer, - ULONG ulAlgId, - ECCPUBLICKEYBLOB *pTempECCPubKeyBlob, - BYTE *pbID, - ULONG ulIDLen, - HANDLE *phAgreementHandle) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_GenerateAgreementDataAndKeyWithECC(HANDLE hContainer, - ULONG ulAlgId, - ECCPUBLICKEYBLOB *pSponsorECCPubKeyBlob, - ECCPUBLICKEYBLOB *pSponsorTempECCPubKeyBlob, - ECCPUBLICKEYBLOB *pTempECCPubKeyBlob, - BYTE *pbID, - ULONG ulIDLen, - BYTE *pbSponsorID, - ULONG ulSponsorIDLen, - HANDLE *phKeyHandle) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_GenerateKeyWithECC(HANDLE hAgreementHandle, - ECCPUBLICKEYBLOB *pECCPubKeyBlob, - ECCPUBLICKEYBLOB *pTempECCPubKeyBlob, - BYTE *pbID, - ULONG ulIDLen, - HANDLE *phKeyHandle) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_ExportPublicKey(HCONTAINER hContainer, - BOOL bSignFlag, - BYTE* pbBlob, - ULONG* pulBlobLen) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_ImportSessionKey(HCONTAINER hContainer, - ULONG ulAlgId, - BYTE *pbWrapedData, - ULONG ulWrapedLen, - HANDLE *phKey) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_SetSymmKey(DEVHANDLE hDev, - BYTE *pbKey, - ULONG ulAlgID, - HANDLE *phKey) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_EncryptInit(HANDLE hKey, - BLOCKCIPHERPARAM EncryptParam) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_Encrypt(HANDLE hKey, - BYTE *pbData, - ULONG ulDataLen, - BYTE *pbEncryptedData, - ULONG *pulEncryptedLen) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_EncryptUpdate(HANDLE hKey, - BYTE *pbData, - ULONG ulDataLen, - BYTE *pbEncryptedData, - ULONG *pulEncryptedLen) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_EncryptFinal(HANDLE hKey, - BYTE *pbEncryptedData, - ULONG *pulEncryptedDataLen) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_DecryptInit(HANDLE hKey, - BLOCKCIPHERPARAM DecryptParam) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_Decrypt(HANDLE hKey, - BYTE *pbEncryptedData, - ULONG ulEncryptedLen, - BYTE *pbData, - ULONG *pulDataLen) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_DecryptUpdate(HANDLE hKey, - BYTE *pbEncryptedData, - ULONG ulEncryptedLen, - BYTE *pbData, - ULONG *pulDataLen) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_DecryptFinal(HANDLE hKey, - BYTE *pbDecryptedData, - ULONG *pulDecryptedDataLen) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_DigestInit(DEVHANDLE hDev, - ULONG ulAlgID, - ECCPUBLICKEYBLOB *pPubKey, - BYTE *pucID, - ULONG ulIDLen, - HANDLE *phHash) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_Digest(HANDLE hHash, - BYTE *pbData, - ULONG ulDataLen, - BYTE *pbHashData, - ULONG *pulHashLen) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_DigestUpdate(HANDLE hHash, - BYTE *pbData, - ULONG ulDataLen) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_DigestFinal(HANDLE hHash, - BYTE *pHashData, - ULONG *pulHashLen) -{ - return SAR_OK; -} - -ULONG DEVAPI SKF_MacInit(HANDLE hKey, - BLOCKCIPHERPARAM *pMacParam, - HANDLE *phMac) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_Mac(HANDLE hMac, - BYTE *pbData, - ULONG ulDataLen, - BYTE *pbMacData, - ULONG *pulMacLen) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_MacUpdate(HANDLE hMac, - BYTE *pbData, - ULONG ulDataLen) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_MacFinal(HANDLE hMac, - BYTE *pbMacData, - ULONG *pulMacDataLen) -{ - return SAR_NOTSUPPORTYETERR; -} - -ULONG DEVAPI SKF_CloseHandle(HANDLE hHandle) -{ - return SAR_NOTSUPPORTYETERR; -} - diff --git a/crypto/skf/skf_handle.c b/crypto/skf/skf_handle.c new file mode 100644 index 00000000..5d280564 --- /dev/null +++ b/crypto/skf/skf_handle.c @@ -0,0 +1,206 @@ +/* crypto/skf/skf_handle.c */ +/* ==================================================================== + * Copyright (c) 2015-2016 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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 +#include +#include +#include "skf_lcl.h" + + +EVP_MD_CTX *SKF_HANDLE_get_md_ctx(SKF_HANDLE *handle) +{ + EVP_MD_CTX *ret; + + if (!handle) { + SKFerr(SKF_F_SKF_HANDLE_GET_MD_CTX, SKF_R_NULL_ARGUMENT); + return NULL; + } + + if (handle->magic != SKF_HANDLE_MAGIC) { + SKFerr(SKF_F_SKF_HANDLE_GET_MD_CTX, SKF_R_INVALID_HANDLE_MAGIC); + return NULL; + } + + if (handle->type != SKF_HASH_HANDLE) { + SKFerr(SKF_F_SKF_HANDLE_GET_MD_CTX, SKF_R_INVALID_HANDLE_TYPE); + return NULL; + } + + if (!(ret = handle->u.md_ctx)) { + SKFerr(SKF_F_SKF_HANDLE_GET_MD_CTX, SKF_R_CTX_NOT_CREATED); + return NULL; + } + + return ret; +} + +CBCMAC_CTX *SKF_HANDLE_get_cbcmac_ctx(SKF_HANDLE *handle) +{ + CBCMAC_CTX *ret; + + if (!handle) { + SKFerr(SKF_F_SKF_HANDLE_GET_CBCMAC_CTX, SKF_R_NULL_ARGUMENT); + return NULL; + } + + if (handle->magic != SKF_HANDLE_MAGIC) { + SKFerr(SKF_F_SKF_HANDLE_GET_CBCMAC_CTX, SKF_R_INVALID_HANDLE_MAGIC); + return NULL; + } + + if (handle->type != SKF_MAC_HANDLE) { + SKFerr(SKF_F_SKF_HANDLE_GET_CBCMAC_CTX, SKF_R_INVALID_HANDLE_TYPE); + return NULL; + } + + if (!(ret = handle->u.cbcmac_ctx)) { + SKFerr(SKF_F_SKF_HANDLE_GET_CBCMAC_CTX, SKF_R_CTX_NOT_CREATED); + return NULL; + } + + return ret; +} + +EVP_CIPHER_CTX *SKF_HANDLE_get_cipher_ctx(SKF_HANDLE *handle) +{ + EVP_CIPHER_CTX *ret; + + if (!handle) { + SKFerr(SKF_F_SKF_HANDLE_GET_CIPHER_CTX, SKF_R_NULL_ARGUMENT); + return NULL; + } + + if (handle->magic != SKF_HANDLE_MAGIC) { + SKFerr(SKF_F_SKF_HANDLE_GET_CIPHER_CTX, SKF_R_INVALID_HANDLE_MAGIC); + return NULL; + } + + if (handle->type != SKF_CIPHER_HANDLE) { + SKFerr(SKF_F_SKF_HANDLE_GET_CIPHER_CTX, SKF_R_INVALID_HANDLE_TYPE); + return NULL; + } + + if (!(ret = handle->u.cipher_ctx)) { + SKFerr(SKF_F_SKF_HANDLE_GET_CIPHER_CTX, SKF_R_CTX_NOT_CREATED); + return NULL; + } + + return ret; +} + +int SKF_HANDLE_free_cipher_ctx(SKF_HANDLE *handle) +{ + return 0; +} + +int SKF_HANDLE_free(SKF_HANDLE *handle) +{ + return 0; +} + +unsigned char *SKF_HANDLE_get_key(SKF_HANDLE *handle) +{ + return NULL; +} + +SKF_HANDLE *SKF_HANDLE_new(int type) +{ + return NULL; +} + +int SKF_HANDLE_set1_cipher_ctx(SKF_HANDLE *handle, EVP_CIPHER_CTX *ctx) +{ + return 0; +} + + + +ULONG DEVAPI SKF_CloseHandle(HANDLE hHandle) +{ + SKF_HANDLE *handle; + + if (!(handle = (SKF_HANDLE *)hHandle)) { + SKFerr(SKF_F_SKF_CLOSEHANDLE, SKF_R_NULL_ARGUMENT); + return SAR_INVALIDPARAMERR; + } + + if (handle->magic != SKF_HANDLE_MAGIC) { + SKFerr(SKF_F_SKF_CLOSEHANDLE, SKF_R_INVALID_HANDLE_MAGIC); + return SAR_INVALIDPARAMERR; + } + + switch (handle->type) { + case SKF_KEY_HANDLE: + OPENSSL_cleanse(handle->key, EVP_MAX_KEY_LENGTH); + // FIXME: we need to make sure there are no pending operation + if (handle->u.cipher_ctx) { + EVP_CIPHER_CTX_cleanup(handle->u.cipher_ctx); + } + break; + + case SKF_MAC_HANDLE: + CBCMAC_CTX_cleanup(handle->u.cbcmac_ctx); + break; + + case SKF_HASH_HANDLE: + EVP_MD_CTX_cleanup(handle->u.md_ctx); + break; + + default: + SKFerr(SKF_F_SKF_CLOSEHANDLE, SKF_R_INVALID_HANDLE_TYPE); + return SAR_INVALIDPARAMERR; + } + + /* now we remove this handle from list */ + + return SAR_OK; +} + diff --git a/crypto/skf/skf_lcl.h b/crypto/skf/skf_lcl.h index 6cbdd87d..6343b7cd 100644 --- a/crypto/skf/skf_lcl.h +++ b/crypto/skf/skf_lcl.h @@ -1,4 +1,4 @@ -/* crypto/skf/skf.h */ +/* crypto/skf/skf_lcl.h */ /* ==================================================================== * Copyright (c) 2016 The GmSSL Project. All rights reserved. * @@ -49,87 +49,52 @@ * */ -#ifndef HEADER_SKF_H -#define HEADER_SKF_H +#ifndef HEADER_SKF_LCL_H +#define HEADER_SKF_LCL_H + +#include +#include +#include #ifdef __cplusplus extern "C" { #endif +#define SKF_HANDLE_MAGIC 0x31323334 +#define SKF_HASH_HANDLE 1 +#define SKF_MAC_HANDLE 2 +#define SKF_KEY_HANDLE 10 +#define SKF_CIPHER_HANDLE 11 -int EC_KEY_set_ECCPUBLICKEYBLOB(EC_KEY *ec_key, const ECCPUBLICKEYBLOB *blob); -int EC_KEY_get_ECCPUBLICKEYBLOB(EC_KEY *ec_key, ECCPUBLICKEYBLOB *blob); -int EC_KEY_set_ECCPRIVATEKEYBLOB(EC_KEY *ec_key, const ECCPRIVATEKEYBLOB *blob) -int EC_KEY_get_ECCPRIVATEKEYBLOB(EC_KEY *ec_key, ECCPRIVATEKEYBLOB *blob); +struct SKF_HANDLE { + unsigned int magic; + int type; + int algid; + unsigned int keylen; + unsigned char key[EVP_MAX_KEY_LENGTH]; + union { + EVP_MD_CTX *md_ctx; + CBCMAC_CTX *cbcmac_ctx; + EVP_CIPHER_CTX *cipher_ctx; + } u; + struct SKF_HANDLE *next; + struct SKF_HANDLE *prev; +}; -int SM2_CIPHERTEXT_VALUE_set_ECCCIPHERBLOB(SM2_CIPHERTEXT_VALUE *cv, - const ECCCIPHERBLOB *blob); -int SM2_CIPHERTEXT_VALUE_get_ECCCIPHERBLOB(const SM2_CIPHERTEXT_VALUE *a, - void *out, size_t *outlen); -int ECDSA_SIG_to_SKF_ECCSIGNATUREBLOB(const ECDSA_SIG *sig, - const EC_GROUP *group, void *out, size_t *outlen); +typedef struct SKF_HANDLE SKF_HANDLE; -int RSA_set_RSAPUBLICKEYBLOB(RSA *rsa, const RSAPUBLICKEYBLOB *blob); -int RSA_get_RSAPUBLICKEYBLOB(RSA *rsa, RSAPUBLICKEYBLOB *blob); -int RSA_set_RSAPRIVATEKEYBLOB(RSA *rsa, const RSAPRIVATEKEYBLOB *blob); -int RSA_to_RSAPRIVATEKEYBLOB(RSA *rsa, RSAPRIVATEKEYBLOB *blob); +SKF_HANDLE *SKF_HANDLE_new(int type); +EVP_MD_CTX *SKF_HANDLE_get_md_ctx(SKF_HANDLE *hHash); +CBCMAC_CTX *SKF_HANDLE_get_cbcmac_ctx(SKF_HANDLE *hMac); +EVP_CIPHER_CTX *SKF_HANDLE_get_cipher_ctx(SKF_HANDLE *hKey); +unsigned char *SKF_HANDLE_get_key(SKF_HANDLE *hKey); +int SKF_HANDLE_set1_md_ctx(SKF_HANDLE *hHash, EVP_MD_CTX *ctx); +int SKF_HANDLE_set1_cbcmac_ctx(SKF_HANDLE *hMac, CBCMAC_CTX *ctx); +int SKF_HANDLE_set1_cipher_ctx(SKF_HANDLE *hKey, EVP_CIPHER_CTX *ctx); +int SKF_HANDLE_free(SKF_HANDLE *handle); - -#define SAR_OK 0x00000000 -#define SAR_FAIL 0x0A000001 -#define SAR_UNKNOWNERR 0x0A000002 -#define SAR_NOTSUPPORTYETERR 0x0A000003 -#define SAR_FILEERR 0x0A000004 -#define SAR_INVALIDHANDLEERR 0x0A000005 -#define SAR_INVALIDPARAMERR 0x0A000006 -#define SAR_READFILEERR 0x0A000007 -#define SAR_WRITEFILEERR 0x0A000008 -#define SAR_NAMELENERR 0x0A000009 -#define SAR_KEYUSAGEERR 0x0A00000A -#define SAR_MODULUSLENERR 0x0A00000B -#define SAR_NOTINITIALIZEERR 0x0A00000C -#define SAR_OBJERR 0x0A00000D -#define SAR_MEMORYERR 0x0A00000E -#define SAR_TIMEOUTERR 0x0A00000F -#define SAR_INDATALENERR 0x0A000010 -#define SAR_INDATAERR 0x0A000011 -#define SAR_GENRANDERR 0x0A000012 -#define SAR_HASHOBJERR 0x0A000013 -#define SAR_HASHERR 0x0A000014 -#define SAR_GENRSAKEYERR 0x0A000015 -#define SAR_RSAMODULUSLENERR 0x0A000016 -#define SAR_CSPIMPRTPUBKEYERR 0x0A000017 -#define SAR_RSAENCERR 0x0A000018 -#define SAR_RSADECERR 0x0A000019 -#define SAR_HASHNOTEQUALERR 0x0A00001A -#define SAR_KEYNOTFOUNTERR 0x0A00001B -#define SAR_KEYNOTFOUNDERR 0x0A00001B -#define SAR_CERTNOTFOUNTERR 0x0A00001C -#define SAR_NOTEXPORTERR 0x0A00001D -#define SAR_DECRYPTPADERR 0x0A00001E -#define SAR_MACLENERR 0x0A00001F -#define SAR_BUFFER_TOO_SMALL 0x0A000020 -#define SAR_KEYINFOTYPEERR 0x0A000021 -#define SAR_NOT_EVENTERR 0x0A000022 -#define SAR_DEVICE_REMOVED 0x0A000023 -#define SAR_PIN_INCORRECT 0x0A000024 -#define SAR_PIN_LOCKED 0x0A000025 -#define SAR_PIN_INVALID 0x0A000026 -#define SAR_PIN_LEN_RANGE 0x0A000027 -#define SAR_USER_ALREADY_LOGGED_IN 0x0A000028 -#define SAR_USER_PIN_NOT_INITIALIZED 0x0A000029 -#define SAR_USER_TYPE_INVALID 0x0A00002A -#define SAR_APPLICATION_NAME_INVALID 0x0A00002B -#define SAR_APPLICATION_EXISTS 0x0A00002C -#define SAR_USER_NOT_LOGGED_IN 0x0A00002D -#define SAR_APPLICATION_NOT_EXISTS 0x0A00002E -#define SAR_FILE_ALREADY_EXIST 0x0A00002F -#define SAR_NO_ROOM 0x0A000030 - - -#ifdef __cplusplus +#ifdef __cplusplus } #endif #endif - diff --git a/crypto/skf/skf_mac.c b/crypto/skf/skf_mac.c new file mode 100644 index 00000000..3b2cbf49 --- /dev/null +++ b/crypto/skf/skf_mac.c @@ -0,0 +1,179 @@ +/* crypto/skf/skf_mac.c */ +/* ==================================================================== + * Copyright (c) 2015-2016 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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 +#include +#include +#include +#include +#include "skf_lcl.h" + + +ULONG DEVAPI SKF_MacInit(HANDLE hKey, + BLOCKCIPHERPARAM *pMacParam, + HANDLE *phMac) +{ + int ok = 0; + SKF_HANDLE *key; + SKF_HANDLE *hMac = NULL; + const EVP_CIPHER *cipher; + + if (!(key = (SKF_HANDLE *)hKey)) { + SKFerr(SKF_F_SKF_MACINIT, SKF_R_NULL_ARGUMENT); + return SAR_INVALIDPARAMERR; + } + + OPENSSL_assert(!pMacParam); + + if (key->magic != SKF_HANDLE_MAGIC) { + SKFerr(SKF_F_SKF_MACINIT, SKF_R_INVALID_HANDLE_MAGIC); + return SAR_INVALIDPARAMERR; + } + + if (key->type <= SKF_KEY_HANDLE) { + SKFerr(SKF_F_SKF_MACINIT, SKF_R_INVALID_KEY_HANDLE); + return SAR_INVALIDPARAMERR; + } + + if (key->algid != SGD_SM4_MAC) { + SKFerr(SKF_F_SKF_MACINIT, SKF_R_INVALID_ALGOR); + return SAR_INVALIDPARAMERR; + } + cipher = EVP_sms4_ecb(); + + if (key->keylen < SMS4_KEY_LENGTH) { + SKFerr(SKF_F_SKF_MACINIT, SKF_R_INVALID_KEY_LENGTH); + return SAR_INVALIDPARAMERR; + } + + if (!(hMac = OPENSSL_malloc(sizeof(*hMac)))) { + SKFerr(SKF_F_SKF_MACINIT, SKF_R_FAIL); + return SAR_FAIL; + } + + hMac->magic = SKF_HANDLE_MAGIC; + hMac->type = SKF_MAC_HANDLE; + hMac->algid = key->algid; + + if (!(hMac->u.cbcmac_ctx = CBCMAC_CTX_new())) { + SKFerr(SKF_F_SKF_MACINIT, ERR_R_CBCMAC_LIB); + goto end; + } + + if (!CBCMAC_Init(hMac->u.cbcmac_ctx, key->key, key->keylen, cipher, NULL)) { + SKFerr(SKF_F_SKF_MACINIT, ERR_R_CBCMAC_LIB); + return SAR_FAIL; + } + + *phMac = hMac; +end: + return SAR_OK; +} + +ULONG DEVAPI SKF_MacUpdate(HANDLE hMac, + BYTE *pbData, + ULONG ulDataLen) +{ + CBCMAC_CTX *ctx; + + if (!(ctx = SKF_HANDLE_get_cbcmac_ctx(hMac))) { + SKFerr(SKF_F_SKF_MACUPDATE, SKF_R_INVALID_MAC_HANDLE); + return SAR_INVALIDPARAMERR; + } + + if (!CBCMAC_Update(ctx, pbData, ulDataLen)) { + SKFerr(SKF_F_SKF_MACUPDATE, ERR_R_CBCMAC_LIB); + return SAR_FAIL; + } + + return SAR_OK; +} + +ULONG DEVAPI SKF_MacFinal(HANDLE hMac, + BYTE *pbMacData, + ULONG *pulMacDataLen) +{ + CBCMAC_CTX *ctx; + + if (!(ctx = SKF_HANDLE_get_cbcmac_ctx(hMac))) { + SKFerr(SKF_F_SKF_MACFINAL, SKF_R_INVALID_MAC_HANDLE); + return SAR_INVALIDPARAMERR; + } + + if (!CBCMAC_Final(ctx, pbMacData, pulMacDataLen)) { + SKFerr(SKF_F_SKF_MACFINAL, ERR_R_CBCMAC_LIB); + return SAR_FAIL; + } + + return SAR_OK; +} + +ULONG DEVAPI SKF_Mac(HANDLE hMac, + BYTE *pbData, + ULONG ulDataLen, + BYTE *pbMacData, + ULONG *pulMacLen) +{ + ULONG rv; + + if ((rv = SKF_MacUpdate(hMac, pbData, ulDataLen)) != SAR_OK) { + SKFerr(SKF_F_SKF_MAC, ERR_R_SKF_LIB); + return rv; + } + + if ((rv = SKF_MacFinal(hMac, pbMacData, pulMacLen)) != SAR_OK) { + SKFerr(SKF_F_SKF_MAC, ERR_R_SKF_LIB); + return rv; + } + + return SAR_OK; +} + diff --git a/crypto/skf/skf_rand.c b/crypto/skf/skf_rand.c new file mode 100644 index 00000000..cbccda21 --- /dev/null +++ b/crypto/skf/skf_rand.c @@ -0,0 +1,83 @@ +/* crypto/skf/skf_rand.c */ +/* ==================================================================== + * Copyright (c) 2015-2016 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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 +#include +#include +#include +#include "skf_lcl.h" + +#define SKF_DEV_AUTH_RANDOM_LENGTH 16 +#define SKF_MAX_RANDOM_LENGTH (1024*1024*1024) +//FIXME: INT_MAX + +ULONG DEVAPI SKF_GenRandom(DEVHANDLE hDev, + BYTE *pbRandom, + ULONG ulRandomLen) +{ + if (!pbRandom) { + SKFerr(SKF_F_SKF_GENRANDOM, SKF_R_NULL_ARGUMENT); + return SAR_INVALIDPARAMERR; + } + + if (ulRandomLen > SKF_MAX_RANDOM_LENGTH) { + SKFerr(SKF_F_SKF_GENRANDOM, SKF_R_INVALID_RANDOM_LENGTH); + return SAR_INVALIDPARAMERR; + } + + if (!RAND_bytes(pbRandom, ulRandomLen)) { + SKFerr(SKF_F_SKF_GENRANDOM, ERR_R_RAND_LIB); + return SAR_GENRANDERR; + } + + return SAR_OK; +} + diff --git a/crypto/skf/skf_rsa.c b/crypto/skf/skf_rsa.c new file mode 100644 index 00000000..cd17220f --- /dev/null +++ b/crypto/skf/skf_rsa.c @@ -0,0 +1,377 @@ +/* crypto/skf/skf_rsa.c */ +/* ==================================================================== + * Copyright (c) 2015-2016 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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 +#include +#include +#include +#include "skf_lcl.h" + +#if 0 +ULONG DEVAPI SKF_GenExtRSAKey(DEVHANDLE hDev, + ULONG ulBitsLen, + RSAPRIVATEKEYBLOB *pBlob) +{ + ULONG ret = SAR_FAIL; + RSA *rsa = NULL; + + if ((ulBitsLen > MAX_RSA_MODULUS_LEN * 8) || (ulBitsLen < 1024) || + (ulBitsLen % 8 != 0)) { + SKFerr(SKF_F_SKF_GENEXTRSAKEY, SKF_R_INVALID_KEY_LENGTH); + return SAR_INVALIDPARAMERR; + } + + if (!pBlob) { + SKFerr(SKF_F_SKF_GENEXTRSAKEY, SKF_R_NULL_ARGUMENT); + return SAR_INVALIDPARAMERR; + } + + if (!(rsa = RSA_new())) { + SKFerr(SKF_F_SKF_GENEXTRSAKEY, SKF_R_MALLOC_FAILED); + return SAR_FAIL; + } + + if (!RSA_generate_key_ex(rsa, ulBitsLen, NULL, NULL)) { + SKFerr(SKF_F_SKF_GENEXTRSAKEY, SKF_R_GEN_RSA_FAILED); + goto end; + } + + if (!RSA_get_RSAPRIVATEKEYBLOB(rsa, pBlob)) { + SKFerr(SKF_F_SKF_GENEXTRSAKEY, SKF_R_ENCODE_FAILED); + goto end; + } + + ret = SAR_OK; +end: + RSA_free(rsa); + return ret; +} + +ULONG DEVAPI SKF_ExtRSAPubKeyOperation(DEVHANDLE hDev, + RSAPUBLICKEYBLOB *pRSAPubKeyBlob, + BYTE *pbInput, + ULONG ulInputLen, + BYTE *pbOutput, + ULONG *pulOutputLen) +{ + ULONG ret = SAR_FAIL; + RSA *rsa = NULL; + int inlen, outlen; + + if (!pRSAPubKeyBlob || !pbInput || !pulOutputLen) { + SKFerr(SKF_F_SKF_EXTRSAPUBKEYOPERATION, SKF_R_NULL_ARGUMENT); + return SAR_INVALIDPARAMERR; + } + + if (pRSAPubKeyBlob->AlgID != SGD_RSA) { + SKFerr(SKF_F_SKF_EXTRSAPUBKEYOPERATION, SKF_R_INVALID_ALGOR); + return SAR_INVALIDPARAMERR; + } + if (pRSAPubKeyBlob->BitLen % 8) { + SKFerr(SKF_F_SKF_EXTRSAPUBKEYOPERATION, SKF_R_INVALID_KEY_LENGTH); + return SAR_INVALIDPARAMERR; + } + + if (ulInputLen * 8 != pRSAPubKeyBlob->BitLen) { + SKFerr(SKF_F_SKF_EXTRSAPUBKEYOPERATION, SKF_R_INVALID_INPUT_LENGTH); + return SAR_INVALIDPARAMERR; + } + + if (!pbOutput) { + *pulOutputLen = pRSAPubKeyBlob->BitLen / 8; + return SAR_OK; + } + + if (*pulOutputLen < pRSAPubKeyBlob->BitLen / 8) { + SKFerr(SKF_F_SKF_EXTRSAPUBKEYOPERATION, SKF_R_BUFFER_TOO_SMALL); + return SAR_BUFFER_TOO_SMALL; + } + + if (!(rsa = RSA_new_from_RSAPUBLICKEYBLOB(pRSAPubKeyBlob))) { + SKFerr(SKF_F_SKF_EXTRSAPUBKEYOPERATION, SKF_R_INVALID_RSA_PUBLIC_KEY); + goto end; + } + + inlen = (int)ulInputLen; + if ((outlen = RSA_public_encrypt(inlen, pbInput, pbOutput, rsa, RSA_NO_PADDING)) < 0) { + SKFerr(SKF_F_SKF_EXTRSAPUBKEYOPERATION, ERR_R_RSA_LIB); + goto end; + } + + *pulOutputLen = outlen; + ret = SAR_OK; +end: + RSA_free(rsa); + return ret; +} + +ULONG DEVAPI SKF_ExtRSAPriKeyOperation(DEVHANDLE hDev, + RSAPRIVATEKEYBLOB *pRSAPriKeyBlob, + BYTE *pbInput, + ULONG ulInputLen, + BYTE *pbOutput, + ULONG *pulOutputLen) +{ + ULONG ret = SAR_FAIL; + RSA *rsa = NULL; + int inlen, outlen; + + if (!pRSAPriKeyBlob || !pbInput || !pulOutputLen) { + SKFerr(SKF_F_SKF_EXTRSAPRIKEYOPERATION, SKF_R_NULL_ARGUMENT); + return SAR_INVALIDPARAMERR; + } + + if (pRSAPriKeyBlob->AlgID != SGD_RSA) { + SKFerr(SKF_F_SKF_EXTRSAPRIKEYOPERATION, SKF_R_INVALID_ALGOR); + return SAR_INVALIDPARAMERR; + } + if (pRSAPriKeyBlob->BitLen % 8) { + SKFerr(SKF_F_SKF_EXTRSAPRIKEYOPERATION, SKF_R_INVALID_KEY_LENGTH); + return SAR_INVALIDPARAMERR; + } + + if (ulInputLen * 8 != pRSAPriKeyBlob->BitLen) { + SKFerr(SKF_F_SKF_EXTRSAPRIKEYOPERATION, SKF_R_INVALID_INPUT_LENGTH); + return SAR_INVALIDPARAMERR; + } + + if (!pbOutput) { + *pulOutputLen = pRSAPriKeyBlob->BitLen / 8; + return SAR_OK; + } + + if (*pulOutputLen < pRSAPriKeyBlob->BitLen / 8) { + SKFerr(SKF_F_SKF_EXTRSAPRIKEYOPERATION, SKF_R_BUFFER_TOO_SMALL); + return SAR_BUFFER_TOO_SMALL; + } + + if (!(rsa = RSA_new_from_RSAPRIVATEKEYBLOB(pRSAPriKeyBlob))) { + SKFerr(SKF_F_SKF_EXTRSAPRIKEYOPERATION, SKF_R_INVALID_RSA_PUBLIC_KEY); + goto end; + } + + inlen = (int)ulInputLen; + if ((outlen = RSA_private_decrypt(inlen, pbInput, pbOutput, rsa, RSA_NO_PADDING)) < 0) { + SKFerr(SKF_F_SKF_EXTRSAPRIKEYOPERATION, ERR_R_RSA_LIB); + goto end; + } + + *pulOutputLen = outlen; + ret = SAR_OK; +end: + RSA_free(rsa); + return ret; +} + +ULONG DEVAPI SKF_RSAVerify(DEVHANDLE hDev, + RSAPUBLICKEYBLOB *pRSAPubKeyBlob, + BYTE *pbData, + ULONG ulDataLen, + BYTE *pbSignature, + ULONG ulSignLen) +{ + return SAR_FAIL; +} + +/* Wrapper functions */ + +RSA *RSA_new_from_RSAPUBLICKEYBLOB(const RSAPUBLICKEYBLOB *blob) +{ + RSA *ret; + + if (!(ret = RSA_new())) { + SKFerr(SKF_F_RSA_NEW_FROM_RSAPUBLICKEYBLOB, ERR_R_RSA_LIB); + return NULL; + } + + if (!RSA_set_RSAPUBLICKEYBLOB(ret, blob)) { + SKFerr(SKF_F_RSA_NEW_FROM_RSAPUBLICKEYBLOB, SKF_R_INVALID_RSA_PUBLIC_KEY); + RSA_free(ret); + return NULL; + } + + return ret; +} + +RSA *RSA_new_from_RSAPRIVATEKEYBLOB(const RSAPRIVATEKEYBLOB *blob) +{ + RSA *ret; + + if (!(ret = RSA_new())) { + SKFerr(SKF_F_RSA_NEW_FROM_RSAPRIVATEKEYBLOB, ERR_R_RSA_LIB); + return NULL; + } + + if (!RSA_set_RSAPRIVATEKEYBLOB(ret, blob)) { + SKFerr(SKF_F_RSA_NEW_FROM_RSAPRIVATEKEYBLOB, SKF_R_INVALID_RSA_PRIVATE_KEY); + RSA_free(ret); + return NULL; + } + + return ret; +} + +int RSA_set_RSAPUBLICKEYBLOB(RSA *rsa, const RSAPUBLICKEYBLOB *blob) +{ + int ret = 0; + + if (!rsa || !blob) { + SKFerr(SKF_F_RSA_SET_RSAPUBLICKEYBLOB, SKF_R_NULL_ARGUMENT); + return 0; + } + + if (!(rsa->n = BN_bin2bn(blob->Modulus, blob->BitLen/8, rsa->n))) { + goto end; + } + + if (!(rsa->e = BN_bin2bn(blob->PublicExponent, blob->BitLen/8, rsa->e))) { + goto end; + } + if (!RSA_check_key(rsa)) { + goto end; + } + +end: + return ret; +} + +int RSA_get_RSAPUBLICKEYBLOB(RSA *rsa, RSAPUBLICKEYBLOB *blob) +{ + int ret = 0; + int nbytes; + + if (!rsa->n || !rsa->e) { + goto end; + } + + nbytes = BN_num_bytes(rsa->n); + + if (!BN_bn2bin(rsa->n, blob->Modulus + bnlen - BN_num_bytes(rsa->n)) || + !BN_bn2bin(rsa->e, blob->PublicExponent + bnlen - BN_num_bytes(rsa->e))) { + } + + return ret; +} + + +int RSA_set_RSAPRIVATEKEYBLOB(RSA *rsa, const RSAPRIVATEKEYBLOB *blob) +{ + int ret = 0; + int nbytes; + + if (!rsa || !blob) { + SKFerr(SKF_F_RSA_SET_RSAPRIVATEKEYBLOB, SKF_R_NULL_ARGUMENT); + return SAR_INVALIDPARAMERR; + } + + if (blob->AlgID != SGD_RSA) { + SKFerr(SKF_F_RSA_SET_RSAPRIVATEKEYBLOB, SKR_R_INVALID_ALGOR); + return SAR_INVALIDPARAMERR; + } + + if ((blob->BitLen < 1024) || (blob->BitLen > MAX_RSA_MODULUS_LEN*8) || + (blob->BitLen % 8 != 0) || (blob->BitLen % 16 != 0)) { + SKFerr(SKF_F_RSA_SET_RSAPRIVATEKEYBLOB, SKR_R_INVALID_KEY_LENGTH); + return SAR_INVALIDPARAMERR; + } + nbytes = blob->BitLen/8; + + if (!(rsa->n = BN_bin2bn(blob->Modulus, nbytes, rsa->n)) || + !(rsa->e = BN_bin2bn(blob->PublicExponent, MAX_RSA_EXPONENT_LEN, rsa->e)) || + !(rsa->d = BN_bin2bn(blob->PrivateExponent, nbytes, rsa->d)) || + !(rsa->p = BN_bin2bn(blob->Prime1, nbytes/2, rsa->p)) || + !(rsa->q = BN_bin2bn(blob->Prime2, nbytes/2, rsa->q)) || + !(rsa->dmp1 = BN_bin2bn(blob->Prime1Exponent, nbytes/2, rsa->dmp1)) || + !(rsa->dmq1 = BN_bin2bn(blob->Prime2Exponent, nbytes/2, rsa->dmq1)) || + !(rsa->iqmp = BN_bin2bn(blob->Coefficient, nbytes/2, rsa->iqmp))) { + + SKFerr(SKF_F_RSA_SET_RSAPRIVATEKEYBLOB, SKR_R_INVALID_RSA_PRIVATE_KEY); + return SAR_INVALIDPARAMERR; + } + + return SAR_OK; +} + +int RSA_get_RSAPRIVATEKEYBLOB(RSA *rsa, RSAPRIVATEKEYBLOB *blob) +{ + int nbytes; + if (!rsa || !blob) { + SKFerr(SKF_F_RSA_GET_RSAPRIVATEKEYBLOB, SKF_R_NULL_ARGUMENT); + return SAR_INVALIDPARAMERR; + } + + if (!rsa->n || !rsa->e || !rsa->d || !rsa->p || !rsa->q || + !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp) + SKFerr(SKF_F_RSA_GET_RSAPRIVATEKEYBLOB, SKF_R_INVALID_RSA_PRIVATE_KEY); + return SAR_INVALIDPARAMERR; + } + + bzero(blob, sizeof(*blob)); + blob->AlgID = SGD_RSA; + blob->BitLen = BN_num_bits(rsa->n); + + nbytes = BN_num_bytes(rsa->n); + if (!BN_bn2bin(rsa->n, blob->Modulus) || + !BN_bn2bin(rsa->e, blob->PublicExponent + MAX_RSA_EXPONENT_LEN - BN_num_bytes(rsa->e)) || + !BN_bn2bin(rsa->d, blob->PrivateExponent + nbytes - BN_num_bytes(rsa->d)) || + !BN_bn2bin(rsa->p, blob->Prime1 + nbytes/2 - BN_num_bytes(rsa->p)) || + !BN_bn2bin(rsa->q, blob->Prime2 + nbytes/2 - BN_num_bytes(rsa->q)) || + !BN_bn2bin(rsa->dmp1, blob->Prime1Exponent + nbytes/2 - BN_num_bytes(rsa->dmp1)) || + !BN_bn2bin(rsa->dmq1, blob->Prime2Exponent + nbytes/2 - BN_num_bytes(rsa->dmq1)) || + !BN_bn2bin(rsa->iqmp, blob->Coefficient + nbytes/2 - BN_num_bytes(rsa->iqmp))) { + + SKFerr(SKF_F_RSA_GET_RSAPRIVATEKEYBLOB, SKF_R_INVALID_RSA_PRIVATE_KEY); + return SAR_INVALIDPARAMERR; + } + + return SAR_OK; +} +#endif diff --git a/crypto/skf/skf_sesskey.c b/crypto/skf/skf_sesskey.c new file mode 100644 index 00000000..dadb5545 --- /dev/null +++ b/crypto/skf/skf_sesskey.c @@ -0,0 +1,98 @@ +/* crypto/skf/skf_sesskey.c */ +/* ==================================================================== + * Copyright (c) 2015-2016 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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 +#include +#include +#include +#include +#include +#include "skf_lcl.h" + +#define PADDING_TYPE_NO_PADDING 0 +#define PADDING_TYPE_PKCS5 1 + + +ULONG DEVAPI SKF_SetSymmKey(DEVHANDLE hDev, + BYTE *pbKey, + ULONG ulAlgID, + HANDLE *phKey) +{ + SKF_HANDLE *hKey = NULL; + + if (!(hKey = OPENSSL_malloc(sizeof(*hKey)))) { + SKFerr(SKF_F_SKF_SETSYMMKEY, SKF_R_MALLOC_FAILED); + return SAR_FAIL; + } + bzero(hKey, sizeof(*hKey)); + + hKey->magic = SKF_HANDLE_MAGIC; + hKey->type = SKF_KEY_HANDLE; + + switch (ulAlgID) { + case SGD_SM4_ECB: + case SGD_SM4_CBC: + case SGD_SM4_CFB: + case SGD_SM4_OFB: + case SGD_SM4_MAC: + hKey->algid = ulAlgID; + hKey->keylen = SMS4_KEY_LENGTH; + break; + default: + SKFerr(SKF_F_SKF_SETSYMMKEY, SKF_R_INVALID_ALGOR); + return SAR_INVALIDPARAMERR; + } + memcpy(hKey->key, pbKey, hKey->keylen); + + *phKey = hKey; + return SAR_OK; +} + diff --git a/crypto/skf/skf_token.c b/crypto/skf/skf_token.c new file mode 100644 index 00000000..98845555 --- /dev/null +++ b/crypto/skf/skf_token.c @@ -0,0 +1,394 @@ +/* crypto/skf/skf_app.c */ +/* ==================================================================== + * Copyright (c) 2015-2016 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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 +#include + +ULONG DEVAPI SKF_WaitForDevEvent(LPSTR szDevName, + ULONG *pulDevNameLen, + ULONG *pulEvent) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_CancelWaitForDevEvent(void) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_SetLabel(DEVHANDLE hDev, + LPSTR szLabel) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_LockDev(DEVHANDLE hDev, + ULONG ulTimeOut) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_UnlockDev(DEVHANDLE hDev) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_Transmit(DEVHANDLE hDev, + BYTE* pbCommand, + ULONG ulCommandLen, + BYTE* pbData, + ULONG* pulDataLen) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_ChangeDevAuthKey(DEVHANDLE hDev, + BYTE *pbKeyValue, + ULONG ulKeyLen) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_DevAuth(DEVHANDLE hDev, + BYTE *pbAuthData, + ULONG ulLen) +{ + return SAR_OK; +} + +ULONG DEVAPI SKF_CreateApplication(DEVHANDLE hDev, + LPSTR szAppName, + LPSTR szAdminPin, + DWORD dwAdminPinRetryCount, + LPSTR szUserPin, + DWORD dwUserPinRetryCount, + DWORD dwCreateFileRights, + HAPPLICATION *phApplication) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_EnumApplication(DEVHANDLE hDev, + LPSTR szAppName, + ULONG *pulSize) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_DeleteApplication(DEVHANDLE hDev, + LPSTR szAppName) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_OpenApplication(DEVHANDLE hDev, + LPSTR szAppName, + HAPPLICATION *phApplication) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_CloseApplication(HAPPLICATION hApplication) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_ChangePIN(HAPPLICATION hApplication, + ULONG ulPINType, + LPSTR szOldPin, + LPSTR szNewPin, + ULONG *pulRetryCount) +{ + return SAR_NOTSUPPORTYETERR; +} + +LONG DEVAPI SKF_GetPINInfo(HAPPLICATION hApplication, + ULONG ulPINType, + ULONG *pulMaxRetryCount, + ULONG *pulRemainRetryCount, + BOOL *pbDefaultPin) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_VerifyPIN(HAPPLICATION hApplication, + ULONG ulPINType, + LPSTR szPIN, + ULONG *pulRetryCount) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_UnblockPIN(HAPPLICATION hApplication, + LPSTR szAdminPIN, + LPSTR szNewUserPIN, + ULONG *pulRetryCount) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_ClearSecureState(HAPPLICATION hApplication) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_CreateContainer(HAPPLICATION hApplication, + LPSTR szContainerName, + HCONTAINER *phContainer) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_DeleteContainer(HAPPLICATION hApplication, + LPSTR szContainerName) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_EnumContainer(HAPPLICATION hApplication, + LPSTR szContainerName, + ULONG *pulSize) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_OpenContainer(HAPPLICATION hApplication, + LPSTR szContainerName, + HCONTAINER *phContainer) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_CloseContainer(HCONTAINER hContainer) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_GetContainerType(HCONTAINER hContainer, + ULONG *pulContainerType) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_ImportCertificate(HCONTAINER hContainer, + BOOL bSignFlag, + BYTE *pbCert, + ULONG ulCertLen) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_ExportCertificate(HCONTAINER hContainer, + BOOL bSignFlag, + BYTE *pbCert, + ULONG *pulCertLen) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_CreateFile(HAPPLICATION hApplication, + LPSTR szFileName, + ULONG ulFileSize, + ULONG ulReadRights, + ULONG ulWriteRights) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_EnumFiles(HAPPLICATION hApplication, + LPSTR szFileList, + ULONG *pulSize) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_GetFileInfo(HAPPLICATION hApplication, + LPSTR szFileName, + FILEATTRIBUTE *pFileInfo) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_ReadFile(HAPPLICATION hApplication, + LPSTR szFileName, + ULONG ulOffset, + ULONG ulSize, + BYTE *pbOutData, + ULONG *pulOutLen) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_WriteFile(HAPPLICATION hApplication, + LPSTR szFileName, + ULONG ulOffset, + BYTE *pbData, + ULONG ulSize) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_DeleteFile(HAPPLICATION hApplication, + LPSTR szFileName) +{ + return SAR_NOTSUPPORTYETERR; +} + + +ULONG DEVAPI SKF_GenECCKeyPair(HCONTAINER hContainer, + ULONG ulAlgId, + ECCPUBLICKEYBLOB *pBlob) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_ImportECCKeyPair(HCONTAINER hContainer, + ENVELOPEDKEYBLOB *pEnvelopedKeyBlob) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_ECCSignData(HCONTAINER hContainer, + BYTE *pbData, + ULONG ulDataLen, + ECCSIGNATUREBLOB *pSignature) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_GenerateAgreementDataWithECC(HCONTAINER hContainer, + ULONG ulAlgId, + ECCPUBLICKEYBLOB *pTempECCPubKeyBlob, + BYTE *pbID, + ULONG ulIDLen, + HANDLE *phAgreementHandle) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_GenerateAgreementDataAndKeyWithECC(HANDLE hContainer, + ULONG ulAlgId, + ECCPUBLICKEYBLOB *pSponsorECCPubKeyBlob, + ECCPUBLICKEYBLOB *pSponsorTempECCPubKeyBlob, + ECCPUBLICKEYBLOB *pTempECCPubKeyBlob, + BYTE *pbID, + ULONG ulIDLen, + BYTE *pbSponsorID, + ULONG ulSponsorIDLen, + HANDLE *phKeyHandle) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_GenerateKeyWithECC(HANDLE hAgreementHandle, + ECCPUBLICKEYBLOB *pECCPubKeyBlob, + ECCPUBLICKEYBLOB *pTempECCPubKeyBlob, + BYTE *pbID, + ULONG ulIDLen, + HANDLE *phKeyHandle) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_GenRSAKeyPair(HCONTAINER hContainer, + ULONG ulBitsLen, + RSAPUBLICKEYBLOB *pBlob) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_ImportRSAKeyPair(HCONTAINER hContainer, + ULONG ulSymAlgId, + BYTE *pbWrappedKey, + ULONG ulWrappedKeyLen, + BYTE *pbEncryptedData, + ULONG ulEncryptedDataLen) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_RSASignData(HCONTAINER hContainer, + BYTE *pbData, + ULONG ulDataLen, + BYTE *pbSignature, + ULONG *pulSignLen) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_ImportSessionKey(HCONTAINER hContainer, + ULONG ulAlgId, + BYTE *pbWrapedData, + ULONG ulWrapedLen, + HANDLE *phKey) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_RSAExportSessionKey(HCONTAINER hContainer, + ULONG ulAlgId, + RSAPUBLICKEYBLOB *pPubKey, + BYTE *pbData, + ULONG *pulDataLen, + HANDLE *phSessionKey) +{ + return SAR_NOTSUPPORTYETERR; +} + +ULONG DEVAPI SKF_ECCExportSessionKey(HCONTAINER hContainer, + ULONG ulAlgId, + ECCPUBLICKEYBLOB *pPubKey, + ECCCIPHERBLOB *pData, + HANDLE *phSessionKey) +{ + return SAR_NOTSUPPORTYETERR; +} + diff --git a/crypto/skf/skf_types.c b/crypto/skf/skf_types.c deleted file mode 100644 index 6a6cf2fb..00000000 --- a/crypto/skf/skf_types.c +++ /dev/null @@ -1,285 +0,0 @@ -#include -#include -#include -#include -#include "skf.h" - -int EC_KEY_set_ECCPUBLICKEYBLOB(EC_KEY *ec_key, const ECCPUBLICKEYBLOB *blob) -{ - int ret = 0; - int nbytes; - BIGNUM *x = NULL; - BIGNUM *y = NULL; - - if (blob->BitLen != EC_GROUP_get_degree(EC_KEY_get0_group(ec_key))) { - return 0; - } - - nbytes = (blob->BitLen + 7)/8; - - if (!(x = BN_bin2bn(blob->XCoordinate, nbytes, NULL))) { - goto end; - } - if (!(y = BN_bin2bn(blob->YCoordinate, nbytes, NULL))) { - goto end; - } - if (!EC_KEY_set_public_key_affine_coordinates(ec_key, x, y)) { - goto end; - } - - ret = 1; -end: - BN_free(x); - BN_free(y); - return ret; -} - -int EC_KEY_get_ECCPUBLICKEYBLOB(EC_KEY *ec_key, ECCPUBLICKEYBLOB *blob) -{ - int ret = 0; - int nbytes; - BIGNUM *x = NULL; - BIGNUM *y = NULL; - BN_CTX *bn_ctx = NULL; - const EC_GROUP *group = EC_KEY_get0_group(ec_key); - const EC_POINT *point = EC_KEY_get0_public_key(ec_key); - - nbytes = (EC_GROUP_get_degree(group) + 7)/8; - if (nbyte > ECC_MAX_MODULUS_BITS_LEN/8) { - goto end; - } - - x = BN_new(); - y = BN_new(); - bn_ctx = BN_CTX_new(); - if (!x || !y || !bn_ctx) { - goto end; - } - - if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) { - if (!EC_POINT_get_affine_coordinates_GFp(group, point, x, y, bn_ctx)) { - goto end; - } - } else { - if (!EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, bn_ctx)) { - goto end; - } - } - - bzero(blob, sizeof(*blob)); - blob->BitLen = EC_GROUP_get_degree(group); - if (!BN_bn2bin(x, blob->XCoordinate + nbytes - BN_num_bytes(x))) { - goto end; - } - if (!BN_bn2bin(y, blob->YCoordinate + nbytes - BN_num_bytes(y))) { - goto end; - } - - ret = 1; -end: - BN_free(x); - BN_free(y); - BN_CTX_free(bn_ctx); - return ret; -} - -int EC_KEY_set_ECCPRIVATEKEYBLOB(EC_KEY *ec_key, const ECCPRIVATEKEYBLOB *blob) -{ - int ret = 0; - int nbytes; - BIGNUM *d = NULL; - - /* is this corrent ? - * because the key length sometimes will be less than field length - */ - if (blob->BitLen != EC_GROUP_get_degree(EC_KEY_get0_group(ec_key))) { - goto end; - } - - nbytes = (blob->BitLen + 7)/8; - if (!(d = BN_bin2bn(data->PrivateKey, nbytes, NULL))) { - goto end; - } - if (!EC_KEY_set_private_key(ec_key, d)) { - goto end; - } - - ret = 1; -end: - BN_clear_free(d); - return ret; -} - -int EC_KEY_get_ECCPRIVATEKEYBLOB(EC_KEY *ec_key, ECCPRIVATEKEYBLOB *blob) -{ - int ret = 0; - int nbytes; - BIGNUM *order = BN_new(); - BIGNUM *d = EC_KEY_get0_private_key(ec_key); - - if (!order) { - goto end; - } - - if (!d) { - goto end; - } - - - - if (!EC_GROUP_get_order(EC_KEY_get0_group(ec_key), order, NULL)) { - goto end; - } - - nbytes = BN_num_bytes(order); - if (nbytes > ECC_MAX_MODULUS_BITS_LEN/8) { - goto end; - } - - BN_bn2bin(d, blob->PrivateKey + nbytes - BN_num_bytes(d)); - - ret = 1; - -end: - BN_free(order); - return ret; -} - -int SM2_CIPHERTEXT_VALUE_set_ECCCIPHERBLOB(SM2_CIPHERTEXT_VALUE *cv, - const ECCCIPHERBLOB *blob) -{ - SM2_CIPHERTEXT_VALUE *ret = NULL; - const ECCCIPHERBLOB *data = (const ECCCIPHERBLOB *)blob; - BIGNUM *x = NULL; - BIGNUM *y = NULL; - - if (bloblen < sizeof(ECCCIPHERBLOB)) { - goto end; - } - - if (!(ret = OPENSSL_malloc(sizeof(SM2_CIPHERTEXT_VALUE)))) { - goto end; - } -} - -int SM2_CIPHERTEXT_VALUE_get_ECCCIPHERBLOB(const SM2_CIPHERTEXT_VALUE *a, - void *out, size_t *outlen) -{ - int ret = 0; - BIGNUM *x = NULL; - BIGNUM *y = NULL; - - - return 0; -} - -ECDSA_SIG *ECDSA_SIG_new_from_SKF_ECCSIGNATUREBLOB( - const EC_GROUP *group, const void *blob, size_t bloblen) -{ - ECDSA_SIG *ret = NULL; - int bnlen; - const ECCSIGNATUREBLOB *data = blob; - - if (bloblen != sizeof(ECCSIGNATUREBLOB)) { - return NULL; - } - - bnlen = (EC_GROUP_get_degree(group) + 7)/8; - - if (!(ret = ECDSA_SIG_new())) { - return NULL; - } - - ret->r = BN_bin2bn(data->r, bnlen, NULL); - ret->s = BN_bin2bn(data->s, bnlen, NULL); - - return ret; -} - -int ECDSA_SIG_to_SKF_ECCSIGNATUREBLOB(const ECDSA_SIG *sig, - const EC_GROUP *group, void *out, size_t *outlen) -{ - int bnlen; - ECCSIGNATUREBLOB *data = out; - - if (!out) { - if (!outlen) { - return 0; - } - *outlen = sizeof(ECCSIGNATUREBLOB); - return 1; - } - - bnlen = (EC_GROUP_get_degree(group) + 7)/8; - *outlen = sizeof(ECCSIGNATUREBLOB); - - BN_bn2bin(sig->r, data->r + bnlen - BN_num_bytes(sig->r)); - BN_bn2bin(sig->s, data->s + bnlen - BN_num_bytes(sig->s)); - - return 1; -} - -int RSA_set_RSAPUBLICKEYBLOB(RSA *rsa, const RSAPUBLICKEYBLOB *blob) -{ - int ret = 0; - - if (!(rsa->n = BN_bin2bn(blob->Modulus, blob->BitLen/8, NULL))) { - goto end; - } - if (!(rsa->e = BN_bin2bn(blob->PublicExponent, blob->BitLen/8, NULL))) { - goto end; - } - if (!RSA_check_key(rsa)) { - goto end; - } - -end: - return ret; -} - -int RSA_get_RSAPUBLICKEYBLOB(RSA *rsa, RSAPUBLICKEYBLOB *blob) -{ - int ret = 0; - int nbytes; - - if (!rsa->n || !rsa->e) { - goto end; - } - - nbytes = BN_num_bytes(rsa->n); - - BN_bn2bin(rsa->n, blob->Modulus + bnlen - BN_num_bytes(rsa->n)); - BN_bn2bin(rsa->e, blob->PublicExponent + bnlen - BN_num_bytes(rsa->e)); - - return ret; -} - -int RSA_set_RSAPRIVATEKEYBLOB(RSA *rsa, const RSAPRIVATEKEYBLOB *blob) -{ - int ret = 0; - - if (!blob->AlgID) { - goto end; - } - if (!blob->BitLen) { - goto end; - } - - rsa->n = BN_bin2bn(blob->Modulus, MAX_RSA_MODULUS_LEN, NULL); - rsa->e = BN_bin2bn(blob->PublicExponent, MAX_RSA_EXPONENT_LEN, NULL); - rsa->d = BN_bin2bn(blob->Prime1, bnlen, NULL); - rsa->p = BN_bin2bn(blob->Prime2, bnlen, NULL); - rsa->dmp1 = BN_bin2bn(blob->Prime1Exponent, bnlen, NULL); - rsa->dmq1 = BN_bin2bn(blob->Prime2Exponent, bnlen, NULL); - rsa->iqmp = BN_bin2bn(blob->Coefficient, bnlen, NULL); - -} - -int RSA_get_RSAPRIVATEKEYBLOB(RSA *rsa, RSAPRIVATEKEYBLOB *blob) -{ - int ret = 0; - RSAPRIVATEKEYBLOB *blob = out; - - return ret; -} - diff --git a/crypto/sm1/Makefile b/crypto/sm1/Makefile new file mode 100644 index 00000000..3fdc0e7a --- /dev/null +++ b/crypto/sm1/Makefile @@ -0,0 +1,81 @@ +# +# OpenSSL/crypto/sm1/Makefile +# + +DIR= sm1 +TOP= ../.. +CC= cc +CPP= $(CC) -E +INCLUDES=-I.. -I$(TOP) -I../../include +CFLAG=-g +MAKEFILE= Makefile +AR= ar r + +SM3_ASM_OBJ= + +CFLAGS= $(INCLUDES) $(CFLAG) +ASFLAGS= $(INCLUDES) $(ASFLAG) +AFLAGS= $(ASFLAGS) + +GENERAL=Makefile +TEST= +APPS= + +LIB=$(TOP)/libcrypto.a +LIBSRC= +LIBOBJ= + +SRC= $(LIBSRC) + +EXHEADER= sm1.h +HEADER= $(EXHEADER) + +ALL= $(GENERAL) $(SRC) $(HEADER) + +top: + (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) + +all: lib + +lib: $(LIBOBJ) + $(AR) $(LIB) $(LIBOBJ) + $(RANLIB) $(LIB) || echo Never mind. + @touch lib + +files: + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO + +links: + @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) + @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) + @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) + +install: + @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... + @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ + do \ + (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ + done; + +tags: + ctags $(SRC) + +tests: + +lint: + lint -DLINT $(INCLUDES) $(SRC)>fluff + +depend: + @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... + $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) + +dclean: + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + mv -f Makefile.new $(MAKEFILE) + +clean: + rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + +# DO NOT DELETE THIS LINE -- make depend depends on it. + diff --git a/crypto/sm1/sm1.h b/crypto/sm1/sm1.h index 7351772a..0c8022e0 100644 --- a/crypto/sm1/sm1.h +++ b/crypto/sm1/sm1.h @@ -54,6 +54,7 @@ #define SM1_KEY_LENGTH 16 #define SM1_BLOCK_SIZE 16 +#define SM1_IV_LENGTH (SM1_BLOCK_SIZE) #ifdef __cplusplus extern "C" { diff --git a/crypto/sm1/sm1test.c b/crypto/sm1/sm1test.c deleted file mode 100644 index 0b3adc5c..00000000 --- a/crypto/sm1/sm1test.c +++ /dev/null @@ -1,54 +0,0 @@ -#include -#include -#include -#include - -int main(int argc, char **argv) -{ - const char *engine_id = "SKF"; - ENGINE *engine = NULL; - const EVP_CIPHER *cipher; - EVP_CIPHER_CTX ctx; - unsigned char key[16]; - unsigned char iv[16]; - const char *msg1 = "hello world"; - const char *msg2 = "12345678"; - unsigned char buf[128]; - int len; - - ENGINE_load_builtin_engines(); - engine = ENGINE_by_id(engine_id); - - OPENSSL_assert(engine != NULL); - - rv = ENGINE_init(engine); - OPENSSL_assert(rv == 1); - - cipher = ENGINE_get_cipher(engine, NID_sm1_cbc); - - EVP_CIPHER_CTX_init(&ctx); - - rv = RAND_bytes(key, (int)sizeof(key)); - rv = RAND_bytes(iv, (int)sizeof(iv)); - - rv = EVP_EncryptInit_ex(&ctx, cipher, engine, key, iv); - - p = buf; - rv = EVP_EncryptUpdate(&ctx, p, &len, (unsigned char *)msg1, (int)strlen(msg1)); - - p += len; - rv = EVP_EncryptUpdate(&ctx, p, &len, (unsigned char *)msg2, (int)strlen(msg2)); - - p += len; - rv = EVP_EncryptFinal_ex(&ctx, p, &len); - - p += len; - - - EVP_CIPHER_CTX_cleanup(&ctx); - ENGINE_finish(engine); - ENGINE_free(engine); - - return 0; -} - diff --git a/crypto/sm2/Makefile b/crypto/sm2/Makefile index d2b8b71e..062fac74 100644 --- a/crypto/sm2/Makefile +++ b/crypto/sm2/Makefile @@ -76,3 +76,90 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. +sm2_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h +sm2_asn1.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h +sm2_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +sm2_asn1.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h +sm2_asn1.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h +sm2_asn1.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +sm2_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +sm2_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +sm2_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +sm2_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +sm2_asn1.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +sm2_asn1.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +sm2_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +sm2_asn1.o: ../../include/openssl/x509_vfy.h sm2_asn1.c +sm2_enc.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +sm2_enc.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h +sm2_enc.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +sm2_enc.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h +sm2_enc.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h +sm2_enc.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +sm2_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +sm2_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +sm2_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +sm2_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h +sm2_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +sm2_enc.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +sm2_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +sm2_enc.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h sm2.h +sm2_enc.o: sm2_enc.c +sm2_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +sm2_err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h +sm2_err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +sm2_err.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +sm2_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h +sm2_err.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +sm2_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +sm2_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +sm2_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +sm2_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +sm2_err.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +sm2_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +sm2_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +sm2_err.o: sm2_err.c +sm2_kap.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +sm2_kap.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h +sm2_kap.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +sm2_kap.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +sm2_kap.o: ../../include/openssl/err.h ../../include/openssl/evp.h +sm2_kap.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +sm2_kap.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +sm2_kap.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +sm2_kap.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +sm2_kap.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +sm2_kap.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +sm2_kap.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +sm2_kap.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h sm2.h +sm2_kap.o: sm2_kap.c +sm2_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +sm2_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h +sm2_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +sm2_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h +sm2_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h +sm2_lib.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +sm2_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +sm2_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +sm2_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +sm2_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h +sm2_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +sm2_lib.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +sm2_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +sm2_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +sm2_lib.o: sm2_lib.c +sm2_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +sm2_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h +sm2_sign.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +sm2_sign.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h +sm2_sign.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h +sm2_sign.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +sm2_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +sm2_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +sm2_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +sm2_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h +sm2_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +sm2_sign.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +sm2_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +sm2_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +sm2_sign.o: sm2_sign.c diff --git a/crypto/sm2/sm2.h b/crypto/sm2/sm2.h index 656592aa..e5c161e6 100644 --- a/crypto/sm2/sm2.h +++ b/crypto/sm2/sm2.h @@ -69,8 +69,8 @@ extern "C" { #define SM2_MAX_ID_BITS 65535 #define SM2_MAX_ID_LENGTH (SM2_MAX_ID_BITS/8) -#define SM2_DEFAULT_ID_GMT09 "1234567812345678" -#define SM2_DEFAULT_ID_GMSSL "anonym@gmssl.org" +#define SM2_DEFAULT_ID_GMT09 "1234567812345678" +#define SM2_DEFAULT_ID_GMSSL "anonym@gmssl.org" #define SM2_DEFAULT_ID SM2_DEFAULT_ID_GMSSL #define SM2_DEFAULT_POINT_CONVERSION_FORM POINT_CONVERSION_UNCOMPRESSED @@ -81,7 +81,6 @@ int SM2_compute_id_digest(const EVP_MD *md, unsigned char *dgst, unsigned int *dgstlen, EC_KEY *ec_key); - typedef struct sm2_enc_params_st { const EVP_MD *kdf_md; const EVP_MD *mac_md; @@ -92,6 +91,7 @@ typedef struct sm2_enc_params_st { #define SM2_ENC_PARAMS_mactag_size(params) \ ((params)->mactag_size<0 ? EVP_MD_size((params)->mac_md) : (params->mactag_size)) +int SM2_ENC_PARAMS_init_with_recommended(SM2_ENC_PARAMS *params); typedef struct sm2_ciphertext_value_st { EC_POINT *ephem_point; @@ -103,6 +103,8 @@ typedef struct sm2_ciphertext_value_st { int SM2_CIPHERTEXT_VALUE_size(const EC_GROUP *ec_group, const SM2_ENC_PARAMS *params, size_t mlen); + +SM2_CIPHERTEXT_VALUE *SM2_CIPHERTEXT_VALUE_new(const EC_GROUP *group); void SM2_CIPHERTEXT_VALUE_free(SM2_CIPHERTEXT_VALUE *cv); int SM2_CIPHERTEXT_VALUE_encode(const SM2_CIPHERTEXT_VALUE *cv, const EC_GROUP *ec_group, const SM2_ENC_PARAMS *params, @@ -130,10 +132,12 @@ int SM2_encrypt_with_recommended(unsigned char *out, size_t *outlen, const unsigned char *in, size_t inlen, EC_KEY *ec_key); int SM2_decrypt_with_recommended(unsigned char *out, size_t *outlen, const unsigned char *in, size_t inlen, EC_KEY *ec_key); +#if 0 int SM2_encrypt_elgamal(unsigned char *out, size_t *outlen, const unsigned char *in, size_t inlen, EC_KEY *ec_key); int SM2_decrypt_elgamal(unsigned char *out, size_t *outlen, const unsigned char *in, size_t inlen, EC_KEY *ec_key); +#endif int SM2_compute_message_digest(const EVP_MD *id_md, const EVP_MD *msg_md, const void *msg, size_t msglen, unsigned char *dgst, @@ -169,14 +173,14 @@ typedef struct sm2_kap_ctx_st { const EVP_MD *checksum_md; point_conversion_form_t point_form; KDF_FUNC kdf; - + int is_initiator; int do_checksum; EC_KEY *ec_key; unsigned char id_dgst[EVP_MAX_MD_SIZE]; unsigned int id_dgstlen; - + EC_KEY *remote_pubkey; unsigned char remote_id_dgst[EVP_MAX_MD_SIZE]; unsigned int remote_id_dgstlen; @@ -185,7 +189,7 @@ typedef struct sm2_kap_ctx_st { BN_CTX *bn_ctx; BIGNUM *order; BIGNUM *two_pow_w; - + BIGNUM *t; EC_POINT *point; unsigned char pt_buf[1 + (OPENSSL_ECC_MAX_FIELD_BITS+7)/4]; @@ -207,54 +211,60 @@ int SM2_KAP_final_check(SM2_KAP_CTX *ctx, const unsigned char *checksum, void SM2_KAP_CTX_cleanup(SM2_KAP_CTX *ctx); - - +/* BEGIN ERROR CODES */ +/* + * The following lines are auto generated by the script mkerr.pl. Any changes + * made after this point may be overwritten when the script is next run. + */ void ERR_load_SM2_strings(void); -/* Function codes. */ -#define SM2_F_SM2_SET_ID 100 -#define SM2_F_SM2_GET_ID 101 -#define SM2_F_SM2_COMPUTE_ID_DIGEST 102 -#define SM2_F_SM2_CIPHERTEXT_VALUE_SIZE 103 -#define SM2_F_SM2_CIPHERTEXT_VALUE_FREE 104 -#define SM2_F_SM2_CIPHERTEXT_VALUE_ENCODE 105 -#define SM2_F_SM2_CIPHERTEXT_VALUE_DECODE 106 -#define SM2_F_SM2_CIPHERTEXT_VALUE_PRINT 107 -#define SM2_F_SM2_DO_ENCRYPT 108 -#define SM2_F_SM2_DO_DECRYPT 109 -#define SM2_F_SM2_ENCRYPT 110 -#define SM2_F_SM2_DECRYPT 111 -#define SM2_F_SM2_SIGNATURE_SIZE 112 -#define SM2_F_SM2_SIGN_SETUP 113 -#define SM2_F_SM2_DO_SIGN_EX 114 -#define SM2_F_SM2_DO_SIGN 115 -#define SM2_F_SM2_DO_VERIFY 116 -#define SM2_F_SM2_SIGN_EX 117 -#define SM2_F_SM2_SIGN 118 -#define SM2_F_SM2_VERIFY 119 -#define SM2_F_SM2_KAP_CTX_INIT 120 -#define SM2_F_SM2_KAP_CTX_CLEANUP 121 -#define SM2_F_SM2_KAP_PREPARE 122 -#define SM2_F_SM2_KAP_COMPUTE_KEY 123 -#define SM2_F_SM2_KAP_FINAL_CHECK 124 +/* Error codes for the SM2 functions. */ +/* Function codes. */ +# define SM2_F_SM2_CIPHERTEXT_VALUE_DECODE 100 +# define SM2_F_SM2_CIPHERTEXT_VALUE_ENCODE 101 +# define SM2_F_SM2_CIPHERTEXT_VALUE_FREE 102 +# define SM2_F_SM2_CIPHERTEXT_VALUE_PRINT 103 +# define SM2_F_SM2_CIPHERTEXT_VALUE_SIZE 104 +# define SM2_F_SM2_COMPUTE_ID_DIGEST 105 +# define SM2_F_SM2_DECRYPT 106 +# define SM2_F_SM2_DO_DECRYPT 107 +# define SM2_F_SM2_DO_ENCRYPT 108 +# define SM2_F_SM2_DO_SIGN 109 +# define SM2_F_SM2_DO_SIGN_EX 110 +# define SM2_F_SM2_DO_VERIFY 111 +# define SM2_F_SM2_ENCRYPT 112 +# define SM2_F_SM2_GET_ID 113 +# define SM2_F_SM2_KAP_COMPUTE_KEY 114 +# define SM2_F_SM2_KAP_CTX_CLEANUP 115 +# define SM2_F_SM2_KAP_CTX_INIT 116 +# define SM2_F_SM2_KAP_FINAL_CHECK 117 +# define SM2_F_SM2_KAP_PREPARE 118 +# define SM2_F_SM2_SET_ID 119 +# define SM2_F_SM2_SIGN 120 +# define SM2_F_SM2_SIGNATURE_SIZE 121 +# define SM2_F_SM2_SIGN_EX 122 +# define SM2_F_SM2_SIGN_SETUP 123 +# define SM2_F_SM2_VERIFY 124 /* Reason codes. */ -#define SM2_R_BAD_DATA 100 -#define SM2_R_UNKNOWN_CIPHER_TYPE 101 -#define SM2_R_ENCRYPT_FAILED 102 -#define SM2_R_DECRYPT_FAILED 103 -#define SM2_R_UNKNOWN_MAC_TYPE 104 -#define SM2_R_GEN_MAC_FAILED 105 -#define SM2_R_VERIFY_MAC_FAILED 106 -#define SM2_R_ECDH_FAILED 107 -#define SM2_R_BUFFER_TOO_SMALL 108 -#define SM2_R_SM2_KAP_NOT_INITED 109 -#define SM2_R_RANDOM_NUMBER_GENERATION_FAILED 110 -#define SM2_R_ERROR 111 +# define SM2_R_BAD_DATA 100 +# define SM2_R_BAD_SIGNATURE 101 +# define SM2_R_BUFFER_TOO_SMALL 102 +# define SM2_R_DECRYPT_FAILED 103 +# define SM2_R_ECDH_FAILED 104 +# define SM2_R_ENCRYPT_FAILED 105 +# define SM2_R_ERROR 106 +# define SM2_R_GEN_MAC_FAILED 107 +# define SM2_R_MISSING_PARAMETERS 108 +# define SM2_R_NEED_NEW_SETUP_VALUES 109 +# define SM2_R_RANDOM_NUMBER_GENERATION_FAILED 110 +# define SM2_R_SM2_KAP_NOT_INITED 111 +# define SM2_R_UNKNOWN_CIPHER_TYPE 112 +# define SM2_R_UNKNOWN_MAC_TYPE 113 +# define SM2_R_VERIFY_MAC_FAILED 114 -#ifdef __cplusplus +#ifdef __cplusplus } #endif #endif - diff --git a/crypto/sm2/sm2_enc.c b/crypto/sm2/sm2_enc.c index 7e63f53f..b7c1cd8f 100644 --- a/crypto/sm2/sm2_enc.c +++ b/crypto/sm2/sm2_enc.c @@ -95,6 +95,11 @@ end: return ret; } +SM2_CIPHERTEXT_VALUE *SM2_CIPHERTEXT_VALUE_new(const EC_GROUP *group) +{ + return NULL; +} + void SM2_CIPHERTEXT_VALUE_free(SM2_CIPHERTEXT_VALUE *cv) { if (cv->ephem_point) EC_POINT_free(cv->ephem_point); @@ -631,7 +636,7 @@ int SM2_do_decrypt(const SM2_ENC_PARAMS *params, goto end; } if (cv->mactag_size != mactag_size || - memcmp(mac, cv->mactag, cv->mactag_size)) { + OPENSSL_memcmp(mac, cv->mactag, cv->mactag_size)) { SM2err(SM2_F_SM2_DO_DECRYPT, SM2_R_ERROR); goto end; } diff --git a/crypto/sm2/sm2_err.c b/crypto/sm2/sm2_err.c index ba10bbb7..ae46ba3e 100644 --- a/crypto/sm2/sm2_err.c +++ b/crypto/sm2/sm2_err.c @@ -1,6 +1,6 @@ /* crypto/sm2/sm2_err.c */ /* ==================================================================== - * Copyright (c) 2015 The GmSSL Project. All rights reserved. + * Copyright (c) 1999-2016 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 @@ -16,27 +16,27 @@ * * 3. All advertising materials mentioning features or use of this * software must display the following acknowledgment: - * "This product includes software developed by the GmSSL Project. - * (http://gmssl.org/)" + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" * - * 4. The name "GmSSL Project" must not be used to endorse or promote - * products derived from this software without prior written - * permission. For written permission, please contact - * guanzhi1980@gmail.com. + * 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 "GmSSL" - * nor may "GmSSL" appear in their names without prior written - * permission of the GmSSL Project. + * 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 GmSSL Project - * (http://gmssl.org/)" + * "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 GmSSL PROJECT ``AS IS'' AND ANY + * 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 GmSSL PROJECT OR + * 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; @@ -47,62 +47,77 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. * ==================================================================== * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * */ +/* + * NOTE: this file was auto generated by the mkerr.pl script: any changes + * made to it will be overwritten when the script next updates this file, + * only reason strings will be preserved. + */ #include #include -#include "sm2.h" +#include +/* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR -#define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECIES,func,0) -#define ERR_REASON(reason) ERR_PACK(ERR_LIB_ECIES,0,reason) - +# define ERR_FUNC(func) ERR_PACK(ERR_LIB_SM2,func,0) +# define ERR_REASON(reason) ERR_PACK(ERR_LIB_SM2,0,reason) static ERR_STRING_DATA SM2_str_functs[] = { - {ERR_FUNC(SM2_F_SM2_SET_ID), "SM2_SET_ID"}, - {ERR_FUNC(SM2_F_SM2_GET_ID), "SM2_F_SM2_GET_ID"}, - {ERR_FUNC(SM2_F_SM2_COMPUTE_ID_DIGEST), "SM2_compute_id_digest"}, - {ERR_FUNC(SM2_F_SM2_CIPHERTEXT_VALUE_SIZE), "SM2_CIPHERTEXT_VALUE_size"}, - {ERR_FUNC(SM2_F_SM2_CIPHERTEXT_VALUE_FREE), "SM2_CIPHERTEXT_VALUE_free"}, - {ERR_FUNC(SM2_F_SM2_CIPHERTEXT_VALUE_ENCODE), "SM2_CIPHERTEXT_VALUE_encode"}, - {ERR_FUNC(SM2_F_SM2_CIPHERTEXT_VALUE_DECODE), "SM2_CIPHERTEXT_VALUE_decode"}, - {ERR_FUNC(SM2_F_SM2_CIPHERTEXT_VALUE_PRINT), "SM2_CIPHERTEXT_VALUE_print"}, - {ERR_FUNC(SM2_F_SM2_DO_ENCRYPT), "SM2_do_encrypt"}, - {ERR_FUNC(SM2_F_SM2_DO_DECRYPT), "SM2_do_decrypt"}, - {ERR_FUNC(SM2_F_SM2_ENCRYPT), "SM2_encrypt"}, - {ERR_FUNC(SM2_F_SM2_DECRYPT), "SM2_decrypt"}, - {ERR_FUNC(SM2_F_SM2_SIGNATURE_SIZE), "SM2_signature_size"}, - {ERR_FUNC(SM2_F_SM2_SIGN_SETUP), "SM2_sign_setup"}, - {ERR_FUNC(SM2_F_SM2_DO_SIGN_EX), "SM2_do_sign_ex"}, - {ERR_FUNC(SM2_F_SM2_DO_SIGN), "SM2_do_sign"}, - {ERR_FUNC(SM2_F_SM2_DO_VERIFY), "SM2_do_verify"}, - {ERR_FUNC(SM2_F_SM2_SIGN_EX), "SM2_sign_ex"}, - {ERR_FUNC(SM2_F_SM2_SIGN), "SM2_sign"}, - {ERR_FUNC(SM2_F_SM2_VERIFY), "SM2_verify"}, - {ERR_FUNC(SM2_F_SM2_KAP_CTX_INIT), "SM2_KAP_CTX_init"}, - {ERR_FUNC(SM2_F_SM2_KAP_CTX_CLEANUP), "SM2_KAP_CTX_cleanup"}, - {ERR_FUNC(SM2_F_SM2_KAP_PREPARE), "SM2_KAP_prepare"}, - {ERR_FUNC(SM2_F_SM2_KAP_COMPUTE_KEY), "SM2_KAP_compute_key"}, - {ERR_FUNC(SM2_F_SM2_KAP_FINAL_CHECK), "SM2_KAP_final_check"}, - {0,NULL} + {ERR_FUNC(SM2_F_SM2_CIPHERTEXT_VALUE_DECODE), + "SM2_CIPHERTEXT_VALUE_decode"}, + {ERR_FUNC(SM2_F_SM2_CIPHERTEXT_VALUE_ENCODE), + "SM2_CIPHERTEXT_VALUE_encode"}, + {ERR_FUNC(SM2_F_SM2_CIPHERTEXT_VALUE_FREE), "SM2_CIPHERTEXT_VALUE_free"}, + {ERR_FUNC(SM2_F_SM2_CIPHERTEXT_VALUE_PRINT), "SM2_CIPHERTEXT_VALUE_print"}, + {ERR_FUNC(SM2_F_SM2_CIPHERTEXT_VALUE_SIZE), "SM2_CIPHERTEXT_VALUE_size"}, + {ERR_FUNC(SM2_F_SM2_COMPUTE_ID_DIGEST), "SM2_compute_id_digest"}, + {ERR_FUNC(SM2_F_SM2_DECRYPT), "SM2_decrypt"}, + {ERR_FUNC(SM2_F_SM2_DO_DECRYPT), "SM2_do_decrypt"}, + {ERR_FUNC(SM2_F_SM2_DO_ENCRYPT), "SM2_do_encrypt"}, + {ERR_FUNC(SM2_F_SM2_DO_SIGN), "SM2_do_sign"}, + {ERR_FUNC(SM2_F_SM2_DO_SIGN_EX), "SM2_do_sign_ex"}, + {ERR_FUNC(SM2_F_SM2_DO_VERIFY), "SM2_do_verify"}, + {ERR_FUNC(SM2_F_SM2_ENCRYPT), "SM2_encrypt"}, + {ERR_FUNC(SM2_F_SM2_GET_ID), "SM2_GET_ID"}, + {ERR_FUNC(SM2_F_SM2_KAP_COMPUTE_KEY), "SM2_KAP_compute_key"}, + {ERR_FUNC(SM2_F_SM2_KAP_CTX_CLEANUP), "SM2_KAP_CTX_cleanup"}, + {ERR_FUNC(SM2_F_SM2_KAP_CTX_INIT), "SM2_KAP_CTX_init"}, + {ERR_FUNC(SM2_F_SM2_KAP_FINAL_CHECK), "SM2_KAP_final_check"}, + {ERR_FUNC(SM2_F_SM2_KAP_PREPARE), "SM2_KAP_prepare"}, + {ERR_FUNC(SM2_F_SM2_SET_ID), "SM2_set_id"}, + {ERR_FUNC(SM2_F_SM2_SIGN), "SM2_sign"}, + {ERR_FUNC(SM2_F_SM2_SIGNATURE_SIZE), "SM2_SIGNATURE_SIZE"}, + {ERR_FUNC(SM2_F_SM2_SIGN_EX), "SM2_sign_ex"}, + {ERR_FUNC(SM2_F_SM2_SIGN_SETUP), "SM2_sign_setup"}, + {ERR_FUNC(SM2_F_SM2_VERIFY), "SM2_verify"}, + {0, NULL} }; static ERR_STRING_DATA SM2_str_reasons[] = { - {ERR_REASON(SM2_R_BAD_DATA), "bad data"}, - {ERR_REASON(SM2_R_UNKNOWN_CIPHER_TYPE), "unknown cipher type"}, - {ERR_REASON(SM2_R_ENCRYPT_FAILED), "encrypt failed"}, - {ERR_REASON(SM2_R_DECRYPT_FAILED), "decrypt failed"}, - {ERR_REASON(SM2_R_UNKNOWN_MAC_TYPE), "unknown MAC type"}, - {ERR_REASON(SM2_R_GEN_MAC_FAILED), "MAC generation failed"}, - {ERR_REASON(SM2_R_VERIFY_MAC_FAILED), "MAC verification failed"}, - {ERR_REASON(SM2_R_ECDH_FAILED), "ECDH failed"}, - {ERR_REASON(SM2_R_BUFFER_TOO_SMALL), "buffer too small"}, - {ERR_REASON(SM2_R_SM2_KAP_NOT_INITED), "KAP not inited"}, - {ERR_REASON(SM2_R_RANDOM_NUMBER_GENERATION_FAILED), "random number generation failed"}, - {ERR_REASON(SM2_R_ERROR), "Error"}, - {0,NULL} + {ERR_REASON(SM2_R_BAD_DATA), "bad data"}, + {ERR_REASON(SM2_R_BAD_SIGNATURE), "bad signature"}, + {ERR_REASON(SM2_R_BUFFER_TOO_SMALL), "buffer too small"}, + {ERR_REASON(SM2_R_DECRYPT_FAILED), "decrypt failed"}, + {ERR_REASON(SM2_R_ECDH_FAILED), "ecdh failed"}, + {ERR_REASON(SM2_R_ENCRYPT_FAILED), "encrypt failed"}, + {ERR_REASON(SM2_R_ERROR), "error"}, + {ERR_REASON(SM2_R_GEN_MAC_FAILED), "gen mac failed"}, + {ERR_REASON(SM2_R_MISSING_PARAMETERS), "missing parameters"}, + {ERR_REASON(SM2_R_NEED_NEW_SETUP_VALUES), "need new setup values"}, + {ERR_REASON(SM2_R_RANDOM_NUMBER_GENERATION_FAILED), + "random number generation failed"}, + {ERR_REASON(SM2_R_SM2_KAP_NOT_INITED), "sm2 kap not inited"}, + {ERR_REASON(SM2_R_UNKNOWN_CIPHER_TYPE), "unknown cipher type"}, + {ERR_REASON(SM2_R_UNKNOWN_MAC_TYPE), "unknown mac type"}, + {ERR_REASON(SM2_R_VERIFY_MAC_FAILED), "verify mac failed"}, + {0, NULL} }; #endif @@ -111,9 +126,9 @@ void ERR_load_SM2_strings(void) { #ifndef OPENSSL_NO_ERR - if (ERR_func_error_string(SM2_str_functs[0].error) == NULL) { - ERR_load_strings(0,SM2_str_functs); - ERR_load_strings(0,SM2_str_reasons); - } + if (ERR_func_error_string(SM2_str_functs[0].error) == NULL) { + ERR_load_strings(0, SM2_str_functs); + ERR_load_strings(0, SM2_str_reasons); + } #endif } diff --git a/crypto/sm2/sm2_err2.c b/crypto/sm2/sm2_err2.c new file mode 100644 index 00000000..ba10bbb7 --- /dev/null +++ b/crypto/sm2/sm2_err2.c @@ -0,0 +1,119 @@ +/* crypto/sm2/sm2_err.c */ +/* ==================================================================== + * Copyright (c) 2015 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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 +#include +#include "sm2.h" + +#ifndef OPENSSL_NO_ERR + +#define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECIES,func,0) +#define ERR_REASON(reason) ERR_PACK(ERR_LIB_ECIES,0,reason) + + +static ERR_STRING_DATA SM2_str_functs[] = { + {ERR_FUNC(SM2_F_SM2_SET_ID), "SM2_SET_ID"}, + {ERR_FUNC(SM2_F_SM2_GET_ID), "SM2_F_SM2_GET_ID"}, + {ERR_FUNC(SM2_F_SM2_COMPUTE_ID_DIGEST), "SM2_compute_id_digest"}, + {ERR_FUNC(SM2_F_SM2_CIPHERTEXT_VALUE_SIZE), "SM2_CIPHERTEXT_VALUE_size"}, + {ERR_FUNC(SM2_F_SM2_CIPHERTEXT_VALUE_FREE), "SM2_CIPHERTEXT_VALUE_free"}, + {ERR_FUNC(SM2_F_SM2_CIPHERTEXT_VALUE_ENCODE), "SM2_CIPHERTEXT_VALUE_encode"}, + {ERR_FUNC(SM2_F_SM2_CIPHERTEXT_VALUE_DECODE), "SM2_CIPHERTEXT_VALUE_decode"}, + {ERR_FUNC(SM2_F_SM2_CIPHERTEXT_VALUE_PRINT), "SM2_CIPHERTEXT_VALUE_print"}, + {ERR_FUNC(SM2_F_SM2_DO_ENCRYPT), "SM2_do_encrypt"}, + {ERR_FUNC(SM2_F_SM2_DO_DECRYPT), "SM2_do_decrypt"}, + {ERR_FUNC(SM2_F_SM2_ENCRYPT), "SM2_encrypt"}, + {ERR_FUNC(SM2_F_SM2_DECRYPT), "SM2_decrypt"}, + {ERR_FUNC(SM2_F_SM2_SIGNATURE_SIZE), "SM2_signature_size"}, + {ERR_FUNC(SM2_F_SM2_SIGN_SETUP), "SM2_sign_setup"}, + {ERR_FUNC(SM2_F_SM2_DO_SIGN_EX), "SM2_do_sign_ex"}, + {ERR_FUNC(SM2_F_SM2_DO_SIGN), "SM2_do_sign"}, + {ERR_FUNC(SM2_F_SM2_DO_VERIFY), "SM2_do_verify"}, + {ERR_FUNC(SM2_F_SM2_SIGN_EX), "SM2_sign_ex"}, + {ERR_FUNC(SM2_F_SM2_SIGN), "SM2_sign"}, + {ERR_FUNC(SM2_F_SM2_VERIFY), "SM2_verify"}, + {ERR_FUNC(SM2_F_SM2_KAP_CTX_INIT), "SM2_KAP_CTX_init"}, + {ERR_FUNC(SM2_F_SM2_KAP_CTX_CLEANUP), "SM2_KAP_CTX_cleanup"}, + {ERR_FUNC(SM2_F_SM2_KAP_PREPARE), "SM2_KAP_prepare"}, + {ERR_FUNC(SM2_F_SM2_KAP_COMPUTE_KEY), "SM2_KAP_compute_key"}, + {ERR_FUNC(SM2_F_SM2_KAP_FINAL_CHECK), "SM2_KAP_final_check"}, + {0,NULL} +}; + +static ERR_STRING_DATA SM2_str_reasons[] = { + {ERR_REASON(SM2_R_BAD_DATA), "bad data"}, + {ERR_REASON(SM2_R_UNKNOWN_CIPHER_TYPE), "unknown cipher type"}, + {ERR_REASON(SM2_R_ENCRYPT_FAILED), "encrypt failed"}, + {ERR_REASON(SM2_R_DECRYPT_FAILED), "decrypt failed"}, + {ERR_REASON(SM2_R_UNKNOWN_MAC_TYPE), "unknown MAC type"}, + {ERR_REASON(SM2_R_GEN_MAC_FAILED), "MAC generation failed"}, + {ERR_REASON(SM2_R_VERIFY_MAC_FAILED), "MAC verification failed"}, + {ERR_REASON(SM2_R_ECDH_FAILED), "ECDH failed"}, + {ERR_REASON(SM2_R_BUFFER_TOO_SMALL), "buffer too small"}, + {ERR_REASON(SM2_R_SM2_KAP_NOT_INITED), "KAP not inited"}, + {ERR_REASON(SM2_R_RANDOM_NUMBER_GENERATION_FAILED), "random number generation failed"}, + {ERR_REASON(SM2_R_ERROR), "Error"}, + {0,NULL} +}; + +#endif + +void ERR_load_SM2_strings(void) +{ +#ifndef OPENSSL_NO_ERR + + if (ERR_func_error_string(SM2_str_functs[0].error) == NULL) { + ERR_load_strings(0,SM2_str_functs); + ERR_load_strings(0,SM2_str_reasons); + } +#endif +} diff --git a/crypto/sm2/sm2_kap.c b/crypto/sm2/sm2_kap.c index 420b54da..8204bdfc 100644 --- a/crypto/sm2/sm2_kap.c +++ b/crypto/sm2/sm2_kap.c @@ -202,33 +202,27 @@ int SM2_update_public_key(EC_KEY *ec_key, const EC_POINT *pub_key) if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) { if (!EC_POINT_get_affine_coordinates_GFp(group, pub_key, x, NULL, bn_ctx)) { - SM2err(SM2_F_SM2_KAP_COMPUTE_KEY, ERR_R_EC_LIB); goto end; } } else { if (!EC_POINT_get_affine_coordinates_GF2m(group, pub_key, x, NULL, bn_ctx)) { - SM2err(SM2_F_SM2_KAP_COMPUTE_KEY, ERR_R_EC_LIB); goto end; } } if (!BN_nnmod(x, x, ctx->two_pow_w, bn_ctx)) { - SM2err(SM2_F_SM2_KAP_PREPARE, ERR_R_BN_LIB); goto end; } if (!BN_add(x, x, ctx->two_pow_w)) { - SM2err(SM2_F_SM2_KAP_PREPARE, ERR_R_BN_LIB); goto end; } if (!BN_mod_mul(ctx->t, x, r, ctx->order, ctx->bn_ctx)) { - SM2err(SM2_F_SM2_KAP_PREPARE, ERR_R_BN_LIB); goto end; } if (!EC_POINT_mul(group, point, NULL, point, x, ctx->bn_ctx)) { - SM2err(SM2_F_SM2_KAP_COMPUTE_KEY, ERR_R_EC_LIB); goto end; } @@ -648,12 +642,10 @@ int SM2_KAP_final_check(SM2_KAP_CTX *ctx, const unsigned char *checksum, if (ctx->do_checksum) { if (checksumlen != EVP_MD_size(ctx->checksum_md)) { - SM2err(SM2_F_SM2_KAP_FINAL_CHECK, 0); return 0; } if (memcmp(ctx->checksum, checksum, checksumlen)) { - SM2err(SM2_F_SM2_KAP_COMPUTE_KEY, ERR_R_EC_LIB); return 0; } diff --git a/crypto/sm2/sm2_lib.c b/crypto/sm2/sm2_lib.c index 3b36ac46..6004d5ef 100644 --- a/crypto/sm2/sm2_lib.c +++ b/crypto/sm2/sm2_lib.c @@ -146,12 +146,10 @@ int sm2_get_public_key_data(unsigned char *buf, EC_KEY *ec_key) if (EC_METHOD_get_field_type(EC_GROUP_method_of(ec_group)) == NID_X9_62_prime_field) { if (!EC_GROUP_get_curve_GFp(ec_group, p, x, y, bn_ctx)) { - SM2err(SM2_F_SM2_KAP_PREPARE, ERR_R_EC_LIB); goto err; } } else { if (!EC_GROUP_get_curve_GF2m(ec_group, p, x, y, bn_ctx)) { - SM2err(SM2_F_SM2_KAP_PREPARE, ERR_R_EC_LIB); goto err; } } diff --git a/crypto/sm2/sm2_sign.c b/crypto/sm2/sm2_sign.c index a9015b73..10d20dbf 100644 --- a/crypto/sm2/sm2_sign.c +++ b/crypto/sm2/sm2_sign.c @@ -58,7 +58,6 @@ #include #include - /* k in [1, n-1], (x, y) = kG */ static int sm2_sign_setup(EC_KEY *ec_key, BN_CTX *ctx_in, BIGNUM **kp, BIGNUM **xp) { @@ -71,13 +70,13 @@ static int sm2_sign_setup(EC_KEY *ec_key, BN_CTX *ctx_in, BIGNUM **kp, BIGNUM ** EC_POINT *point = NULL; if (ec_key == NULL || (ec_group = EC_KEY_get0_group(ec_key)) == NULL) { - ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_PASSED_NULL_PARAMETER); + SM2err(SM2_F_SM2_SIGN_SETUP, ERR_R_PASSED_NULL_PARAMETER); return 0; } if (ctx_in == NULL) { if ((ctx = BN_CTX_new()) == NULL) { - ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP,ERR_R_MALLOC_FAILURE); + SM2err(SM2_F_SM2_SIGN_SETUP,ERR_R_MALLOC_FAILURE); return 0; } } @@ -89,17 +88,17 @@ static int sm2_sign_setup(EC_KEY *ec_key, BN_CTX *ctx_in, BIGNUM **kp, BIGNUM ** x = BN_new(); order = BN_new(); if (!k || !x || !order) { - ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_MALLOC_FAILURE); + SM2err(SM2_F_SM2_SIGN_SETUP, ERR_R_MALLOC_FAILURE); goto err; } if (!EC_GROUP_get_order(ec_group, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB); + SM2err(SM2_F_SM2_SIGN_SETUP, ERR_R_EC_LIB); goto err; } if ((point = EC_POINT_new(ec_group)) == NULL) { - ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB); + SM2err(SM2_F_SM2_SIGN_SETUP, ERR_R_EC_LIB); goto err; } @@ -107,8 +106,8 @@ static int sm2_sign_setup(EC_KEY *ec_key, BN_CTX *ctx_in, BIGNUM **kp, BIGNUM ** /* get random k */ do { if (!BN_rand_range(k, order)) { - ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, - ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED); + SM2err(SM2_F_SM2_SIGN_SETUP, + SM2_R_RANDOM_NUMBER_GENERATION_FAILED); goto err; } @@ -116,25 +115,25 @@ static int sm2_sign_setup(EC_KEY *ec_key, BN_CTX *ctx_in, BIGNUM **kp, BIGNUM ** /* compute r the x-coordinate of generator * k */ if (!EC_POINT_mul(ec_group, point, k, NULL, NULL, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB); + SM2err(SM2_F_SM2_SIGN_SETUP, ERR_R_EC_LIB); goto err; } if (EC_METHOD_get_field_type(EC_GROUP_method_of(ec_group)) == NID_X9_62_prime_field) { if (!EC_POINT_get_affine_coordinates_GFp(ec_group, point, x, NULL, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP,ERR_R_EC_LIB); + SM2err(SM2_F_SM2_SIGN_SETUP,ERR_R_EC_LIB); goto err; } } else /* NID_X9_62_characteristic_two_field */ { if (!EC_POINT_get_affine_coordinates_GF2m(ec_group, point, x, NULL, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP,ERR_R_EC_LIB); + SM2err(SM2_F_SM2_SIGN_SETUP,ERR_R_EC_LIB); goto err; } } //FIXME: do we need this? if (!BN_nnmod(x, x, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_SIGN_SETUP, ERR_R_BN_LIB); goto err; } @@ -181,12 +180,12 @@ static ECDSA_SIG *sm2_do_sign(const unsigned char *dgst, int dgst_len, ec_group = EC_KEY_get0_group(ec_key); priv_key = EC_KEY_get0_private_key(ec_key); if (!ec_group || !priv_key) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_PASSED_NULL_PARAMETER); + SM2err(SM2_F_SM2_DO_SIGN, ERR_R_PASSED_NULL_PARAMETER); return NULL; } if (!(ret = ECDSA_SIG_new())) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_MALLOC_FAILURE); + SM2err(SM2_F_SM2_DO_SIGN, ERR_R_MALLOC_FAILURE); return NULL; } @@ -195,11 +194,11 @@ static ECDSA_SIG *sm2_do_sign(const unsigned char *dgst, int dgst_len, e = BN_new(); bn = BN_new(); if (!ctx || !order || !e || !bn) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_MALLOC_FAILURE); + SM2err(SM2_F_SM2_DO_SIGN, ERR_R_MALLOC_FAILURE); goto err; } if (!EC_GROUP_get_order(ec_group, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_EC_LIB); + SM2err(SM2_F_SM2_DO_SIGN, ERR_R_EC_LIB); goto err; } @@ -211,13 +210,13 @@ static ECDSA_SIG *sm2_do_sign(const unsigned char *dgst, int dgst_len, } #endif if (!BN_bin2bn(dgst, dgst_len, e)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_DO_SIGN, ERR_R_BN_LIB); goto err; } #if 0 if ((8 * dgst_len > i) && !BN_rshift(e, e, 8 - (i & 0x7))) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_DO_SIGN, ERR_R_BN_LIB); goto err; } #endif @@ -226,14 +225,14 @@ static ECDSA_SIG *sm2_do_sign(const unsigned char *dgst, int dgst_len, /* use or compute k and (kG).x */ if (!in_k || !in_x) { if (!sm2_sign_setup(ec_key, ctx, &k, &ret->r)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN,ERR_R_ECDSA_LIB); + SM2err(SM2_F_SM2_DO_SIGN,ERR_R_ECDSA_LIB); goto err; } ck = k; } else { ck = in_k; if (!BN_copy(ret->r, in_x)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_MALLOC_FAILURE); + SM2err(SM2_F_SM2_DO_SIGN, ERR_R_MALLOC_FAILURE); goto err; } } @@ -241,20 +240,20 @@ static ECDSA_SIG *sm2_do_sign(const unsigned char *dgst, int dgst_len, /* r = e + x (mod n) */ if (!BN_mod_add(ret->r, ret->r, e, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_DO_SIGN, ERR_R_BN_LIB); goto err; } if (!BN_mod_add(bn, ret->r, ck, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_DO_SIGN, ERR_R_BN_LIB); goto err; } /* check r != 0 && r + k != n */ if (BN_is_zero(ret->r) || BN_is_zero(bn)) { if (in_k && in_x) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ECDSA_R_NEED_NEW_SETUP_VALUES); + SM2err(SM2_F_SM2_DO_SIGN, SM2_R_NEED_NEW_SETUP_VALUES); goto err; } else continue; @@ -262,35 +261,35 @@ static ECDSA_SIG *sm2_do_sign(const unsigned char *dgst, int dgst_len, /* s = ((1 + d)^-1 * (k - rd)) mod n */ if (!BN_one(bn)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_DO_SIGN, ERR_R_BN_LIB); goto err; } if (!BN_mod_add(ret->s, priv_key, bn, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_DO_SIGN, ERR_R_BN_LIB); goto err; } if (!BN_mod_inverse(ret->s, ret->s, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_DO_SIGN, ERR_R_BN_LIB); goto err; } if (!BN_mod_mul(bn, ret->r, priv_key, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_DO_SIGN, ERR_R_BN_LIB); goto err; } if (!BN_mod_sub(bn, ck, bn, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_DO_SIGN, ERR_R_BN_LIB); goto err; } if (!BN_mod_mul(ret->s, ret->s, bn, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_DO_SIGN, ERR_R_BN_LIB); goto err; } /* check s != 0 */ if (BN_is_zero(ret->s)) { if (in_k && in_x) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ECDSA_R_NEED_NEW_SETUP_VALUES); + SM2err(SM2_F_SM2_DO_SIGN, SM2_R_NEED_NEW_SETUP_VALUES); goto err; } } else @@ -331,7 +330,7 @@ int sm2_do_verify(const unsigned char *dgst, int dgstlen, !(ec_group = EC_KEY_get0_group(ec_key)) || !(pub_key = EC_KEY_get0_public_key(ec_key))) { - ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ECDSA_R_MISSING_PARAMETERS); + SM2err(SM2_F_SM2_DO_VERIFY, SM2_R_MISSING_PARAMETERS); return -1; } @@ -341,11 +340,11 @@ int sm2_do_verify(const unsigned char *dgst, int dgstlen, t = BN_new(); if (!ctx || !order || !e || !t) { - ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_MALLOC_FAILURE); + SM2err(SM2_F_SM2_DO_VERIFY, ERR_R_MALLOC_FAILURE); goto err; } if (!EC_GROUP_get_order(ec_group, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_EC_LIB); + SM2err(SM2_F_SM2_DO_VERIFY, ERR_R_EC_LIB); goto err; } @@ -357,14 +356,14 @@ int sm2_do_verify(const unsigned char *dgst, int dgstlen, BN_is_negative(sig->s) || BN_ucmp(sig->s, order) >= 0) { - ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ECDSA_R_BAD_SIGNATURE); + SM2err(SM2_F_SM2_DO_VERIFY, SM2_R_BAD_SIGNATURE); ret = 0; goto err; } /* check t = r + s != 0 */ if (!BN_mod_add(t, sig->r, sig->s, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_DO_VERIFY, ERR_R_BN_LIB); goto err; } if (BN_is_zero(t)) { @@ -380,44 +379,44 @@ int sm2_do_verify(const unsigned char *dgst, int dgstlen, } #endif if (!BN_bin2bn(dgst, dgstlen, e)) { - ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_DO_VERIFY, ERR_R_BN_LIB); goto err; } #if 0 if ((8 * dgstlen > i) && !BN_rshift(e, e, 8 - (i & 0x7))) { - ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_DO_VERIFY, ERR_R_BN_LIB); goto err; } #endif /* compute (x, y) = sG + tP, P is pub_key */ if (!(point = EC_POINT_new(ec_group))) { - ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_MALLOC_FAILURE); + SM2err(SM2_F_SM2_DO_VERIFY, ERR_R_MALLOC_FAILURE); goto err; } if (!EC_POINT_mul(ec_group, point, sig->s, pub_key, t, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_EC_LIB); + SM2err(SM2_F_SM2_DO_VERIFY, ERR_R_EC_LIB); goto err; } if (EC_METHOD_get_field_type(EC_GROUP_method_of(ec_group)) == NID_X9_62_prime_field) { if (!EC_POINT_get_affine_coordinates_GFp(ec_group, point, t, NULL, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_EC_LIB); + SM2err(SM2_F_SM2_DO_VERIFY, ERR_R_EC_LIB); goto err; } } else /* NID_X9_62_characteristic_two_field */ { if (!EC_POINT_get_affine_coordinates_GF2m(ec_group, point, t, NULL, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_EC_LIB); + SM2err(SM2_F_SM2_DO_VERIFY, ERR_R_EC_LIB); goto err; } } if (!BN_nnmod(t, t, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_DO_VERIFY, ERR_R_BN_LIB); goto err; } /* check (sG + tP).x + e == sig.r */ if (!BN_mod_add(t, t, e, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB); + SM2err(SM2_F_SM2_DO_VERIFY, ERR_R_BN_LIB); goto err; } if (BN_ucmp(t, sig->r) == 0) { @@ -492,8 +491,6 @@ int SM2_verify(int type, const unsigned char *dgst, int dgstlen, int derlen = -1; int ret = -1; -fprintf(stderr, "%s %d %s() executed\n", __FILE__, __LINE__, __FUNCTION__); - if (!(s = ECDSA_SIG_new())) { return ret; } @@ -516,4 +513,3 @@ err: ECDSA_SIG_free(s); return ret; } - diff --git a/crypto/sm2/sm2test.c b/crypto/sm2/sm2test.c index eda0c3e8..ad0fbe16 100644 --- a/crypto/sm2/sm2test.c +++ b/crypto/sm2/sm2test.c @@ -48,14 +48,14 @@ int change_rand(const char *hex) fake_rand.status = old_rand->status; fake_rand.bytes = fbytes; fake_rand.pseudorand = old_rand->bytes; - + if (!RAND_set_rand_method(&fake_rand)) { return 0; - } + } rnd_number = hex; return 1; -} +} int restore_rand(void) { @@ -83,7 +83,7 @@ int hexequbin(const char *hex, const unsigned char *bin, size_t binlen) sprintf(buf + i*2, "%02X", bin[i]); } buf[buflen - 1] = 0; - + if (memcmp(hex, buf, binlen * 2) == 0) { ret = 1; } @@ -114,7 +114,7 @@ EC_GROUP *new_ec_group(int is_prime_field, goto err; } - if (!BN_hex2bn(&p, p_hex) || + if (!BN_hex2bn(&p, p_hex) || !BN_hex2bn(&a, a_hex) || !BN_hex2bn(&b, b_hex) || !BN_hex2bn(&x, x_hex) || @@ -150,7 +150,7 @@ EC_GROUP *new_ec_group(int is_prime_field, goto err; } - EC_GROUP_set_asn1_flag(group, flag); + EC_GROUP_set_asn1_flag(group, flag); EC_GROUP_set_point_conversion_form(group, form); ok = 1; @@ -217,7 +217,7 @@ EC_KEY *new_ec_key(const EC_GROUP *group, } if (!EC_KEY_set_public_key_affine_coordinates(ec_key, x, y)) { goto end; - } + } ok = 1; end: @@ -229,7 +229,7 @@ end: EC_KEY_free(ec_key); ec_key = NULL; } - return ec_key; + return ec_key; } int test_sm2_sign(const EC_GROUP *group, @@ -293,7 +293,7 @@ int test_sm2_sign(const EC_GROUP *group, fprintf(stderr, "error: %s %d\n", __FUNCTION__, __LINE__); goto err; } - + /* verify */ if (!(pubkey = new_ec_key(group, NULL, xP, yP, id))) { fprintf(stderr, "error: %s %d\n", __FUNCTION__, __LINE__); @@ -337,8 +337,8 @@ int test_sm2_enc(const EC_GROUP *group, } buflen = sizeof(buf); - if (!SM2_encrypt_with_recommended((const unsigned char *)M, strlen(M), - buf, &buflen, ec_key)) { + if (!SM2_encrypt_with_recommended(buf, &buflen, + (const unsigned char *)M, strlen(M), ec_key)) { fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__); goto end; } @@ -350,12 +350,12 @@ int test_sm2_enc(const EC_GROUP *group, goto end; } EC_KEY_free(ec_key); - + if (!(ec_key = new_ec_key(group, d, xP, yP, NULL))) { fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__); goto end; } - if (!SM2_decrypt_with_recommended(buf, buflen, msg, &msglen, ec_key)) { + if (!SM2_decrypt_with_recommended(msg, &msglen, buf, buflen, ec_key)) { fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__); goto end; } @@ -554,7 +554,7 @@ int test_sm2_test_vector() "01686522130D590FB8DE635D8FCA715CC6BF3D05BEF3F75DA5D543454448166612", "ALICE123@YAHOO.COM", "26352AF82EC19F207BBC6F9474E11E90CE0F7DDACE03B27F801817E897A81FD5", - "message digest", + "message digest", "AD673CBDA311417129A9EAA5F9AB1AA1633AD47718A84DFD46C17C6FA0AA3B12", "36CD79FC8E24B7357A8A7B4A46D454C397703D6498158C605399B341ADA186D6", "6D3FBA26EAB2A1054F5D198332E335817C8AC453ED26D3391CD4439D825BF25B", @@ -574,7 +574,7 @@ int test_sm2_test_vector() "4C62EEFD6ECFC2B95B92FD6C3D9575148AFA17425546D49018E5388D49DD7B4F", "04" "245C26FB68B1DDDDB12C4B6BF9F2B6D5FE60A383B0D18D1C4144ABF17F6252E7" - "76CB9264C2A7E88E52B19903FDC47378F605E36811F5C07423A24B84400F01B8" + "76CB9264C2A7E88E52B19903FDC47378F605E36811F5C07423A24B84400F01B8" "650053A89B41C418B0C3AAD00D886C00286467" "9C3D7360C30156FAB7C80A0276712DA9D8094A634B766D3A285E07480653426D")) { printf("sm2 enc p256 failed\n"); @@ -624,7 +624,7 @@ int test_sm2_test_vector() printf("sm2 kap p256 passed\n"); } -#if 1 +#if 0 /* ZA will not pass! */ if (!test_sm2_kap( sm2b257test, @@ -702,7 +702,7 @@ end: EVP_PKEY_CTX_free(pkctx); return ret; } - + int test_evp_pkey_sign(EVP_PKEY *pkey, int do_sm2, int verbose) { int ret = 0; @@ -770,7 +770,7 @@ int test_evp_pkey_sign(EVP_PKEY *pkey, int do_sm2, int verbose) ret = 1; end: EVP_PKEY_CTX_free(pkctx); - return ret; + return ret; } int test_evp_pkey_encrypt(EVP_PKEY *pkey, int do_sm2, int verbose) @@ -791,7 +791,7 @@ int test_evp_pkey_encrypt(EVP_PKEY *pkey, int do_sm2, int verbose) fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__); goto end; } - + /* EVP_PKEY_encrypt() */ if (!EVP_PKEY_encrypt_init(pkctx)) { @@ -802,7 +802,7 @@ int test_evp_pkey_encrypt(EVP_PKEY *pkey, int do_sm2, int verbose) if (!EVP_PKEY_CTX_set_ec_enc_type(pkctx, type)) { fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__); goto end; - } + } cbuflen = sizeof(cbuf); if (!EVP_PKEY_encrypt(pkctx, cbuf, &cbuflen, msg, msglen)) { @@ -827,7 +827,7 @@ int test_evp_pkey_encrypt(EVP_PKEY *pkey, int do_sm2, int verbose) if (!EVP_PKEY_CTX_set_ec_enc_type(pkctx, type)) { fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__); goto end; - } + } bzero(mbuf, sizeof(mbuf)); mbuflen = sizeof(mbuf); @@ -1000,7 +1000,7 @@ int test_evp_digestsign(EVP_PKEY *pkey, int do_sm2, const EVP_MD *md, int verbos goto end; } - pkctx = NULL; + pkctx = NULL; if (!EVP_DigestVerifyInit(mdctx, &pkctx, md, NULL, pkey)) { ERR_print_errors_fp(stderr); fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__); @@ -1063,14 +1063,15 @@ int test_evp_seal(int curve_id, const EVP_CIPHER *cipher, BIO *out, int verbose) } if (NUM_PKEYS != EVP_SealInit(cctx, cipher, ek, ekl, iv, pkey, NUM_PKEYS)) { + ERR_print_errors_fp(stderr); fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__); goto end; } - + if (verbose > 1) { for (i = 0; i < NUM_PKEYS; i++) { int j; - BIO_printf(out, "ek[i] (%d-byte) = ", ekl[i]); + BIO_printf(out, "ek[%d] (%d-byte) = ", i, ekl[i]); for (j = 0; j < ekl[i]; j++) { BIO_printf(out, "%02X", ek[i][j]); } @@ -1110,7 +1111,7 @@ int test_evp_seal(int curve_id, const EVP_CIPHER *cipher, BIO *out, int verbose) BIO_printf(out, "\n"); } - if (!EVP_OpenInit(cctx, cipher, ek[0], ekl[0], iv, pkey[0])) { + if (!EVP_OpenInit(cctx, cipher, ek[1], ekl[1], iv, pkey[1])) { fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__); goto end; } @@ -1205,13 +1206,13 @@ int test_sm2_evp(int verbose) if (!test_evp_sign(pkey, md, verbose)) { fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__); goto end; - } + } /* test seal/open */ if (!test_evp_seal(curve_id, cipher, out, verbose)) { fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__); goto end; - } + } ret = 1; @@ -1224,10 +1225,10 @@ end: } int main(int argc, char **argv) -{ +{ int ret = -1; - BIO *out = NULL; - + BIO *out = NULL; + out = BIO_new_fp(stdout, BIO_NOCLOSE); /* @@ -1238,20 +1239,20 @@ int main(int argc, char **argv) } else { CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0); } - CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); - */ + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); + */ ERR_load_crypto_strings(); RAND_seed(rnd_seed, sizeof(rnd_seed)); - + if (!test_sm2_test_vector()) { goto err; } if (!test_sm2_evp(2)) { goto err; - } + } ret =0; err: @@ -1261,7 +1262,7 @@ err: if (ret) ERR_print_errors(out); - + //CRYPTO_cleanup_all_ex_data(); //ERR_remove_thread_state(NULL); //ERR_free_strings(); diff --git a/crypto/sm3/Makefile b/crypto/sm3/Makefile index 7ae1bfc0..919db984 100644 --- a/crypto/sm3/Makefile +++ b/crypto/sm3/Makefile @@ -79,5 +79,4 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. -sm3.o: sm3.c sm3.h ../byteorder.h -sm3test.o: sm3test.c sm3.h ../byteorder.h +sm3.o: ../byteorder.h sm3.c sm3.h diff --git a/crypto/sm3/hmac_sm3.c b/crypto/sm3/hmac_sm3.c index 370fe84a..a3bfd2d3 100644 --- a/crypto/sm3/hmac_sm3.c +++ b/crypto/sm3/hmac_sm3.c @@ -23,8 +23,6 @@ #define IPAD 0x36 #define OPAD 0x5C - - void hmac_sm3_init(hmac_sm3_ctx_t *ctx, const unsigned char *key, size_t key_len) { int i; diff --git a/crypto/sm3/sm3test.c b/crypto/sm3/sm3test.c index 5e021b44..242f4d41 100644 --- a/crypto/sm3/sm3test.c +++ b/crypto/sm3/sm3test.c @@ -119,4 +119,27 @@ static char *pt(unsigned char *md) sprintf(&(buf[i * 2]), "%02x", md[i]); return (buf); } + + + + +/* + + + + + + + + + + +*/ + + + + + + + #endif diff --git a/crypto/sm9/Makefile b/crypto/sm9/Makefile new file mode 100644 index 00000000..f671cb7c --- /dev/null +++ b/crypto/sm9/Makefile @@ -0,0 +1,90 @@ +# +# OpenSSL/crypto/sm9/Makefile +# + +DIR= sm9 +TOP= ../.. +CC= cc +CPP= $(CC) -E +INCLUDES=-I.. -I$(TOP) -I../../include +CFLAG=-g +MAKEFILE= Makefile +AR= ar r + +SM3_ASM_OBJ= + +CFLAGS= $(INCLUDES) $(CFLAG) +ASFLAGS= $(INCLUDES) $(ASFLAG) +AFLAGS= $(ASFLAGS) + +GENERAL=Makefile +TEST=sm9test.c +APPS= + +LIB=$(TOP)/libcrypto.a +LIBSRC=sm9_lib.c sm9_err.c +LIBOBJ=sm9_lib.o sm9_err.o + +SRC= $(LIBSRC) + +EXHEADER= sm9.h +HEADER= sm9_lcl.h $(EXHEADER) + +ALL= $(GENERAL) $(SRC) $(HEADER) + +top: + (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) + +all: lib + +lib: $(LIBOBJ) + $(AR) $(LIB) $(LIBOBJ) + $(RANLIB) $(LIB) || echo Never mind. + @touch lib + +files: + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO + +links: + @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) + @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) + @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) + +install: + @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... + @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ + do \ + (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ + done; + +tags: + ctags $(SRC) + +tests: + +lint: + lint -DLINT $(INCLUDES) $(SRC)>fluff + +depend: + @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... + $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) + +dclean: + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + mv -f Makefile.new $(MAKEFILE) + +clean: + rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + +# DO NOT DELETE THIS LINE -- make depend depends on it. + +sm9_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +sm9_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +sm9_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h +sm9_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +sm9_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +sm9_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +sm9_err.o: ../../include/openssl/safestack.h ../../include/openssl/sm9.h +sm9_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +sm9_err.o: sm9_err.c diff --git a/crypto/sm9/sm9.h b/crypto/sm9/sm9.h index 91b0d96d..75203553 100644 --- a/crypto/sm9/sm9.h +++ b/crypto/sm9/sm9.h @@ -86,17 +86,31 @@ int SM9_decrypt(SM9_PUBLIC_PARAMS *params, unsigned char *out, size_t *outlen, EVP_PKEY *pkey); -int SM9_sign(SM9_PUBLIC_PARAMS *params, - const unsigned char *dgst, int dgstlen, - unsigned char *sig, unsigned int *siglen, - EVP_PKEY *pkey); -int SM2_verify(SM9_PUBLIC_PARAMS *params, - const unsigned char *dgst, int dgstlen, - const unsigned char *sig, int siglen, - const char *id, size_t idlen); -#ifdef __cplusplus +/* BEGIN ERROR CODES */ +/* + * The following lines are auto generated by the script mkerr.pl. Any changes + * made after this point may be overwritten when the script is next run. + */ +void ERR_load_SM9_strings(void); + +/* Error codes for the SM9 functions. */ + +/* Function codes. */ +# define SM9_F_D2I_SM9_MASTER_SECRET 100 +# define SM9_F_D2I_SM9_PUBLIC_PARAMS 101 +# define SM9_F_I2D_SM9_MASTER_SECRET 102 +# define SM9_F_I2D_SM9_PUBLIC_PARAMS 103 +# define SM9_F_SM9_DECRYPT 104 +# define SM9_F_SM9_ENCRYPT 105 +# define SM9_F_SM9_EXTRACT_PRIVATE_KEY 106 +# define SM9_F_SM9_PUBLIC_PARAMS_FREE 107 +# define SM9_F_SM9_SETUP 108 + +/* Reason codes. */ +# define SM9_R_NOT_IMPLEMENTED 100 + +#ifdef __cplusplus } #endif #endif - diff --git a/crypto/sm9/sm9_err.c b/crypto/sm9/sm9_err.c new file mode 100644 index 00000000..f6bce67c --- /dev/null +++ b/crypto/sm9/sm9_err.c @@ -0,0 +1,101 @@ +/* crypto/sm9/sm9_err.c */ +/* ==================================================================== + * Copyright (c) 1999-2016 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. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * + */ + +/* + * NOTE: this file was auto generated by the mkerr.pl script: any changes + * made to it will be overwritten when the script next updates this file, + * only reason strings will be preserved. + */ + +#include +#include +#include + +/* BEGIN ERROR CODES */ +#ifndef OPENSSL_NO_ERR + +# define ERR_FUNC(func) ERR_PACK(ERR_LIB_SM9,func,0) +# define ERR_REASON(reason) ERR_PACK(ERR_LIB_SM9,0,reason) + +static ERR_STRING_DATA SM9_str_functs[] = { + {ERR_FUNC(SM9_F_D2I_SM9_MASTER_SECRET), "d2i_SM9_MASTER_SECRET"}, + {ERR_FUNC(SM9_F_D2I_SM9_PUBLIC_PARAMS), "d2i_SM9_PUBLIC_PARAMS"}, + {ERR_FUNC(SM9_F_I2D_SM9_MASTER_SECRET), "i2d_SM9_MASTER_SECRET"}, + {ERR_FUNC(SM9_F_I2D_SM9_PUBLIC_PARAMS), "i2d_SM9_PUBLIC_PARAMS"}, + {ERR_FUNC(SM9_F_SM9_DECRYPT), "SM9_decrypt"}, + {ERR_FUNC(SM9_F_SM9_ENCRYPT), "SM9_encrypt"}, + {ERR_FUNC(SM9_F_SM9_EXTRACT_PRIVATE_KEY), "SM9_extract_private_key"}, + {ERR_FUNC(SM9_F_SM9_PUBLIC_PARAMS_FREE), "SM9_PUBLIC_PARAMS_free"}, + {ERR_FUNC(SM9_F_SM9_SETUP), "SM9_setup"}, + {0, NULL} +}; + +static ERR_STRING_DATA SM9_str_reasons[] = { + {ERR_REASON(SM9_R_NOT_IMPLEMENTED), "not implemented"}, + {0, NULL} +}; + +#endif + +void ERR_load_SM9_strings(void) +{ +#ifndef OPENSSL_NO_ERR + + if (ERR_func_error_string(SM9_str_functs[0].error) == NULL) { + ERR_load_strings(0, SM9_str_functs); + ERR_load_strings(0, SM9_str_reasons); + } +#endif +} diff --git a/crypto/sm9/sm9_lcl.h b/crypto/sm9/sm9_lcl.h index f30153a0..85a36f10 100644 --- a/crypto/sm9/sm9_lcl.h +++ b/crypto/sm9/sm9_lcl.h @@ -1,4 +1,4 @@ -/* crypto/sm9/sm9.h */ +/* crypto/sm9/sm9_lcl.h */ /* ==================================================================== * Copyright (c) 2016 The GmSSL Project. All rights reserved. * @@ -49,6 +49,8 @@ * */ +#ifndef HEADER_SM9_LCL_H +#define HEADER_SM9_LCL_H #include "sm9.h" @@ -86,14 +88,6 @@ struct sm9_method_st { const unsigned char *in, size_t inlen, unsigned char *out, size_t *outlen, EVP_PKEY *pkey); - int (*sign)(SM9_PUBLIC_PARAMS *params, - const unsigned char *dgst, int dgstlen, - unsigned char *sig, unsigned int *siglen, - EVP_PKEY *pkey); - int (*verify)(SM9_PUBLIC_PARAMS *params, - const unsigned char *dgst, int dgstlen, - const unsigned char *sig, int siglen, - const char *id, size_t idlen); }; #ifdef __cplusplus diff --git a/crypto/sm9/sm9_lib.c b/crypto/sm9/sm9_lib.c new file mode 100644 index 00000000..affe8502 --- /dev/null +++ b/crypto/sm9/sm9_lib.c @@ -0,0 +1,118 @@ +/* crypto/sm9/sm9_lib.c */ +/* ==================================================================== + * Copyright (c) 2016 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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 +#include "sm9_lcl.h" + +int SM9_setup(SM9_PUBLIC_PARAMS **params, SM9_MASTER_SECRET **master) +{ + SM9err(SM9_F_SM9_SETUP, SM9_R_NOT_IMPLEMENTED); + return 0; +} + +void SM9_PUBLIC_PARAMS_free(SM9_PUBLIC_PARAMS *a) +{ + SM9err(SM9_F_SM9_PUBLIC_PARAMS_FREE, SM9_R_NOT_IMPLEMENTED); +} + +void SM9_MASTER_SECRET_free(SM9_MASTER_SECRET *a) +{ +} + +int i2d_SM9_PUBLIC_PARAMS(SM9_PUBLIC_PARAMS *a, unsigned char *out) +{ + SM9err(SM9_F_I2D_SM9_PUBLIC_PARAMS, SM9_R_NOT_IMPLEMENTED); + return 0; +} + +int i2d_SM9_MASTER_SECRET(SM9_MASTER_SECRET *a, unsigned char *out) +{ + SM9err(SM9_F_I2D_SM9_MASTER_SECRET, SM9_R_NOT_IMPLEMENTED); + return 0; +} + +SM9_PUBLIC_PARAMS *d2i_SM9_PUBLIC_PARAMS(SM9_PUBLIC_PARAMS **a, const unsigned char **in, long len) +{ + SM9err(SM9_F_D2I_SM9_PUBLIC_PARAMS, SM9_R_NOT_IMPLEMENTED); + return NULL; +} + +SM9_MASTER_SECRET *d2i_SM9_MASTER_SECRET(SM9_MASTER_SECRET **a, const unsigned char **in, long len) +{ + SM9err(SM9_F_D2I_SM9_MASTER_SECRET, SM9_R_NOT_IMPLEMENTED); + return NULL; +} + +EVP_PKEY *SM9_extract_private_key(SM9_MASTER_SECRET *master, + const char *id, size_t idlen, EVP_PKEY **pkey) +{ + SM9err(SM9_F_SM9_EXTRACT_PRIVATE_KEY, SM9_R_NOT_IMPLEMENTED); + return NULL; +} + +int SM9_encrypt(SM9_PUBLIC_PARAMS *params, + const unsigned char *in, size_t inlen, + unsigned char *out, size_t *outlen, + const char *id, size_t idlen) +{ + SM9err(SM9_F_SM9_ENCRYPT, SM9_R_NOT_IMPLEMENTED); + return NULL; +} + +int SM9_decrypt(SM9_PUBLIC_PARAMS *params, + const unsigned char *in, size_t inlen, + unsigned char *out, size_t *outlen, + EVP_PKEY *pkey) +{ + SM9err(SM9_F_SM9_DECRYPT, SM9_R_NOT_IMPLEMENTED); + return 0; +} + diff --git a/crypto/sm9/sm9test.c b/crypto/sm9/sm9test.c new file mode 100644 index 00000000..86bb5c52 --- /dev/null +++ b/crypto/sm9/sm9test.c @@ -0,0 +1,57 @@ +/* crypto/sm9/sm9test.c */ +/* ==================================================================== + * Copyright (c) 2016 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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 + +int main(int argc, char **argv) +{ + return -1; +} diff --git a/crypto/sms4/Makefile b/crypto/sms4/Makefile index eb89cd32..ea9209b6 100644 --- a/crypto/sms4/Makefile +++ b/crypto/sms4/Makefile @@ -74,8 +74,25 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. -sms4_cbc.o: sms4_cbc.c ../../include/openssl/modes.h sms4.h -sms4_cfb.o: sms4_cfb.c ../../include/openssl/modes.h sms4.h -sms4_ecb.o: sms4_ecb.c ../../include/openssl/modes.h sms4.h -sms4_ofb.o: sms4_ofb.c ../../include/openssl/modes.h sms4.h -sms4.o: sms4.c ../../include/openssl/modes.h +sms4_cbc.o: ../../include/openssl/modes.h ../../include/openssl/sms4.h +sms4_cbc.o: sms4_cbc.c +sms4_cfb.o: ../../include/openssl/modes.h ../../include/openssl/sms4.h +sms4_cfb.o: sms4_cfb.c +sms4_common.o: sms4_common.c sms4_lcl.h +sms4_ctr.o: ../../include/openssl/modes.h ../../include/openssl/sms4.h +sms4_ctr.o: sms4_ctr.c +sms4_ecb.o: ../../include/openssl/modes.h ../../include/openssl/sms4.h +sms4_ecb.o: sms4_ecb.c +sms4_enc.o: sms4.h sms4_enc.c sms4_lcl.h +sms4_ofb.o: ../../include/openssl/modes.h ../../include/openssl/sms4.h +sms4_ofb.o: sms4_ofb.c +sms4_setkey.o: sms4.h sms4_lcl.h sms4_setkey.c +sms4_wrap.o: ../../e_os.h ../../include/openssl/bio.h +sms4_wrap.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h +sms4_wrap.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +sms4_wrap.o: ../../include/openssl/lhash.h ../../include/openssl/modes.h +sms4_wrap.o: ../../include/openssl/opensslconf.h +sms4_wrap.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +sms4_wrap.o: ../../include/openssl/safestack.h ../../include/openssl/sms4.h +sms4_wrap.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +sms4_wrap.o: ../cryptlib.h sms4_wrap.c diff --git a/crypto/sms4/sms4.h b/crypto/sms4/sms4.h index 0ee691a7..cc37dd11 100644 --- a/crypto/sms4/sms4.h +++ b/crypto/sms4/sms4.h @@ -54,6 +54,7 @@ #define SMS4_KEY_LENGTH 16 #define SMS4_BLOCK_SIZE 16 +#define SMS4_IV_LENGTH (SMS4_BLOCK_SIZE) #define SMS4_NUM_ROUNDS 32 #include diff --git a/crypto/ssf33/Makefile b/crypto/ssf33/Makefile new file mode 100644 index 00000000..56711a58 --- /dev/null +++ b/crypto/ssf33/Makefile @@ -0,0 +1,81 @@ +# +# OpenSSL/crypto/ssf33/Makefile +# + +DIR= ssf33 +TOP= ../.. +CC= cc +CPP= $(CC) -E +INCLUDES=-I.. -I$(TOP) -I../../include +CFLAG=-g +MAKEFILE= Makefile +AR= ar r + +SM3_ASM_OBJ= + +CFLAGS= $(INCLUDES) $(CFLAG) +ASFLAGS= $(INCLUDES) $(ASFLAG) +AFLAGS= $(ASFLAGS) + +GENERAL=Makefile +TEST= +APPS= + +LIB=$(TOP)/libcrypto.a +LIBSRC= +LIBOBJ= + +SRC= $(LIBSRC) + +EXHEADER= ssf33.h +HEADER= $(EXHEADER) + +ALL= $(GENERAL) $(SRC) $(HEADER) + +top: + (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) + +all: lib + +lib: $(LIBOBJ) + $(AR) $(LIB) $(LIBOBJ) + $(RANLIB) $(LIB) || echo Never mind. + @touch lib + +files: + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO + +links: + @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) + @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) + @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) + +install: + @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... + @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ + do \ + (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ + done; + +tags: + ctags $(SRC) + +tests: + +lint: + lint -DLINT $(INCLUDES) $(SRC)>fluff + +depend: + @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... + $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) + +dclean: + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + mv -f Makefile.new $(MAKEFILE) + +clean: + rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + +# DO NOT DELETE THIS LINE -- make depend depends on it. + diff --git a/crypto/ssf33/ssf33.h b/crypto/ssf33/ssf33.h index 3d00588d..0f6c3e73 100644 --- a/crypto/ssf33/ssf33.h +++ b/crypto/ssf33/ssf33.h @@ -54,6 +54,7 @@ #define SSF33_KEY_LENGTH 16 #define SSF33_BLOCK_SIZE 16 +#define SSF33_IV_LENGTH (SSF33_BLOCK_SIZE) #ifdef __cplusplus extern "C" { diff --git a/crypto/ts/Makefile b/crypto/ts/Makefile index cf991efe..ff4da144 100644 --- a/crypto/ts/Makefile +++ b/crypto/ts/Makefile @@ -94,15 +94,16 @@ ts_asn1.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h ts_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ts_asn1.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h ts_asn1.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ts_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ts_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -ts_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ts_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -ts_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -ts_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ts_asn1.o: ../../include/openssl/ts.h ../../include/openssl/x509.h -ts_asn1.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -ts_asn1.o: ts_asn1.c +ts_asn1.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +ts_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +ts_asn1.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +ts_asn1.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +ts_asn1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h +ts_asn1.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ts_asn1.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +ts_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h +ts_asn1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +ts_asn1.o: ../../include/openssl/x509v3.h ts_asn1.c ts_conf.o: ../../e_os.h ../../include/openssl/asn1.h ts_conf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h ts_conf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h @@ -110,31 +111,35 @@ ts_conf.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h ts_conf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ts_conf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h ts_conf.o: ../../include/openssl/engine.h ../../include/openssl/err.h -ts_conf.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ts_conf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ts_conf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -ts_conf.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -ts_conf.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -ts_conf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_conf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ts_conf.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h -ts_conf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ts_conf.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_conf.c +ts_conf.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +ts_conf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ts_conf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +ts_conf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +ts_conf.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h +ts_conf.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h +ts_conf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +ts_conf.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +ts_conf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +ts_conf.o: ../../include/openssl/ts.h ../../include/openssl/x509.h +ts_conf.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +ts_conf.o: ../cryptlib.h ts_conf.c ts_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h ts_err.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h ts_err.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h ts_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h ts_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h ts_err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ts_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ts_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ts_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -ts_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -ts_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ts_err.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h -ts_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ts_err.o: ../../include/openssl/x509v3.h ts_err.c +ts_err.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +ts_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ts_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +ts_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +ts_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h +ts_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +ts_err.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +ts_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +ts_err.o: ../../include/openssl/ts.h ../../include/openssl/x509.h +ts_err.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +ts_err.o: ts_err.c ts_lib.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h ts_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h ts_lib.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h @@ -142,14 +147,16 @@ ts_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h ts_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ts_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h ts_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ts_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ts_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -ts_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ts_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -ts_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -ts_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ts_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ts_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ts.h ts_lib.c +ts_lib.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +ts_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +ts_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +ts_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +ts_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h +ts_lib.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ts_lib.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +ts_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +ts_lib.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +ts_lib.o: ../cryptlib.h ts.h ts_lib.c ts_req_print.o: ../../e_os.h ../../include/openssl/asn1.h ts_req_print.o: ../../include/openssl/bio.h ../../include/openssl/bn.h ts_req_print.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h @@ -157,13 +164,15 @@ ts_req_print.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h ts_req_print.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h ts_req_print.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h ts_req_print.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ts_req_print.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ts_req_print.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +ts_req_print.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +ts_req_print.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ts_req_print.o: ../../include/openssl/objects.h ts_req_print.o: ../../include/openssl/opensslconf.h ts_req_print.o: ../../include/openssl/opensslv.h ts_req_print.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h ts_req_print.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_req_print.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +ts_req_print.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ts_req_print.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h ts_req_print.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h ts_req_print.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h ts_req_print.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_req_print.c @@ -174,13 +183,14 @@ ts_req_utils.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h ts_req_utils.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ts_req_utils.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h ts_req_utils.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ts_req_utils.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ts_req_utils.o: ../../include/openssl/objects.h +ts_req_utils.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +ts_req_utils.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h ts_req_utils.o: ../../include/openssl/opensslconf.h ts_req_utils.o: ../../include/openssl/opensslv.h ts_req_utils.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h ts_req_utils.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_req_utils.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +ts_req_utils.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ts_req_utils.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h ts_req_utils.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h ts_req_utils.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h ts_req_utils.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_req_utils.c @@ -191,13 +201,15 @@ ts_rsp_print.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h ts_rsp_print.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h ts_rsp_print.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h ts_rsp_print.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ts_rsp_print.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ts_rsp_print.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +ts_rsp_print.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +ts_rsp_print.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ts_rsp_print.o: ../../include/openssl/objects.h ts_rsp_print.o: ../../include/openssl/opensslconf.h ts_rsp_print.o: ../../include/openssl/opensslv.h ts_rsp_print.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h ts_rsp_print.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_rsp_print.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +ts_rsp_print.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ts_rsp_print.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h ts_rsp_print.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h ts_rsp_print.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h ts_rsp_print.o: ../cryptlib.h ts.h ts_rsp_print.c @@ -208,13 +220,14 @@ ts_rsp_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h ts_rsp_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ts_rsp_sign.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h ts_rsp_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ts_rsp_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ts_rsp_sign.o: ../../include/openssl/objects.h +ts_rsp_sign.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +ts_rsp_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h ts_rsp_sign.o: ../../include/openssl/opensslconf.h ts_rsp_sign.o: ../../include/openssl/opensslv.h ts_rsp_sign.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h ts_rsp_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_rsp_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +ts_rsp_sign.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ts_rsp_sign.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h ts_rsp_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h ts_rsp_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h ts_rsp_sign.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_rsp_sign.c @@ -225,13 +238,14 @@ ts_rsp_utils.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h ts_rsp_utils.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ts_rsp_utils.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h ts_rsp_utils.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ts_rsp_utils.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ts_rsp_utils.o: ../../include/openssl/objects.h +ts_rsp_utils.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +ts_rsp_utils.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h ts_rsp_utils.o: ../../include/openssl/opensslconf.h ts_rsp_utils.o: ../../include/openssl/opensslv.h ts_rsp_utils.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h ts_rsp_utils.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_rsp_utils.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +ts_rsp_utils.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ts_rsp_utils.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h ts_rsp_utils.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h ts_rsp_utils.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h ts_rsp_utils.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_rsp_utils.c @@ -242,13 +256,15 @@ ts_rsp_verify.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h ts_rsp_verify.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ts_rsp_verify.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h ts_rsp_verify.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ts_rsp_verify.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ts_rsp_verify.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +ts_rsp_verify.o: ../../include/openssl/obj_mac.h ts_rsp_verify.o: ../../include/openssl/objects.h ts_rsp_verify.o: ../../include/openssl/opensslconf.h ts_rsp_verify.o: ../../include/openssl/opensslv.h ts_rsp_verify.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h ts_rsp_verify.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_rsp_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +ts_rsp_verify.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ts_rsp_verify.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h ts_rsp_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h ts_rsp_verify.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h ts_rsp_verify.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_rsp_verify.c @@ -259,13 +275,15 @@ ts_verify_ctx.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h ts_verify_ctx.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h ts_verify_ctx.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h ts_verify_ctx.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ts_verify_ctx.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ts_verify_ctx.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +ts_verify_ctx.o: ../../include/openssl/obj_mac.h ts_verify_ctx.o: ../../include/openssl/objects.h ts_verify_ctx.o: ../../include/openssl/opensslconf.h ts_verify_ctx.o: ../../include/openssl/opensslv.h ts_verify_ctx.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h ts_verify_ctx.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_verify_ctx.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +ts_verify_ctx.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +ts_verify_ctx.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h ts_verify_ctx.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h ts_verify_ctx.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h ts_verify_ctx.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_verify_ctx.c diff --git a/crypto/x509/Makefile b/crypto/x509/Makefile index bf197a1d..0ae99c27 100644 --- a/crypto/x509/Makefile +++ b/crypto/x509/Makefile @@ -91,38 +91,43 @@ by_dir.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h by_dir.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h by_dir.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h by_dir.o: ../../include/openssl/err.h ../../include/openssl/evp.h -by_dir.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -by_dir.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -by_dir.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -by_dir.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -by_dir.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -by_dir.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -by_dir.o: ../../include/openssl/x509_vfy.h ../cryptlib.h by_dir.c +by_dir.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +by_dir.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +by_dir.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +by_dir.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +by_dir.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +by_dir.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +by_dir.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +by_dir.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +by_dir.o: ../cryptlib.h by_dir.c by_file.o: ../../e_os.h ../../include/openssl/asn1.h by_file.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h by_file.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h by_file.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h by_file.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -by_file.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -by_file.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -by_file.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -by_file.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -by_file.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -by_file.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -by_file.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -by_file.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -by_file.o: ../cryptlib.h by_file.c +by_file.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +by_file.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +by_file.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +by_file.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +by_file.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h +by_file.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +by_file.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +by_file.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +by_file.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +by_file.o: ../../include/openssl/x509_vfy.h ../cryptlib.h by_file.c x509_att.o: ../../e_os.h ../../include/openssl/asn1.h x509_att.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x509_att.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h x509_att.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x509_att.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x509_att.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_att.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_att.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +x509_att.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x509_att.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x509_att.o: ../../include/openssl/opensslconf.h x509_att.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509_att.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_att.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509_att.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509_att.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509_att.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_att.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h x509_att.o: ../cryptlib.h x509_att.c @@ -132,11 +137,13 @@ x509_cmp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h x509_cmp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x509_cmp.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x509_cmp.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_cmp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_cmp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +x509_cmp.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x509_cmp.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x509_cmp.o: ../../include/openssl/opensslconf.h x509_cmp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509_cmp.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_cmp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509_cmp.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509_cmp.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509_cmp.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_cmp.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h x509_cmp.o: ../cryptlib.h x509_cmp.c @@ -145,25 +152,27 @@ x509_d2.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x509_d2.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x509_d2.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h x509_d2.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509_d2.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509_d2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509_d2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -x509_d2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -x509_d2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -x509_d2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -x509_d2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -x509_d2.o: ../cryptlib.h x509_d2.c +x509_d2.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +x509_d2.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +x509_d2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +x509_d2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +x509_d2.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +x509_d2.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509_d2.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +x509_d2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +x509_d2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_d2.c x509_def.o: ../../e_os.h ../../include/openssl/asn1.h x509_def.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x509_def.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x509_def.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h x509_def.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509_def.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509_def.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509_def.o: ../../include/openssl/opensslconf.h +x509_def.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +x509_def.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +x509_def.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h x509_def.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509_def.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_def.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509_def.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509_def.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509_def.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_def.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_def.c x509_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h @@ -171,11 +180,13 @@ x509_err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h x509_err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x509_err.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x509_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +x509_err.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x509_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x509_err.o: ../../include/openssl/opensslconf.h x509_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509_err.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509_err.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_err.o: ../../include/openssl/x509_vfy.h x509_err.c x509_ext.o: ../../e_os.h ../../include/openssl/asn1.h @@ -184,11 +195,13 @@ x509_ext.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h x509_ext.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x509_ext.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x509_ext.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_ext.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_ext.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +x509_ext.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x509_ext.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x509_ext.o: ../../include/openssl/opensslconf.h x509_ext.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509_ext.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_ext.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509_ext.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509_ext.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509_ext.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_ext.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h x509_ext.o: ../cryptlib.h x509_ext.c @@ -198,25 +211,27 @@ x509_lu.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h x509_lu.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x509_lu.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x509_lu.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_lu.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_lu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x509_lu.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_lu.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_lu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_lu.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_lu.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -x509_lu.o: ../cryptlib.h x509_lu.c +x509_lu.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x509_lu.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x509_lu.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +x509_lu.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +x509_lu.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +x509_lu.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +x509_lu.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +x509_lu.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +x509_lu.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_lu.c x509_obj.o: ../../e_os.h ../../include/openssl/asn1.h x509_obj.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x509_obj.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x509_obj.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h x509_obj.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509_obj.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509_obj.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509_obj.o: ../../include/openssl/opensslconf.h +x509_obj.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +x509_obj.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +x509_obj.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h x509_obj.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509_obj.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_obj.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509_obj.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509_obj.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509_obj.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_obj.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_obj.c x509_r2x.o: ../../e_os.h ../../include/openssl/asn1.h @@ -225,11 +240,13 @@ x509_r2x.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h x509_r2x.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x509_r2x.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x509_r2x.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_r2x.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_r2x.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +x509_r2x.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x509_r2x.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x509_r2x.o: ../../include/openssl/opensslconf.h x509_r2x.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509_r2x.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_r2x.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509_r2x.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509_r2x.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509_r2x.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_r2x.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_r2x.c x509_req.o: ../../e_os.h ../../include/openssl/asn1.h @@ -238,13 +255,14 @@ x509_req.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h x509_req.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x509_req.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h x509_req.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509_req.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509_req.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509_req.o: ../../include/openssl/opensslconf.h +x509_req.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +x509_req.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +x509_req.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h x509_req.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509_req.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h x509_req.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509_req.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509_req.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509_req.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_req.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_req.c x509_set.o: ../../e_os.h ../../include/openssl/asn1.h @@ -252,12 +270,13 @@ x509_set.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x509_set.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x509_set.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h x509_set.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509_set.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509_set.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509_set.o: ../../include/openssl/opensslconf.h +x509_set.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +x509_set.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +x509_set.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h x509_set.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509_set.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_set.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509_set.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509_set.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509_set.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_set.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_set.c x509_trs.o: ../../e_os.h ../../include/openssl/asn1.h @@ -266,11 +285,13 @@ x509_trs.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h x509_trs.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x509_trs.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x509_trs.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_trs.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_trs.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +x509_trs.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x509_trs.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x509_trs.o: ../../include/openssl/opensslconf.h x509_trs.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509_trs.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_trs.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509_trs.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509_trs.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509_trs.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_trs.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h x509_trs.o: ../cryptlib.h x509_trs.c @@ -279,12 +300,13 @@ x509_txt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x509_txt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x509_txt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h x509_txt.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509_txt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509_txt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509_txt.o: ../../include/openssl/opensslconf.h +x509_txt.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +x509_txt.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +x509_txt.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h x509_txt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509_txt.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_txt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509_txt.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509_txt.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509_txt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_txt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_txt.c x509_v3.o: ../../e_os.h ../../include/openssl/asn1.h @@ -293,25 +315,28 @@ x509_v3.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h x509_v3.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x509_v3.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x509_v3.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_v3.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_v3.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x509_v3.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_v3.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_v3.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_v3.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_v3.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -x509_v3.o: ../cryptlib.h x509_v3.c +x509_v3.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x509_v3.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x509_v3.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +x509_v3.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +x509_v3.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +x509_v3.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +x509_v3.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +x509_v3.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +x509_v3.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_v3.c x509_vfy.o: ../../e_os.h ../../include/openssl/asn1.h x509_vfy.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x509_vfy.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h x509_vfy.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x509_vfy.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x509_vfy.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_vfy.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_vfy.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +x509_vfy.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x509_vfy.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x509_vfy.o: ../../include/openssl/opensslconf.h x509_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509_vfy.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_vfy.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509_vfy.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509_vfy.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509_vfy.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_vfy.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h x509_vfy.o: ../cryptlib.h vpm_int.h x509_vfy.c @@ -321,11 +346,13 @@ x509_vpm.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h x509_vpm.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x509_vpm.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x509_vpm.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_vpm.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_vpm.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +x509_vpm.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x509_vpm.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x509_vpm.o: ../../include/openssl/opensslconf.h x509_vpm.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509_vpm.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_vpm.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509_vpm.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509_vpm.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509_vpm.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_vpm.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h x509_vpm.o: ../cryptlib.h vpm_int.h x509_vpm.c @@ -334,12 +361,13 @@ x509cset.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x509cset.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x509cset.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h x509cset.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509cset.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509cset.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509cset.o: ../../include/openssl/opensslconf.h +x509cset.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +x509cset.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +x509cset.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h x509cset.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509cset.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509cset.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509cset.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509cset.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509cset.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509cset.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509cset.c x509name.o: ../../e_os.h ../../include/openssl/asn1.h @@ -347,12 +375,13 @@ x509name.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x509name.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x509name.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h x509name.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509name.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509name.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509name.o: ../../include/openssl/opensslconf.h +x509name.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +x509name.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +x509name.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h x509name.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509name.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509name.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509name.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509name.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509name.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509name.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509name.c x509rset.o: ../../e_os.h ../../include/openssl/asn1.h @@ -360,12 +389,13 @@ x509rset.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x509rset.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x509rset.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h x509rset.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509rset.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509rset.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509rset.o: ../../include/openssl/opensslconf.h +x509rset.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +x509rset.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +x509rset.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h x509rset.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509rset.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509rset.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509rset.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509rset.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509rset.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509rset.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509rset.c x509spki.o: ../../e_os.h ../../include/openssl/asn1.h @@ -373,12 +403,13 @@ x509spki.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x509spki.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x509spki.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h x509spki.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509spki.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509spki.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509spki.o: ../../include/openssl/opensslconf.h +x509spki.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +x509spki.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +x509spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h x509spki.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509spki.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509spki.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509spki.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509spki.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509spki.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509spki.c x509type.o: ../../e_os.h ../../include/openssl/asn1.h @@ -386,12 +417,13 @@ x509type.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x509type.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h x509type.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h x509type.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509type.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509type.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509type.o: ../../include/openssl/opensslconf.h +x509type.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +x509type.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +x509type.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h x509type.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x509type.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509type.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509type.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +x509type.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h x509type.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509type.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509type.c x_all.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h @@ -400,12 +432,13 @@ x_all.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h x_all.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h x_all.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h x_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_all.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h -x_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -x_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -x_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -x_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -x_all.o: ../cryptlib.h x_all.c +x_all.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +x_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +x_all.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h +x_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +x_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h +x_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +x_all.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +x_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +x_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +x_all.o: ../../include/openssl/x509v3.h ../cryptlib.h x_all.c diff --git a/crypto/x509v3/Makefile b/crypto/x509v3/Makefile index 9791b77a..b231387e 100644 --- a/crypto/x509v3/Makefile +++ b/crypto/x509v3/Makefile @@ -92,12 +92,13 @@ pcy_cache.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h pcy_cache.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h pcy_cache.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h pcy_cache.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pcy_cache.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pcy_cache.o: ../../include/openssl/objects.h +pcy_cache.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +pcy_cache.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h pcy_cache.o: ../../include/openssl/opensslconf.h pcy_cache.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pcy_cache.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pcy_cache.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +pcy_cache.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +pcy_cache.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h pcy_cache.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h pcy_cache.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h pcy_cache.o: ../cryptlib.h pcy_cache.c pcy_int.h @@ -107,11 +108,13 @@ pcy_data.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h pcy_data.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h pcy_data.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h pcy_data.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pcy_data.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pcy_data.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +pcy_data.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +pcy_data.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +pcy_data.o: ../../include/openssl/opensslconf.h pcy_data.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pcy_data.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pcy_data.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +pcy_data.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +pcy_data.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h pcy_data.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h pcy_data.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h pcy_data.o: ../cryptlib.h pcy_data.c pcy_int.h @@ -121,38 +124,42 @@ pcy_lib.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h pcy_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h pcy_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h pcy_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pcy_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pcy_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pcy_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pcy_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pcy_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pcy_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pcy_lib.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -pcy_lib.o: ../cryptlib.h pcy_int.h pcy_lib.c +pcy_lib.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +pcy_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +pcy_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +pcy_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +pcy_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +pcy_lib.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +pcy_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +pcy_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +pcy_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h pcy_int.h pcy_lib.c pcy_map.o: ../../e_os.h ../../include/openssl/asn1.h pcy_map.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h pcy_map.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h pcy_map.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h pcy_map.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h pcy_map.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pcy_map.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pcy_map.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pcy_map.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pcy_map.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pcy_map.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pcy_map.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pcy_map.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -pcy_map.o: ../cryptlib.h pcy_int.h pcy_map.c +pcy_map.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +pcy_map.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +pcy_map.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +pcy_map.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +pcy_map.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +pcy_map.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +pcy_map.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +pcy_map.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +pcy_map.o: ../../include/openssl/x509v3.h ../cryptlib.h pcy_int.h pcy_map.c pcy_node.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h pcy_node.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h pcy_node.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h pcy_node.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -pcy_node.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h +pcy_node.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h +pcy_node.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h pcy_node.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h pcy_node.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h pcy_node.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pcy_node.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pcy_node.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +pcy_node.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +pcy_node.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h pcy_node.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h pcy_node.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h pcy_node.o: pcy_int.h pcy_node.c @@ -162,11 +169,13 @@ pcy_tree.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h pcy_tree.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h pcy_tree.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h pcy_tree.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pcy_tree.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pcy_tree.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +pcy_tree.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +pcy_tree.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +pcy_tree.o: ../../include/openssl/opensslconf.h pcy_tree.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pcy_tree.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pcy_tree.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +pcy_tree.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +pcy_tree.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h pcy_tree.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h pcy_tree.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h pcy_tree.o: ../cryptlib.h pcy_int.h pcy_tree.c @@ -176,40 +185,45 @@ v3_addr.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_addr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_addr.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_addr.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_addr.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_addr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_addr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_addr.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_addr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_addr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_addr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_addr.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_addr.c +v3_addr.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_addr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_addr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +v3_addr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +v3_addr.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +v3_addr.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_addr.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +v3_addr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +v3_addr.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +v3_addr.o: ../cryptlib.h v3_addr.c v3_akey.o: ../../e_os.h ../../include/openssl/asn1.h v3_akey.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h v3_akey.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_akey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_akey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_akey.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_akey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_akey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_akey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_akey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_akey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_akey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_akey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_akey.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_akey.c +v3_akey.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_akey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_akey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +v3_akey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +v3_akey.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +v3_akey.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_akey.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +v3_akey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +v3_akey.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +v3_akey.o: ../cryptlib.h v3_akey.c v3_akeya.o: ../../e_os.h ../../include/openssl/asn1.h v3_akeya.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h v3_akeya.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_akeya.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_akeya.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_akeya.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_akeya.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_akeya.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_akeya.o: ../../include/openssl/opensslconf.h +v3_akeya.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_akeya.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_akeya.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h v3_akeya.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h v3_akeya.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_akeya.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +v3_akeya.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_akeya.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h v3_akeya.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h v3_akeya.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h v3_akeya.o: ../cryptlib.h v3_akeya.c @@ -218,14 +232,16 @@ v3_alt.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_alt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_alt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_alt.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_alt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_alt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_alt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_alt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_alt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_alt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_alt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_alt.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_alt.c +v3_alt.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_alt.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_alt.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +v3_alt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +v3_alt.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +v3_alt.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_alt.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +v3_alt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +v3_alt.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +v3_alt.o: ../cryptlib.h v3_alt.c v3_asid.o: ../../e_os.h ../../include/openssl/asn1.h v3_asid.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h v3_asid.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h @@ -233,26 +249,28 @@ v3_asid.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h v3_asid.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h v3_asid.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h v3_asid.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_asid.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_asid.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -v3_asid.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_asid.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_asid.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_asid.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_asid.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_asid.o: ../cryptlib.h v3_asid.c +v3_asid.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +v3_asid.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +v3_asid.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +v3_asid.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +v3_asid.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +v3_asid.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +v3_asid.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +v3_asid.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +v3_asid.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_asid.c v3_bcons.o: ../../e_os.h ../../include/openssl/asn1.h v3_bcons.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h v3_bcons.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_bcons.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_bcons.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_bcons.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_bcons.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_bcons.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_bcons.o: ../../include/openssl/opensslconf.h +v3_bcons.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_bcons.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_bcons.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h v3_bcons.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h v3_bcons.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_bcons.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +v3_bcons.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_bcons.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h v3_bcons.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h v3_bcons.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h v3_bcons.o: ../cryptlib.h v3_bcons.c @@ -262,11 +280,13 @@ v3_bitst.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h v3_bitst.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h v3_bitst.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h v3_bitst.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_bitst.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_bitst.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +v3_bitst.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +v3_bitst.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +v3_bitst.o: ../../include/openssl/opensslconf.h v3_bitst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h v3_bitst.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_bitst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +v3_bitst.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_bitst.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h v3_bitst.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h v3_bitst.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h v3_bitst.o: ../cryptlib.h v3_bitst.c @@ -276,26 +296,28 @@ v3_conf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h v3_conf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h v3_conf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h v3_conf.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_conf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_conf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -v3_conf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_conf.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_conf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_conf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_conf.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_conf.o: ../cryptlib.h v3_conf.c +v3_conf.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +v3_conf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +v3_conf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +v3_conf.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +v3_conf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +v3_conf.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +v3_conf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +v3_conf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +v3_conf.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_conf.c v3_cpols.o: ../../e_os.h ../../include/openssl/asn1.h v3_cpols.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h v3_cpols.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_cpols.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_cpols.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_cpols.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_cpols.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_cpols.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_cpols.o: ../../include/openssl/opensslconf.h +v3_cpols.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_cpols.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_cpols.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h v3_cpols.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h v3_cpols.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_cpols.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +v3_cpols.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_cpols.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h v3_cpols.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h v3_cpols.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h v3_cpols.o: ../cryptlib.h pcy_int.h v3_cpols.c @@ -305,40 +327,44 @@ v3_crld.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_crld.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_crld.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_crld.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_crld.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_crld.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_crld.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_crld.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_crld.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_crld.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_crld.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_crld.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_crld.c +v3_crld.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_crld.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_crld.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +v3_crld.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +v3_crld.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +v3_crld.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_crld.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +v3_crld.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +v3_crld.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +v3_crld.o: ../cryptlib.h v3_crld.c v3_enum.o: ../../e_os.h ../../include/openssl/asn1.h v3_enum.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h v3_enum.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h v3_enum.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h v3_enum.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h v3_enum.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_enum.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_enum.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -v3_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_enum.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_enum.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_enum.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_enum.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_enum.o: ../cryptlib.h v3_enum.c +v3_enum.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +v3_enum.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +v3_enum.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +v3_enum.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +v3_enum.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +v3_enum.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +v3_enum.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +v3_enum.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +v3_enum.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_enum.c v3_extku.o: ../../e_os.h ../../include/openssl/asn1.h v3_extku.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h v3_extku.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_extku.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_extku.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_extku.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_extku.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_extku.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_extku.o: ../../include/openssl/opensslconf.h +v3_extku.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_extku.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_extku.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h v3_extku.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h v3_extku.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_extku.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +v3_extku.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_extku.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h v3_extku.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h v3_extku.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h v3_extku.o: ../cryptlib.h v3_extku.c @@ -348,79 +374,90 @@ v3_genn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_genn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_genn.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_genn.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_genn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_genn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_genn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_genn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_genn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_genn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_genn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_genn.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_genn.c +v3_genn.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_genn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_genn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +v3_genn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +v3_genn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +v3_genn.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_genn.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +v3_genn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +v3_genn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +v3_genn.o: ../cryptlib.h v3_genn.c v3_ia5.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h v3_ia5.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_ia5.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_ia5.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_ia5.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_ia5.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_ia5.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_ia5.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_ia5.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_ia5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_ia5.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_ia5.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_ia5.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_ia5.c +v3_ia5.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_ia5.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_ia5.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +v3_ia5.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +v3_ia5.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +v3_ia5.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_ia5.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +v3_ia5.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +v3_ia5.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +v3_ia5.o: ../cryptlib.h v3_ia5.c v3_info.o: ../../e_os.h ../../include/openssl/asn1.h v3_info.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h v3_info.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_info.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_info.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_info.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_info.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_info.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_info.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_info.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_info.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_info.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_info.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_info.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_info.c +v3_info.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_info.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_info.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +v3_info.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +v3_info.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +v3_info.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_info.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +v3_info.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +v3_info.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +v3_info.o: ../cryptlib.h v3_info.c v3_int.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h v3_int.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_int.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_int.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_int.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_int.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_int.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_int.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_int.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_int.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_int.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_int.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_int.c +v3_int.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_int.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_int.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +v3_int.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +v3_int.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +v3_int.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_int.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +v3_int.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +v3_int.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +v3_int.o: ../cryptlib.h v3_int.c v3_lib.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h v3_lib.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ext_dat.h v3_lib.c +v3_lib.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +v3_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +v3_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +v3_lib.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_lib.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +v3_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +v3_lib.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +v3_lib.o: ../cryptlib.h ext_dat.h v3_lib.c v3_ncons.o: ../../e_os.h ../../include/openssl/asn1.h v3_ncons.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h v3_ncons.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_ncons.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_ncons.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_ncons.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_ncons.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_ncons.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_ncons.o: ../../include/openssl/opensslconf.h +v3_ncons.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_ncons.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_ncons.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h v3_ncons.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h v3_ncons.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_ncons.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +v3_ncons.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_ncons.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h v3_ncons.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h v3_ncons.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h v3_ncons.o: ../cryptlib.h v3_ncons.c @@ -430,37 +467,43 @@ v3_ocsp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h v3_ocsp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h v3_ocsp.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h v3_ocsp.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_ocsp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_ocsp.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h -v3_ocsp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_ocsp.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_ocsp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_ocsp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_ocsp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_ocsp.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_ocsp.c +v3_ocsp.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +v3_ocsp.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +v3_ocsp.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h +v3_ocsp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +v3_ocsp.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +v3_ocsp.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_ocsp.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +v3_ocsp.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +v3_ocsp.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +v3_ocsp.o: ../cryptlib.h v3_ocsp.c v3_pci.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h v3_pci.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_pci.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_pci.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_pci.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_pci.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_pci.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_pci.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_pci.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_pci.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_pci.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_pci.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_pci.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_pci.c +v3_pci.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_pci.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_pci.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +v3_pci.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +v3_pci.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +v3_pci.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_pci.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +v3_pci.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +v3_pci.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +v3_pci.o: ../cryptlib.h v3_pci.c v3_pcia.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h v3_pcia.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h v3_pcia.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h v3_pcia.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h v3_pcia.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -v3_pcia.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +v3_pcia.o: ../../include/openssl/err.h ../../include/openssl/evp.h +v3_pcia.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h v3_pcia.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h v3_pcia.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h v3_pcia.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h v3_pcia.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +v3_pcia.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h v3_pcia.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h v3_pcia.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h v3_pcia.o: ../../include/openssl/x509v3.h v3_pcia.c @@ -470,12 +513,13 @@ v3_pcons.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_pcons.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_pcons.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_pcons.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_pcons.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_pcons.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_pcons.o: ../../include/openssl/opensslconf.h +v3_pcons.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_pcons.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_pcons.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h v3_pcons.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h v3_pcons.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_pcons.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +v3_pcons.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_pcons.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h v3_pcons.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h v3_pcons.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h v3_pcons.o: ../cryptlib.h v3_pcons.c @@ -485,26 +529,29 @@ v3_pku.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_pku.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_pku.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_pku.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_pku.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_pku.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_pku.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_pku.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_pku.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_pku.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_pku.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_pku.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_pku.c +v3_pku.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_pku.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_pku.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +v3_pku.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +v3_pku.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +v3_pku.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_pku.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +v3_pku.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +v3_pku.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +v3_pku.o: ../cryptlib.h v3_pku.c v3_pmaps.o: ../../e_os.h ../../include/openssl/asn1.h v3_pmaps.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h v3_pmaps.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_pmaps.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_pmaps.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_pmaps.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_pmaps.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_pmaps.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_pmaps.o: ../../include/openssl/opensslconf.h +v3_pmaps.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_pmaps.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_pmaps.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h v3_pmaps.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h v3_pmaps.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_pmaps.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +v3_pmaps.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_pmaps.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h v3_pmaps.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h v3_pmaps.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h v3_pmaps.o: ../cryptlib.h v3_pmaps.c @@ -513,68 +560,74 @@ v3_prn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_prn.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_prn.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_prn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_prn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_prn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_prn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_prn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_prn.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_prn.c +v3_prn.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_prn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_prn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +v3_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +v3_prn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +v3_prn.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_prn.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +v3_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +v3_prn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +v3_prn.o: ../cryptlib.h v3_prn.c v3_purp.o: ../../e_os.h ../../include/openssl/asn1.h v3_purp.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h v3_purp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h v3_purp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h v3_purp.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h v3_purp.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_purp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_purp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -v3_purp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_purp.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_purp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_purp.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_purp.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_purp.o: ../cryptlib.h v3_purp.c +v3_purp.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +v3_purp.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +v3_purp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +v3_purp.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +v3_purp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +v3_purp.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +v3_purp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +v3_purp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +v3_purp.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_purp.c v3_scts.o: ../../e_os.h ../../include/openssl/asn1.h v3_scts.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h v3_scts.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h v3_scts.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h v3_scts.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h v3_scts.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_scts.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_scts.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -v3_scts.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_scts.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_scts.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_scts.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_scts.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_scts.o: ../cryptlib.h v3_scts.c +v3_scts.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +v3_scts.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +v3_scts.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +v3_scts.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +v3_scts.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +v3_scts.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +v3_scts.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +v3_scts.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +v3_scts.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_scts.c v3_skey.o: ../../e_os.h ../../include/openssl/asn1.h v3_skey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h v3_skey.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h v3_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h v3_skey.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h v3_skey.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_skey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_skey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -v3_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_skey.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_skey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_skey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_skey.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_skey.o: ../cryptlib.h v3_skey.c +v3_skey.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +v3_skey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +v3_skey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +v3_skey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +v3_skey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +v3_skey.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +v3_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +v3_skey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +v3_skey.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_skey.c v3_sxnet.o: ../../e_os.h ../../include/openssl/asn1.h v3_sxnet.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h v3_sxnet.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3_sxnet.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3_sxnet.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3_sxnet.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_sxnet.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_sxnet.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_sxnet.o: ../../include/openssl/opensslconf.h +v3_sxnet.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3_sxnet.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3_sxnet.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h v3_sxnet.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h v3_sxnet.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_sxnet.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +v3_sxnet.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3_sxnet.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h v3_sxnet.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h v3_sxnet.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h v3_sxnet.o: ../cryptlib.h v3_sxnet.c @@ -584,24 +637,27 @@ v3_utl.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h v3_utl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h v3_utl.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h v3_utl.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_utl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_utl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -v3_utl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_utl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_utl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_utl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_utl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_utl.o: ../cryptlib.h v3_utl.c +v3_utl.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +v3_utl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +v3_utl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +v3_utl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h +v3_utl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +v3_utl.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h +v3_utl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +v3_utl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +v3_utl.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_utl.c v3err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h v3err.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h v3err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h v3err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h v3err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3err.o: ../../include/openssl/x509v3.h v3err.c +v3err.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +v3err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +v3err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +v3err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +v3err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +v3err.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +v3err.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h +v3err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +v3err.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +v3err.o: v3err.c diff --git a/crypto/zuc/Makefile b/crypto/zuc/Makefile index bd3efd0c..bcd40b89 100644 --- a/crypto/zuc/Makefile +++ b/crypto/zuc/Makefile @@ -18,7 +18,7 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST= +TEST=zuctest.c APPS= LIB=$(TOP)/libcrypto.a @@ -81,14 +81,4 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. - - - -zuc.o: ../../e_os.h ../../include/openssl/bio.h -zuc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -zuc.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -zuc.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -zuc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -zuc.o: ../../include/openssl/rc4.h ../../include/openssl/safestack.h -zuc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -zuc.o: ../cryptlib.h zuc.c zuc.h +zuc.o: ../../include/openssl/modes.h ../modes/modes_lcl.h zuc.c zuc.h diff --git a/crypto/zuc/zuctest.c b/crypto/zuc/zuctest.c new file mode 100755 index 00000000..b28b04f6 --- /dev/null +++ b/crypto/zuc/zuctest.c @@ -0,0 +1,3 @@ + + + diff --git a/demos/ectool.c b/demos/ectool.c new file mode 100644 index 00000000..504f7375 --- /dev/null +++ b/demos/ectool.c @@ -0,0 +1,261 @@ +/* + * ecc - elliptic curve cryptography toolkit + * a command line tool perform basic ecc cryptography + * include ecpoint add, double, scalar multiply, invert + * ecdsa sign and verify + * ec -sign -key a.file -pass 123456 + * ec -verify -key a.file + */ + + + + + +#include +#include +#include + +#include +#include +#include +#include +#include + +enum commands { + ECC_PRINT = 1, + ECC_CHECK_POINT, + ECC_RAND_SKEY, + ECC_RAND_KEYPAIR, + ECC_ADD, + ECC_DOUBLE, + ECC_MUL, + ECC_MUL_G, + ECC_INVERT, + ECC_SIGN, + ECC_VERIFY, +}; + +int main(int argc, const char *argv[]) +{ + int r; + int ok = 0; + char *prog = "ecc"; + + + // libpopt var + poptContext popt_ctx; + const char **rest; + int command = 0; + char *curve_name = "secp192k1"; + int point_compressed = 0; + point_conversion_form_t point_form; + + struct poptOption options[] = { + {"curve-name", 'c', POPT_ARG_STRING, &curve_name, 0, "elliptic curve name", "NAME"}, + {"point-compressed", 'z', POPT_ARG_NONE, &point_compressed, 0, "point format, compress or uncompress", NULL}, + {"print-curve", 'p', POPT_ARG_VAL, &command, ECC_PRINT, "print elliptic curve parameters", NULL}, + {"random-private-key", 0, POPT_ARG_VAL, &command, ECC_RAND_SKEY, "random generate a private key\n", NULL}, + {"random-keypair", 0, POPT_ARG_VAL, &command, ECC_RAND_KEYPAIR, "generate a random key pair\n", NULL}, + {"check-point", 'e', POPT_ARG_VAL, &command, ECC_CHECK_POINT, "check if point is valid\n", NULL}, + {"point-add", 'a', POPT_ARG_VAL, &command, ECC_ADD, "elliptic curve point addition", NULL}, + {"point-double", 'b', POPT_ARG_VAL, &command, ECC_DOUBLE, "elliptic curve point double", NULL}, + {"point-mul", 'x', POPT_ARG_VAL, &command, ECC_MUL, "k*G", NULL}, + {"point-mul-generator", 'X', POPT_ARG_VAL, &command, ECC_MUL_G, "elliptic curve point scalar multiply", NULL}, + {"point-invert", 'i', POPT_ARG_VAL, &command, ECC_INVERT, "elliptic curve point inverse", NULL}, + {"ecdsa-sign", 's', POPT_ARG_VAL, &command, ECC_SIGN, "ecdsa sign", NULL}, + {"ecdsa-verify", 'v', POPT_ARG_VAL, &command, ECC_VERIFY, "ecdsa verify", NULL}, + POPT_AUTOHELP + POPT_TABLEEND + }; + + // openssl var + EC_GROUP *ec_group = NULL; + EC_POINT *P = NULL; + EC_POINT *Q = NULL; + EC_POINT *R = NULL; + BIGNUM *k = BN_new(); + BN_CTX *bn_ctx = BN_CTX_new(); + + + // argument parsing + popt_ctx = poptGetContext(argv[0], argc, argv, options, 0); + if ((r = poptGetNextOpt(popt_ctx)) < -1) { + fprintf(stderr, "%s: bad argument %s: %s\n", argv[0], + poptBadOption(popt_ctx, POPT_BADOPTION_NOALIAS), + poptStrerror(r)); + goto exit; + } + rest = poptGetArgs(popt_ctx); + + + // check arguments + ec_group = EC_GROUP_new_by_curve_name(OBJ_txt2nid(curve_name)); + if (ec_group == NULL) { + fprintf(stderr, "%s: unknown curve name\n", prog); + goto exit; + } + + P = EC_POINT_new(ec_group); + Q = EC_POINT_new(ec_group); + R = EC_POINT_new(ec_group); + + point_form = point_compressed ? POINT_CONVERSION_COMPRESSED : POINT_CONVERSION_UNCOMPRESSED; + + switch (command) { + case ECC_PRINT: + { + BIGNUM *p = BN_new(); + BIGNUM *a = BN_new(); + BIGNUM *b = BN_new(); + char *generator; + BIGNUM *order = BN_new(); + BIGNUM *cofactor = BN_new(); + + EC_GROUP_get_curve_GFp(ec_group, p, a, b, bn_ctx); + generator = EC_POINT_point2hex(ec_group, EC_GROUP_get0_generator(ec_group), point_form, bn_ctx); + EC_GROUP_get_order(ec_group, order, bn_ctx); + EC_GROUP_get_cofactor(ec_group, cofactor, bn_ctx); + + fprintf(stdout, "Name : %s\n", OBJ_nid2sn(EC_GROUP_get_curve_name(ec_group))); + fprintf(stdout, "FieldType : %s\n", "PrimeField"); + fprintf(stdout, "Prime : %s\n", BN_bn2hex(p)); + fprintf(stdout, "A : %s\n", BN_bn2hex(a)); + fprintf(stdout, "B : %s\n", BN_bn2hex(b)); + fprintf(stdout, "Generator : %s\n", generator); + fprintf(stdout, "Order : %s\n", BN_bn2hex(order)); + fprintf(stdout, "Cofactor : %s\n", BN_bn2hex(cofactor)); + + BN_free(p); + BN_free(a); + BN_free(b); + BN_free(order); + BN_free(cofactor); + + break; + } + case ECC_CHECK_POINT: + { + if (!rest) { + fprintf(stderr, "%s: short of point\n", prog); + goto exit; + } + if (!rest[0]) { + fprintf(stderr, "%s: short of point\n", prog); + goto exit; + } + if (EC_POINT_hex2point(ec_group, rest[0], P, bn_ctx)) + fprintf(stdout, "ture\n"); + else + fprintf(stdout, "false\n"); + break; + } + case ECC_RAND_SKEY: + { + EC_KEY *ec_key = EC_KEY_new(); + EC_KEY_set_group(ec_key, ec_group); + EC_KEY_generate_key(ec_key); + fprintf(stdout, "%s\n", BN_bn2hex(EC_KEY_get0_private_key(ec_key))); + EC_KEY_free(ec_key); + break; + } + case ECC_RAND_KEYPAIR: + { + EC_KEY *ec_key = EC_KEY_new(); + EC_KEY_set_group(ec_key, ec_group); + EC_KEY_generate_key(ec_key); + fprintf(stdout, "%s\n", BN_bn2hex(EC_KEY_get0_private_key(ec_key))); + fprintf(stdout, "%s\n", EC_POINT_point2hex(ec_group, EC_KEY_get0_public_key(ec_key), point_form, bn_ctx)); + EC_KEY_free(ec_key); + break; + } + case ECC_ADD: + { + if (!rest) { + fprintf(stderr, "%s: short of point\n", prog); + goto exit; + } + if (!rest[0] || !rest[1]) { + fprintf(stderr, "%s: short of point\n", prog); + goto exit; + } + if (!EC_POINT_hex2point(ec_group, rest[1], P, bn_ctx)) { + fprintf(stderr, "%s: first point invalid\n", prog); + goto exit; + } + if (!EC_POINT_hex2point(ec_group, rest[1], Q, bn_ctx)) { + fprintf(stderr, "%s: second point invalid\n", prog); + goto exit; + } + EC_POINT_add(ec_group, R, P, Q, bn_ctx); + fprintf(stdout, "%s\n", EC_POINT_point2hex(ec_group, R, point_form, bn_ctx)); + break; + } + case ECC_DOUBLE: + { + EC_POINT_dbl(ec_group, R, P, bn_ctx); + fprintf(stdout, "%s\n", EC_POINT_point2hex(ec_group, R, point_form, bn_ctx)); + break; + } + case ECC_MUL: + { + BIGNUM *order = NULL; + + if (!BN_hex2bn(&k, rest[0])) { + fprintf(stderr, "%s: integer invalid\n", prog); + goto exit; + } + + order = BN_new(); + EC_GROUP_get_order(ec_group, order, bn_ctx); + if (BN_cmp(k, order) >= 0) { + fprintf(stderr, "%s: integer value invalid\n", prog); + BN_free(order); + goto exit; + } + BN_free(order); + + if (!EC_POINT_hex2point(ec_group, rest[1], P, bn_ctx)) { + fprintf(stderr, "%s: point invalid\n", prog); + goto exit; + } + + EC_POINT_mul(ec_group, R, k, P, NULL, bn_ctx); + fprintf(stdout, "%s\n", EC_POINT_point2hex(ec_group, R, point_form, bn_ctx)); + + break; + } + case ECC_MUL_G: + { + BIGNUM *order = NULL; + if (!BN_hex2bn(&k, rest[0])) { + fprintf(stderr, "%s: integer format invalid\n", prog); + goto exit; + } + + order = BN_new(); + EC_GROUP_get_order(ec_group, order, bn_ctx); + if (BN_cmp(k, order) >= 0) { + fprintf(stderr, "%s: integer value invalid\n", prog); + BN_free(order); + goto exit; + } + BN_free(order); + + EC_POINT_mul(ec_group, R, k, EC_GROUP_get0_generator(ec_group), NULL, bn_ctx); + fprintf(stdout, "%s\n", EC_POINT_point2hex(ec_group, R, point_form, bn_ctx)); + break; + } + default: + fprintf(stderr, "%s: command is required\n", prog); + break; + } + ok = 1; + +exit: + if (ec_group) EC_GROUP_free(ec_group); + if (P) EC_POINT_free(P); + if (k) BN_free(k); + if (bn_ctx) BN_CTX_free(bn_ctx); + + return ok ? 0 : -1; +} diff --git a/doc/apps/openssl.pod b/doc/apps/openssl.pod index 64a160c2..3586c0aa 100644 --- a/doc/apps/openssl.pod +++ b/doc/apps/openssl.pod @@ -3,16 +3,16 @@ =head1 NAME -openssl - OpenSSL command line tool +gmssl - GmSSL command line tool =head1 SYNOPSIS -B +B I [ I ] [ I ] -B [ B | B | B | B | B | B] +B [ B | B | B | B | B | B] B BI [ I ] @@ -20,10 +20,11 @@ B BI [ I ] OpenSSL is a cryptography toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) network protocols and related -cryptography standards required by them. +cryptography standards required by them. GmSSL is a fork of OpenSSL with +Chinese cryptography algorithms and standards. -The B program is a command line tool for using the various -cryptography functions of OpenSSL's B library from the shell. +The B program is a command line tool for using the various +cryptography functions of GmSSL's B library from the shell. It can be used for o Creation and management of private keys, public keys and parameters @@ -37,14 +38,14 @@ It can be used for =head1 COMMAND SUMMARY -The B program provides a rich variety of commands (I in the +The B program provides a rich variety of commands (I in the SYNOPSIS above), each of which often has a wealth of options and arguments (I and I in the SYNOPSIS). The pseudo-commands B, B, and B output a list (one entry per line) of the names of all standard commands, message digest commands, or cipher commands, -respectively, that are available in the present B utility. +respectively, that are available in the present B utility. The pseudo-commands B and B list all cipher and message digest names, one entry per line. Aliases are listed as: @@ -61,7 +62,7 @@ and prints I. In both cases, the output goes to B and nothing is printed to B. Additional command line arguments are always ignored. Since for each cipher there is a command of the same name, this provides an easy way for shell scripts to test for the -availability of ciphers in the B program. (BI is +availability of ciphers in the B program. (BI is not able to detect pseudo-commands such as B, BI<...>B<-commands>, or BI itself.) diff --git a/engines/Makefile b/engines/Makefile index 2058ff40..2d4a6a09 100644 --- a/engines/Makefile +++ b/engines/Makefile @@ -26,7 +26,7 @@ TEST= APPS= LIB=$(TOP)/libcrypto.a -LIBNAMES= 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock capi +LIBNAMES= 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock skf capi LIBSRC= e_4758cca.c \ e_aep.c \ @@ -53,7 +53,7 @@ LIBOBJ= e_4758cca.o \ SRC= $(LIBSRC) -EXHEADER= +EXHEADER= HEADER= e_4758cca_err.c e_4758cca_err.h \ e_aep_err.c e_aep_err.h \ e_atalla_err.c e_atalla_err.h \ @@ -173,16 +173,17 @@ e_4758cca.o: ../include/openssl/crypto.h ../include/openssl/dso.h e_4758cca.o: ../include/openssl/e_os2.h ../include/openssl/ec.h e_4758cca.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h e_4758cca.o: ../include/openssl/engine.h ../include/openssl/err.h -e_4758cca.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_4758cca.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_4758cca.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_4758cca.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_4758cca.o: ../include/openssl/rand.h ../include/openssl/rsa.h -e_4758cca.o: ../include/openssl/safestack.h ../include/openssl/sha.h -e_4758cca.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -e_4758cca.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -e_4758cca.o: e_4758cca.c e_4758cca_err.c e_4758cca_err.h -e_4758cca.o: vendor_defns/hw_4758_cca.h +e_4758cca.o: ../include/openssl/evp.h ../include/openssl/kdf.h +e_4758cca.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +e_4758cca.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +e_4758cca.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +e_4758cca.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h +e_4758cca.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +e_4758cca.o: ../include/openssl/sha.h ../include/openssl/sm2.h +e_4758cca.o: ../include/openssl/sm3.h ../include/openssl/stack.h +e_4758cca.o: ../include/openssl/symhacks.h ../include/openssl/x509.h +e_4758cca.o: ../include/openssl/x509_vfy.h e_4758cca.c e_4758cca_err.c +e_4758cca.o: e_4758cca_err.h vendor_defns/hw_4758_cca.h e_aep.o: ../include/openssl/asn1.h ../include/openssl/bio.h e_aep.o: ../include/openssl/bn.h ../include/openssl/buffer.h e_aep.o: ../include/openssl/crypto.h ../include/openssl/dh.h @@ -190,15 +191,16 @@ e_aep.o: ../include/openssl/dsa.h ../include/openssl/dso.h e_aep.o: ../include/openssl/e_os2.h ../include/openssl/ec.h e_aep.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h e_aep.o: ../include/openssl/engine.h ../include/openssl/err.h -e_aep.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_aep.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_aep.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_aep.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_aep.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -e_aep.o: ../include/openssl/sha.h ../include/openssl/stack.h -e_aep.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -e_aep.o: ../include/openssl/x509_vfy.h e_aep.c e_aep_err.c e_aep_err.h -e_aep.o: vendor_defns/aep.h +e_aep.o: ../include/openssl/evp.h ../include/openssl/kdf.h +e_aep.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +e_aep.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +e_aep.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +e_aep.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h +e_aep.o: ../include/openssl/safestack.h ../include/openssl/sha.h +e_aep.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +e_aep.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +e_aep.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h e_aep.c +e_aep.o: e_aep_err.c e_aep_err.h vendor_defns/aep.h e_atalla.o: ../include/openssl/asn1.h ../include/openssl/bio.h e_atalla.o: ../include/openssl/bn.h ../include/openssl/buffer.h e_atalla.o: ../include/openssl/crypto.h ../include/openssl/dh.h @@ -206,25 +208,28 @@ e_atalla.o: ../include/openssl/dsa.h ../include/openssl/dso.h e_atalla.o: ../include/openssl/e_os2.h ../include/openssl/ec.h e_atalla.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h e_atalla.o: ../include/openssl/engine.h ../include/openssl/err.h -e_atalla.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_atalla.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_atalla.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_atalla.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_atalla.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -e_atalla.o: ../include/openssl/sha.h ../include/openssl/stack.h -e_atalla.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -e_atalla.o: ../include/openssl/x509_vfy.h e_atalla.c e_atalla_err.c -e_atalla.o: e_atalla_err.h vendor_defns/atalla.h +e_atalla.o: ../include/openssl/evp.h ../include/openssl/kdf.h +e_atalla.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +e_atalla.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +e_atalla.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +e_atalla.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h +e_atalla.o: ../include/openssl/safestack.h ../include/openssl/sha.h +e_atalla.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +e_atalla.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +e_atalla.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h e_atalla.c +e_atalla.o: e_atalla_err.c e_atalla_err.h vendor_defns/atalla.h e_capi.o: ../include/openssl/asn1.h ../include/openssl/bio.h e_capi.o: ../include/openssl/buffer.h ../include/openssl/crypto.h e_capi.o: ../include/openssl/e_os2.h ../include/openssl/ec.h e_capi.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -e_capi.o: ../include/openssl/engine.h ../include/openssl/evp.h +e_capi.o: ../include/openssl/engine.h ../include/openssl/err.h +e_capi.o: ../include/openssl/evp.h ../include/openssl/kdf.h e_capi.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h e_capi.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h e_capi.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h e_capi.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -e_capi.o: ../include/openssl/sha.h ../include/openssl/stack.h +e_capi.o: ../include/openssl/sha.h ../include/openssl/sm2.h +e_capi.o: ../include/openssl/sm3.h ../include/openssl/stack.h e_capi.o: ../include/openssl/symhacks.h ../include/openssl/x509.h e_capi.o: ../include/openssl/x509_vfy.h e_capi.c e_chil.o: ../include/openssl/asn1.h ../include/openssl/bio.h @@ -234,16 +239,18 @@ e_chil.o: ../include/openssl/dso.h ../include/openssl/e_os2.h e_chil.o: ../include/openssl/ec.h ../include/openssl/ecdh.h e_chil.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h e_chil.o: ../include/openssl/err.h ../include/openssl/evp.h -e_chil.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -e_chil.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -e_chil.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -e_chil.o: ../include/openssl/pem.h ../include/openssl/pem2.h -e_chil.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -e_chil.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -e_chil.o: ../include/openssl/sha.h ../include/openssl/stack.h -e_chil.o: ../include/openssl/symhacks.h ../include/openssl/ui.h -e_chil.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h e_chil.c -e_chil.o: e_chil_err.c e_chil_err.h vendor_defns/hwcryptohook.h +e_chil.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +e_chil.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +e_chil.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +e_chil.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +e_chil.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +e_chil.o: ../include/openssl/rand.h ../include/openssl/rsa.h +e_chil.o: ../include/openssl/safestack.h ../include/openssl/sha.h +e_chil.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +e_chil.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +e_chil.o: ../include/openssl/ui.h ../include/openssl/x509.h +e_chil.o: ../include/openssl/x509_vfy.h e_chil.c e_chil_err.c e_chil_err.h +e_chil.o: vendor_defns/hwcryptohook.h e_cswift.o: ../include/openssl/asn1.h ../include/openssl/bio.h e_cswift.o: ../include/openssl/bn.h ../include/openssl/buffer.h e_cswift.o: ../include/openssl/crypto.h ../include/openssl/dh.h @@ -251,26 +258,30 @@ e_cswift.o: ../include/openssl/dsa.h ../include/openssl/dso.h e_cswift.o: ../include/openssl/e_os2.h ../include/openssl/ec.h e_cswift.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h e_cswift.o: ../include/openssl/engine.h ../include/openssl/err.h -e_cswift.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_cswift.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_cswift.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_cswift.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_cswift.o: ../include/openssl/rand.h ../include/openssl/rsa.h -e_cswift.o: ../include/openssl/safestack.h ../include/openssl/sha.h -e_cswift.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -e_cswift.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h e_cswift.c -e_cswift.o: e_cswift_err.c e_cswift_err.h vendor_defns/cswift.h +e_cswift.o: ../include/openssl/evp.h ../include/openssl/kdf.h +e_cswift.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +e_cswift.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +e_cswift.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +e_cswift.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h +e_cswift.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +e_cswift.o: ../include/openssl/sha.h ../include/openssl/sm2.h +e_cswift.o: ../include/openssl/sm3.h ../include/openssl/stack.h +e_cswift.o: ../include/openssl/symhacks.h ../include/openssl/x509.h +e_cswift.o: ../include/openssl/x509_vfy.h e_cswift.c e_cswift_err.c +e_cswift.o: e_cswift_err.h vendor_defns/cswift.h e_gmp.o: ../include/openssl/asn1.h ../include/openssl/bio.h e_gmp.o: ../include/openssl/bn.h ../include/openssl/buffer.h e_gmp.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h e_gmp.o: ../include/openssl/ec.h ../include/openssl/ecdh.h e_gmp.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -e_gmp.o: ../include/openssl/evp.h ../include/openssl/lhash.h +e_gmp.o: ../include/openssl/err.h ../include/openssl/evp.h +e_gmp.o: ../include/openssl/kdf.h ../include/openssl/lhash.h e_gmp.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h e_gmp.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h e_gmp.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h e_gmp.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -e_gmp.o: ../include/openssl/sha.h ../include/openssl/stack.h +e_gmp.o: ../include/openssl/sha.h ../include/openssl/sm2.h +e_gmp.o: ../include/openssl/sm3.h ../include/openssl/stack.h e_gmp.o: ../include/openssl/symhacks.h ../include/openssl/x509.h e_gmp.o: ../include/openssl/x509_vfy.h e_gmp.c e_nuron.o: ../include/openssl/asn1.h ../include/openssl/bio.h @@ -280,28 +291,48 @@ e_nuron.o: ../include/openssl/dsa.h ../include/openssl/dso.h e_nuron.o: ../include/openssl/e_os2.h ../include/openssl/ec.h e_nuron.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h e_nuron.o: ../include/openssl/engine.h ../include/openssl/err.h -e_nuron.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_nuron.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_nuron.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_nuron.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_nuron.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -e_nuron.o: ../include/openssl/sha.h ../include/openssl/stack.h -e_nuron.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -e_nuron.o: ../include/openssl/x509_vfy.h e_nuron.c e_nuron_err.c e_nuron_err.h +e_nuron.o: ../include/openssl/evp.h ../include/openssl/kdf.h +e_nuron.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +e_nuron.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +e_nuron.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +e_nuron.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h +e_nuron.o: ../include/openssl/safestack.h ../include/openssl/sha.h +e_nuron.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +e_nuron.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +e_nuron.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h e_nuron.c +e_nuron.o: e_nuron_err.c e_nuron_err.h e_padlock.o: ../include/openssl/aes.h ../include/openssl/asn1.h e_padlock.o: ../include/openssl/bio.h ../include/openssl/buffer.h e_padlock.o: ../include/openssl/crypto.h ../include/openssl/dso.h e_padlock.o: ../include/openssl/e_os2.h ../include/openssl/ec.h e_padlock.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h e_padlock.o: ../include/openssl/engine.h ../include/openssl/err.h -e_padlock.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_padlock.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_padlock.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_padlock.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_padlock.o: ../include/openssl/rand.h ../include/openssl/safestack.h -e_padlock.o: ../include/openssl/sha.h ../include/openssl/stack.h -e_padlock.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -e_padlock.o: ../include/openssl/x509_vfy.h e_padlock.c +e_padlock.o: ../include/openssl/evp.h ../include/openssl/kdf.h +e_padlock.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +e_padlock.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +e_padlock.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +e_padlock.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h +e_padlock.o: ../include/openssl/safestack.h ../include/openssl/sha.h +e_padlock.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +e_padlock.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +e_padlock.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +e_padlock.o: e_padlock.c +e_skf.o: ../include/openssl/asn1.h ../include/openssl/bio.h +e_skf.o: ../include/openssl/buffer.h ../include/openssl/crypto.h +e_skf.o: ../include/openssl/e_os2.h ../include/openssl/ec.h +e_skf.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h +e_skf.o: ../include/openssl/engine.h ../include/openssl/err.h +e_skf.o: ../include/openssl/evp.h ../include/openssl/kdf.h +e_skf.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +e_skf.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +e_skf.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +e_skf.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +e_skf.o: ../include/openssl/sha.h ../include/openssl/sm1.h +e_skf.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +e_skf.o: ../include/openssl/sm9.h ../include/openssl/sms4.h +e_skf.o: ../include/openssl/ssf33.h ../include/openssl/stack.h +e_skf.o: ../include/openssl/symhacks.h ../include/openssl/x509.h +e_skf.o: ../include/openssl/x509_vfy.h e_skf.c e_skf_err.h e_sureware.o: ../include/openssl/asn1.h ../include/openssl/bio.h e_sureware.o: ../include/openssl/bn.h ../include/openssl/buffer.h e_sureware.o: ../include/openssl/crypto.h ../include/openssl/dh.h @@ -309,17 +340,18 @@ e_sureware.o: ../include/openssl/dsa.h ../include/openssl/dso.h e_sureware.o: ../include/openssl/e_os2.h ../include/openssl/ec.h e_sureware.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h e_sureware.o: ../include/openssl/engine.h ../include/openssl/err.h -e_sureware.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_sureware.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_sureware.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_sureware.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -e_sureware.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -e_sureware.o: ../include/openssl/rand.h ../include/openssl/rsa.h -e_sureware.o: ../include/openssl/safestack.h ../include/openssl/sha.h -e_sureware.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -e_sureware.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -e_sureware.o: e_sureware.c e_sureware_err.c e_sureware_err.h -e_sureware.o: vendor_defns/sureware.h +e_sureware.o: ../include/openssl/evp.h ../include/openssl/kdf.h +e_sureware.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +e_sureware.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +e_sureware.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +e_sureware.o: ../include/openssl/pem.h ../include/openssl/pem2.h +e_sureware.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h +e_sureware.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +e_sureware.o: ../include/openssl/sha.h ../include/openssl/sm2.h +e_sureware.o: ../include/openssl/sm3.h ../include/openssl/stack.h +e_sureware.o: ../include/openssl/symhacks.h ../include/openssl/x509.h +e_sureware.o: ../include/openssl/x509_vfy.h e_sureware.c e_sureware_err.c +e_sureware.o: e_sureware_err.h vendor_defns/sureware.h e_ubsec.o: ../include/openssl/asn1.h ../include/openssl/bio.h e_ubsec.o: ../include/openssl/bn.h ../include/openssl/buffer.h e_ubsec.o: ../include/openssl/crypto.h ../include/openssl/dh.h @@ -327,12 +359,13 @@ e_ubsec.o: ../include/openssl/dsa.h ../include/openssl/dso.h e_ubsec.o: ../include/openssl/e_os2.h ../include/openssl/ec.h e_ubsec.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h e_ubsec.o: ../include/openssl/engine.h ../include/openssl/err.h -e_ubsec.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_ubsec.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_ubsec.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_ubsec.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_ubsec.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -e_ubsec.o: ../include/openssl/sha.h ../include/openssl/stack.h -e_ubsec.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -e_ubsec.o: ../include/openssl/x509_vfy.h e_ubsec.c e_ubsec_err.c e_ubsec_err.h -e_ubsec.o: vendor_defns/hw_ubsec.h +e_ubsec.o: ../include/openssl/evp.h ../include/openssl/kdf.h +e_ubsec.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +e_ubsec.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +e_ubsec.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +e_ubsec.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h +e_ubsec.o: ../include/openssl/safestack.h ../include/openssl/sha.h +e_ubsec.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +e_ubsec.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +e_ubsec.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h e_ubsec.c +e_ubsec.o: e_ubsec_err.c e_ubsec_err.h vendor_defns/hw_ubsec.h diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile index 17e1efbd..8205039c 100644 --- a/engines/ccgost/Makefile +++ b/engines/ccgost/Makefile @@ -96,11 +96,13 @@ gost2001.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h gost2001.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h gost2001.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h gost2001.o: ../../include/openssl/err.h ../../include/openssl/evp.h -gost2001.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -gost2001.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +gost2001.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +gost2001.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +gost2001.o: ../../include/openssl/opensslconf.h gost2001.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h gost2001.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h gost2001.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +gost2001.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h gost2001.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h gost2001.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h gost2001.o: e_gost_err.h gost2001.c gost89.h gost_lcl.h gost_params.h @@ -111,14 +113,16 @@ gost2001_keyx.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h gost2001_keyx.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h gost2001_keyx.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h gost2001_keyx.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -gost2001_keyx.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +gost2001_keyx.o: ../../include/openssl/err.h ../../include/openssl/evp.h +gost2001_keyx.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h gost2001_keyx.o: ../../include/openssl/obj_mac.h gost2001_keyx.o: ../../include/openssl/objects.h gost2001_keyx.o: ../../include/openssl/opensslconf.h gost2001_keyx.o: ../../include/openssl/opensslv.h gost2001_keyx.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h gost2001_keyx.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -gost2001_keyx.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +gost2001_keyx.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +gost2001_keyx.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h gost2001_keyx.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h gost2001_keyx.o: ../../include/openssl/x509_vfy.h e_gost_err.h gost2001_keyx.c gost2001_keyx.o: gost2001_keyx.h gost89.h gost_keywrap.h gost_lcl.h gosthash.h @@ -129,14 +133,16 @@ gost94_keyx.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h gost94_keyx.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h gost94_keyx.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h gost94_keyx.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -gost94_keyx.o: ../../include/openssl/engine.h ../../include/openssl/evp.h +gost94_keyx.o: ../../include/openssl/engine.h ../../include/openssl/err.h +gost94_keyx.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h gost94_keyx.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h gost94_keyx.o: ../../include/openssl/objects.h gost94_keyx.o: ../../include/openssl/opensslconf.h gost94_keyx.o: ../../include/openssl/opensslv.h gost94_keyx.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h gost94_keyx.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -gost94_keyx.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +gost94_keyx.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +gost94_keyx.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h gost94_keyx.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h gost94_keyx.o: ../../include/openssl/x509_vfy.h e_gost_err.h gost89.h gost94_keyx.o: gost94_keyx.c gost_keywrap.h gost_lcl.h gosthash.h @@ -147,12 +153,14 @@ gost_ameth.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h gost_ameth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h gost_ameth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h gost_ameth.o: ../../include/openssl/engine.h ../../include/openssl/err.h -gost_ameth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -gost_ameth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +gost_ameth.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h +gost_ameth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +gost_ameth.o: ../../include/openssl/objects.h gost_ameth.o: ../../include/openssl/opensslconf.h gost_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h gost_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -gost_ameth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +gost_ameth.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +gost_ameth.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h gost_ameth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h gost_ameth.o: ../../include/openssl/x509_vfy.h e_gost_err.h gost89.h gost_ameth.o: gost_ameth.c gost_lcl.h gost_params.h gosthash.h @@ -162,12 +170,14 @@ gost_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h gost_asn1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h gost_asn1.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h gost_asn1.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -gost_asn1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +gost_asn1.o: ../../include/openssl/err.h ../../include/openssl/evp.h +gost_asn1.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h gost_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h gost_asn1.o: ../../include/openssl/opensslconf.h gost_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h gost_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -gost_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +gost_asn1.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +gost_asn1.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h gost_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h gost_asn1.o: ../../include/openssl/x509_vfy.h gost89.h gost_asn1.c gost_lcl.h gost_asn1.o: gosthash.h @@ -177,12 +187,14 @@ gost_crypt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h gost_crypt.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h gost_crypt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h gost_crypt.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -gost_crypt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +gost_crypt.o: ../../include/openssl/err.h ../../include/openssl/evp.h +gost_crypt.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h gost_crypt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h gost_crypt.o: ../../include/openssl/opensslconf.h gost_crypt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h gost_crypt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h gost_crypt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +gost_crypt.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h gost_crypt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h gost_crypt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h gost_crypt.o: e_gost_err.h gost89.h gost_crypt.c gost_lcl.h gosthash.h @@ -193,11 +205,13 @@ gost_ctl.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h gost_ctl.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h gost_ctl.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h gost_ctl.o: ../../include/openssl/err.h ../../include/openssl/evp.h -gost_ctl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -gost_ctl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +gost_ctl.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +gost_ctl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +gost_ctl.o: ../../include/openssl/opensslconf.h gost_ctl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h gost_ctl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -gost_ctl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +gost_ctl.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +gost_ctl.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h gost_ctl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h gost_ctl.o: ../../include/openssl/x509_vfy.h gost89.h gost_ctl.c gost_lcl.h gost_ctl.o: gosthash.h @@ -208,11 +222,13 @@ gost_eng.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h gost_eng.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h gost_eng.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h gost_eng.o: ../../include/openssl/err.h ../../include/openssl/evp.h -gost_eng.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -gost_eng.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +gost_eng.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +gost_eng.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +gost_eng.o: ../../include/openssl/opensslconf.h gost_eng.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h gost_eng.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -gost_eng.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +gost_eng.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +gost_eng.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h gost_eng.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h gost_eng.o: ../../include/openssl/x509_vfy.h e_gost_err.h gost89.h gost_eng.c gost_eng.o: gost_lcl.h gosthash.h @@ -223,11 +239,13 @@ gost_md.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h gost_md.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h gost_md.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h gost_md.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -gost_md.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +gost_md.o: ../../include/openssl/err.h ../../include/openssl/evp.h +gost_md.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h gost_md.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h gost_md.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h gost_md.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h gost_md.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +gost_md.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h gost_md.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h gost_md.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h gost_md.o: e_gost_err.h gost89.h gost_lcl.h gost_md.c gosthash.h @@ -245,13 +263,15 @@ gost_pmeth.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h gost_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h gost_pmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h gost_pmeth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -gost_pmeth.o: ../../include/openssl/engine.h ../../include/openssl/evp.h +gost_pmeth.o: ../../include/openssl/engine.h ../../include/openssl/err.h +gost_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/kdf.h gost_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h gost_pmeth.o: ../../include/openssl/objects.h gost_pmeth.o: ../../include/openssl/opensslconf.h gost_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h gost_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -gost_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +gost_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/sm2.h +gost_pmeth.o: ../../include/openssl/sm3.h ../../include/openssl/stack.h gost_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h gost_pmeth.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h gost_pmeth.o: e_gost_err.h gost89.h gost_lcl.h gost_params.h gost_pmeth.c @@ -263,12 +283,13 @@ gost_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h gost_sign.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h gost_sign.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h gost_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h -gost_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -gost_sign.o: ../../include/openssl/objects.h +gost_sign.o: ../../include/openssl/kdf.h ../../include/openssl/lhash.h +gost_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h gost_sign.o: ../../include/openssl/opensslconf.h gost_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h gost_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h gost_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +gost_sign.o: ../../include/openssl/sm2.h ../../include/openssl/sm3.h gost_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h gost_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h gost_sign.o: e_gost_err.h gost89.h gost_lcl.h gost_params.h gost_sign.c diff --git a/engines/ccgost/libgost.dylib b/engines/ccgost/libgost.dylib index 71f92cb1..477eb981 100755 Binary files a/engines/ccgost/libgost.dylib and b/engines/ccgost/libgost.dylib differ diff --git a/engines/e_skf.c b/engines/e_skf.c index 776a3e53..9566682d 100644 --- a/engines/e_skf.c +++ b/engines/e_skf.c @@ -62,12 +62,13 @@ #include #include #include -#include "skf/skf.h" +#include +#include #include "e_skf_err.h" -static DEVHANDLE skf_dev_handle = NULL; -static HAPPLICATION skf_app_handle = NULL; -static HCONTAINER skf_container_handle = NULL; +static DEVHANDLE hDev = NULL; +static HAPPLICATION hApp = NULL; +static HCONTAINER hContainer = NULL; static int authkey_set = 0; static unsigned char authkey[16]; @@ -103,6 +104,7 @@ static const ENGINE_CMD_DEFN skf_cmd_defns[] = { {SKF_CMD_OPEN_APP, "OPEN_APP", "Open application with specified name", + ENGINE_CMD_FLAG_STRING}, {SKF_CMD_VERIFY_PIN, "VERIFY_PIN", "Specifies user's PIN of the application to open", @@ -111,14 +113,14 @@ static const ENGINE_CMD_DEFN skf_cmd_defns[] = { "OPEN_CONTAINER", "Open container wtith specified name", ENGINE_CMD_FLAG_STRING}, - {0, NULL, NULL, 0} + {0, NULL, NULL, 0}, }; - int set_authkey(const char *authkey_hex) { - // convert the + ESKFerr(ESKF_F_SET_AUTHKEY, ESKF_R_NOT_IMPLEMENTED); + return 0; } int set_userpin(const char *pin) @@ -127,12 +129,17 @@ int set_userpin(const char *pin) return 0; } strcpy(userpin, pin); + + ESKFerr(ESKF_F_SET_USERPIN, ESKF_R_NOT_IMPLEMENTED); return 0; } int open_dev(const char *devname) { - if ((rv = SKF_ConnectDev(dev, &hDev)) != SAR_OK) { + ULONG rv; + DEVINFO devInfo; + + if ((rv = SKF_ConnectDev(devname, &hDev)) != SAR_OK) { goto end; } @@ -152,6 +159,8 @@ int open_dev(const char *devname) goto end; } + + ESKFerr(ESKF_F_OPEN_DEV, ESKF_R_NOT_IMPLEMENTED); return 0; } @@ -163,6 +172,8 @@ int open_app(const char *appname) if ((rv = SKF_VerifyPIN(hApp, USER_TYPE, pin, &retryCount)) != SAR_OK) { goto end; } + + ESKFerr(ESKF_F_OPEN_APP, ESKF_R_NOT_IMPLEMENTED); return 0; } @@ -177,6 +188,8 @@ int open_container(const char *containername) if (containerType != CONTAINER_TYPE_ECC) { goto end; } + + ESKFerr(ESKF_F_OPEN_CONTAINER, ESKF_R_NOT_IMPLEMENTED); return 0; } @@ -196,6 +209,8 @@ static int skf_engine_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()) default: break; } + + ESKFerr(ESKF_F_SKF_ENGINE_CTRL, ESKF_R_NOT_IMPLEMENTED); return 0; } @@ -235,22 +250,28 @@ static EVP_PKEY *skf_load_pubkey(ENGINE *e, const char *key_id, if (!(ret = EVP_PKEY_new())) { goto end; } - EVP_PKEY_assign_SM2(ret, ec_key); + //EVP_PKEY_assign_SM2(ret, ec_key); end: EC_KEY_free(ec_key); BN_free(x); BN_free(y) - return ret; + + ESKFerr(ESKF_F_SKF_LOAD_PUBKEY, ESKF_R_NOT_IMPLEMENTED); + return ret; } static int skf_init(ENGINE *e) { + + ESKFerr(ESKF_F_SKF_INIT, ESKF_R_NOT_IMPLEMENTED); return 0; } static int skf_finish(ENGINE *e) -{ +{ + + ESKFerr(ESKF_F_SKF_FINISH, ESKF_R_NOT_IMPLEMENTED); return 0; } @@ -264,7 +285,7 @@ static int skf_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, case NID_ssf33_ecb: ulAlgID = SGD_SSF33_ECB; break; - case NID_ssf33_cbc: + case NID_ssf33_cbc: ulAlgID = SGD_SSF33_CBC; break; case NID_ssf33_cfb128: @@ -307,10 +328,11 @@ static int skf_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, if ((rv = SKF_SetSymmKey(skf_dev_handle, (BYTE *)key, ulAlgID, &(dat->hKey))) != SAR_OK) { - SKFerr(SKF_F_SKF_INIT_KEY, 0); return 0; } + + ESKFerr(ESKF_F_SKF_INIT_KEY, ESKF_R_NOT_IMPLEMENTED); return 1; } @@ -367,6 +389,8 @@ static int skf_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, } + + ESKFerr(ESKF_F_SKF_CIPHER, ESKF_R_NOT_IMPLEMENTED); return 1; } @@ -472,7 +496,9 @@ static int skf_ciphers(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, i return 0; } - return 1; + + ESKFerr(ESKF_F_SKF_CIPHERS, ESKF_R_NOT_IMPLEMENTED); + return 1; } @@ -481,10 +507,11 @@ int skf_rand_bytes(unsigned char *buf, int num) ULONG rv; if ((rv = SKF_GenRandom(hDev, buf, (ULONG)num)) != SAR_OK) { - SKFerr(SKF_F_SKF_RAND_BYTES, skf_err2openssl(rv)); return 0; } + + ESKFerr(ESKF_F_SKF_RAND_BYTES, ESKF_R_NOT_IMPLEMENTED); return 1; } @@ -505,10 +532,11 @@ static int skf_sm3_init(EVP_MD_CTX *ctx) HANDLE hHash; if ((rv = SKF_DigestInit(hDev, SGD_SM3, NULL, NULL, 0, &hHash)) != SAR_OK) { - SKFerr(SKF_F_SM3_INIT, skf_err2openssl(rv)); return 0; } + + ESKFerr(ESKF_F_SKF_SM3_INIT, ESKF_R_NOT_IMPLEMENTED); return 1; } @@ -519,10 +547,11 @@ static int skf_sm3_update(EVP_MD_CTX *ctx, const void *data, size_t count) ULONG ulDataLen = (ULONG)count; if ((rv = SKF_DigestUpdate((HANDLE)ctx->md_data, pbData, ulDataLen)) != SAR_OK) { - SKFerr(SKF_F_SKF_SM3_UPDATE, skf_err2openssl(rv)); return 0; } + + ESKFerr(ESKF_F_SKF_SM3_UPDATE, ESKF_R_NOT_IMPLEMENTED); return 1; } @@ -533,15 +562,15 @@ static int skf_sm3_final(EVP_MD_CTX *ctx, unsigned char *md) ULONG ulHashLen = SM3_DIGEST_LENGTH; if ((rv = SKF_DigestFinal(hHash, pHashData, &ulHashLen)) != SAR_OK) { - SKFerr(SKF_F_SKF_SM3_FINAL, skf_err2openssl(rv)); return 0; } if ((rv = SKF_CloseHandle(hHash)) != SAR_OK) { - SKFerr(SKF_F_SKF_SM3_FINAL, skf_err2openssl(rv)); return 0; } + + ESKFerr(ESKF_F_SKF_SM3_FINAL, ESKF_R_NOT_IMPLEMENTED); return 1; } @@ -580,6 +609,8 @@ static int skf_digests(ENGINE *e, const EVP_MD **digest, const int **nids, int n return 0; } + + ESKFerr(ESKF_F_SKF_DIGESTS, ESKF_R_NOT_IMPLEMENTED); return 1; } @@ -599,6 +630,8 @@ static int skf_rsa_sign(int type, const unsigned char *m, unsigned int mlen, goto end; } + + ESKFerr(ESKF_F_SKF_RSA_SIGN, ESKF_R_NOT_IMPLEMENTED); return 0; } @@ -649,6 +682,8 @@ end: ECDSA_SIG_free(ret); ret = NULL; } + + ESKFerr(ESKF_F_SKF_SM2_DO_SIGN, ESKF_R_NOT_IMPLEMENTED); return ret; } @@ -675,6 +710,7 @@ static ENGINE *engine_skf(void) return NULL; } + return ret; } diff --git a/engines/e_skf.ec b/engines/e_skf.ec index e69de29b..b73176bc 100644 --- a/engines/e_skf.ec +++ b/engines/e_skf.ec @@ -0,0 +1 @@ +L ESKF e_skf_err.h e_skf_err.c diff --git a/engines/e_skf_err.c b/engines/e_skf_err.c index 07c9f7d1..6c0503ec 100644 --- a/engines/e_skf_err.c +++ b/engines/e_skf_err.c @@ -1,146 +1,151 @@ -#include "skf/skf.h" - - - - - - - -static ERR_STRING_DATA SKF_str_functs[] = { - {ERR_FUNC(SKF_F_SKF_INIT_KEY), "SKF_INIT_KEY"}, - {ERR_FUNC(SKF_F_SKF_CIPHER), "SKF_CIPHER"}, - {ERR_FUNC(SKF_F_SKF_INIT), "SKF_INIT"}, - {ERR_FUNC(SKF_F_SKF_CTRL), "SKF_CTRL"}, - {ERR_FUNC(SKF_F_SKF_FINISH), "SKF_FINISH"}, - {0, NULL} -}; - -static ERR_STRING_DATA SKF_str_reasons[] = { - {ERR_REASON(SKF_F_OK), ok"}, - {0, NULL} -}; - - -int skf_err2openssl(int err) -{ - switch (err) { - case SAR_OK: - return SKF_R_SAR_OK; - case SAR_FAIL: - return SKF_R_SAR_FAIL; - case SAR_UNKNOWNERR: - case SAR_NOTSUPPORTYETERR: - case SAR_FILEERR: - case SAR_INVALIDHANDLEERR: - case SAR_INVALIDPARAMERR: - case SAR_READFILEERR: - case SAR_WRITEFILEERR: - case SAR_NAMELENERR: - case SAR_KEYUSAGEERR: - case SAR_MODULUSLENERR: - case SAR_NOTINITIALIZEERR: - case SAR_OBJERR: - case SAR_MEMORYERR: - case SAR_TIMEOUTERR: - case SAR_INDATALENERR - case SAR_INDATAERR - case SAR_GENRANDERR - case SAR_HASHOBJERR - case SAR_HASHERR - case SAR_GENRSAKEYERR - case SAR_RSAMODULUSLENERR - case SAR_CSPIMPRTPUBKEYERR - case SAR_RSAENCERR - case SAR_RSADECERR - case SAR_HASHNOTEQUALERR - case SAR_KEYNOTFOUNTERR - case SAR_CERTNOTFOUNTERR - case SAR_NOTEXPORTERR - case SAR_DECRYPTPADERR - case SAR_MACLENERR - case SAR_BUFFER_TOO_SMALL - case SAR_KEYINFOTYPEERR - case SAR_NOT_EVENTERR - case SAR_DEVICE_REMOVED - case SAR_PIN_INCORRECT - case SAR_PIN_LOCKED - case SAR_PIN_INVALID - case SAR_PIN_LEN_RANGE - case SAR_USER_ALREADY_LOGGED_IN - case SAR_USER_PIN_NOT_INITIALIZED - case SAR_USER_TYPE_INVALID - case SAR_APPLICATION_NAME_INVALID - case SAR_APPLICATION_EXISTS - case SAR_USER_NOT_LOGGED_IN - case SAR_APPLICATION_NOT_EXISTS - case SAR_FILE_ALREADY_EXIST - case SAR_NO_ROOM - case SAR_FILE_NOT_EXIST -} - - - - -typedef struct { - int err_no; - char *err_str; -} skf_errstr[] = { - { SAR_OK, "Success" }, - { SAR_FAIL, "Failure" }, - { SAR_UNKNOWNERR, "Unknown error" }, - { SAR_NOTSUPPORTYETERR, "Not supported" }, - { SAR_FILEERR, "File error" }, - { SAR_INVALIDHANDLEERR, "Invalid handler" }, - { SAR_INVALIDPARAMERR, "Invalid parameter" }, - { SAR_READFILEERR, "Read file error" }, - { SAR_WRITEFILEERR "Write file error" }, - { SAR_NAMELENERR, "Name length error" }, - { SAR_KEYUSAGEERR, "Key usage error" }, - { SAR_MODULUSLENERR, "Modulus length error" }, - { SAR_NOTINITIALIZEERR, "Not initialized" }, - { SAR_OBJERR, "Object error" }, - { SAR_MEMORYERR, "Memory error" }, - { SAR_TIMEOUTERR, "Time out" }, - { SAR_INDATALENERR, "Input data length error" }, - { SAR_INDATAERR, "Input data error" }, - { SAR_GENRANDERR, "Generate randomness error" }, - { SAR_HASHOBJERR, "Hash object error" }, - { SAR_HASHERR, "Hash error" }, - { SAR_GENRSAKEYERR, "Genenerate RSA key error" }, - { SAR_RSAMODULUSLENERR, "RSA modulus length error" }, - { SAR_CSPIMPRTPUBKEYERR, "CSP import public key error" }, - { SAR_RSAENCERR, "RSA encryption error" }, - { SAR_RSADECERR, "RSA decryption error" }, - { SAR_HASHNOTEQUALERR, "Hash not equal" }, - { SAR_KEYNOTFOUNTERR, "Key not found" }, - { SAR_CERTNOTFOUNTERR, "Certificate not found" }, - { SAR_NOTEXPORTERR, "Not exported" }, - { SAR_DECRYPTPADERR, "Decrypt pad error" }, - { SAR_MACLENERR, "MAC length error" }, - { SAR_BUFFER_TOO_SMALL, "Buffer too small" }, - { SAR_KEYINFOTYPEERR, "Key info type error" }, - { SAR_NOT_EVENTERR, "No event error" }, - { SAR_DEVICE_REMOVED "Device removed" }, - { SAR_PIN_INCORRECT, "PIN incorrect" }, - { SAR_PIN_LOCKED, "PIN locked" }, - { SAR_PIN_INVALID, "PIN invalid" }, - { SAR_PIN_LEN_RANGE, "PIN length error" }, - { SAR_USER_ALREADY_LOGGED_IN, "User already logged in" }, - { SAR_USER_PIN_NOT_INITIALIZED, "User PIN not initialized" }, - { SAR_USER_TYPE_INVALID, "User type invalid" }, - { SAR_APPLICATION_NAME_INVALID, "Application name invalid" }, - { SAR_APPLICATION_EXISTS, "Application already exist" }, - { SAR_USER_NOT_LOGGED_IN, "User not logged in" }, - { SAR_APPLICATION_NOT_EXISTS, "Application not exist" }, - { SAR_FILE_ALREADY_EXIST, "File already exist" }, - { SAR_NO_ROOM, "No file space" }, - { SAR_FILE_NOT_EXIST, "File not exist" } -}; - - -LPSTR DEVAPI SKF_GetErrorString(ULONG ulError) -{ - return NULL; -} - - +/* e_skf_err.c */ +/* ==================================================================== + * Copyright (c) 1999-2016 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. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * + */ + +/* + * NOTE: this file was auto generated by the mkerr.pl script: any changes + * made to it will be overwritten when the script next updates this file, + * only reason strings will be preserved. + */ + +#include +#include +#include "e_skf_err.h" + +/* BEGIN ERROR CODES */ +#ifndef OPENSSL_NO_ERR + +# define ERR_FUNC(func) ERR_PACK(0,func,0) +# define ERR_REASON(reason) ERR_PACK(0,0,reason) + +static ERR_STRING_DATA ESKF_str_functs[] = { + {ERR_FUNC(ESKF_F_OPEN_APP), "OPEN_APP"}, + {ERR_FUNC(ESKF_F_OPEN_CONTAINER), "OPEN_CONTAINER"}, + {ERR_FUNC(ESKF_F_OPEN_DEV), "OPEN_DEV"}, + {ERR_FUNC(ESKF_F_SET_AUTHKEY), "SET_AUTHKEY"}, + {ERR_FUNC(ESKF_F_SET_USERPIN), "SET_USERPIN"}, + {ERR_FUNC(ESKF_F_SKF_CIPHER), "SKF_CIPHER"}, + {ERR_FUNC(ESKF_F_SKF_CIPHERS), "SKF_CIPHERS"}, + {ERR_FUNC(ESKF_F_SKF_DIGESTS), "SKF_DIGESTS"}, + {ERR_FUNC(ESKF_F_SKF_ENGINE_CTRL), "SKF_ENGINE_CTRL"}, + {ERR_FUNC(ESKF_F_SKF_FINISH), "SKF_FINISH"}, + {ERR_FUNC(ESKF_F_SKF_INIT), "SKF_INIT"}, + {ERR_FUNC(ESKF_F_SKF_INIT_KEY), "SKF_INIT_KEY"}, + {ERR_FUNC(ESKF_F_SKF_LOAD_PUBKEY), "SKF_LOAD_PUBKEY"}, + {ERR_FUNC(ESKF_F_SKF_RAND_BYTES), "SKF_RAND_BYTES"}, + {ERR_FUNC(ESKF_F_SKF_RSA_SIGN), "SKF_RSA_SIGN"}, + {ERR_FUNC(ESKF_F_SKF_SM2_DO_SIGN), "SKF_SM2_DO_SIGN"}, + {ERR_FUNC(ESKF_F_SKF_SM3_FINAL), "SKF_SM3_FINAL"}, + {ERR_FUNC(ESKF_F_SKF_SM3_INIT), "SKF_SM3_INIT"}, + {ERR_FUNC(ESKF_F_SKF_SM3_UPDATE), "SKF_SM3_UPDATE"}, + {0, NULL} +}; + +static ERR_STRING_DATA ESKF_str_reasons[] = { + {ERR_REASON(ESKF_R_NOT_IMPLEMENTED), "not implemented"}, + {0, NULL} +}; + +#endif + +#ifdef ESKF_LIB_NAME +static ERR_STRING_DATA ESKF_lib_name[] = { + {0, ESKF_LIB_NAME}, + {0, NULL} +}; +#endif + +static int ESKF_lib_error_code = 0; +static int ESKF_error_init = 1; + +static void ERR_load_ESKF_strings(void) +{ + if (ESKF_lib_error_code == 0) + ESKF_lib_error_code = ERR_get_next_error_library(); + + if (ESKF_error_init) { + ESKF_error_init = 0; +#ifndef OPENSSL_NO_ERR + ERR_load_strings(ESKF_lib_error_code, ESKF_str_functs); + ERR_load_strings(ESKF_lib_error_code, ESKF_str_reasons); +#endif + +#ifdef ESKF_LIB_NAME + ESKF_lib_name->error = ERR_PACK(ESKF_lib_error_code, 0, 0); + ERR_load_strings(0, ESKF_lib_name); +#endif + } +} + +static void ERR_unload_ESKF_strings(void) +{ + if (ESKF_error_init == 0) { +#ifndef OPENSSL_NO_ERR + ERR_unload_strings(ESKF_lib_error_code, ESKF_str_functs); + ERR_unload_strings(ESKF_lib_error_code, ESKF_str_reasons); +#endif + +#ifdef ESKF_LIB_NAME + ERR_unload_strings(0, ESKF_lib_name); +#endif + ESKF_error_init = 1; + } +} + +static void ERR_ESKF_error(int function, int reason, char *file, int line) +{ + if (ESKF_lib_error_code == 0) + ESKF_lib_error_code = ERR_get_next_error_library(); + ERR_PUT_error(ESKF_lib_error_code, function, reason, file, line); +} diff --git a/engines/e_skf_err.h b/engines/e_skf_err.h index 41aa37a4..dbe02d0b 100644 --- a/engines/e_skf_err.h +++ b/engines/e_skf_err.h @@ -1,75 +1,96 @@ -#ifndef HEADER_SKF_ERR_H -#define HEADER_SKF_ERR_H +/* engines/e_skf_err.h */ +/* ==================================================================== + * Copyright (c) 2015-2016 The GmSSL 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 GmSSL Project. + * (http://gmssl.org/)" + * + * 4. The name "GmSSL Project" must not be used to endorse or promote + * products derived from this software without prior written + * permission. For written permission, please contact + * guanzhi1980@gmail.com. + * + * 5. Products derived from this software may not be called "GmSSL" + * nor may "GmSSL" appear in their names without prior written + * permission of the GmSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the GmSSL Project + * (http://gmssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE GmSSL 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 GmSSL 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. + * ==================================================================== + * + */ +#ifndef HEADER_E_SKF_ERR_H +#define HEADER_E_SKF_ERR_H #ifdef __cplusplus extern "C" { #endif +/* BEGIN ERROR CODES */ +/* + * The following lines are auto generated by the script mkerr.pl. Any changes + * made after this point may be overwritten when the script is next run. + */ +static void ERR_load_ESKF_strings(void); +static void ERR_unload_ESKF_strings(void); +static void ERR_ESKF_error(int function, int reason, char *file, int line); +# define ESKFerr(f,r) ERR_ESKF_error((f),(r),__FILE__,__LINE__) -static void ERR_load_SKF_strings(void); -static void ERR_unload_SKF_strings(void); -static void ERR_SKF_error(int function, int reason, char *file, int line); -# define SKFerr(f,r) ERR_SKF_error((f),(r),__FILE__,__LINE__) - - +/* Error codes for the ESKF functions. */ /* Function codes. */ -#define SKF_F_SKF_RAND 100 - +# define ESKF_F_OPEN_APP 100 +# define ESKF_F_OPEN_CONTAINER 101 +# define ESKF_F_OPEN_DEV 102 +# define ESKF_F_SET_AUTHKEY 103 +# define ESKF_F_SET_USERPIN 104 +# define ESKF_F_SKF_CIPHER 105 +# define ESKF_F_SKF_CIPHERS 106 +# define ESKF_F_SKF_DIGESTS 107 +# define ESKF_F_SKF_ENGINE_CTRL 108 +# define ESKF_F_SKF_FINISH 109 +# define ESKF_F_SKF_INIT 110 +# define ESKF_F_SKF_INIT_KEY 111 +# define ESKF_F_SKF_LOAD_PUBKEY 112 +# define ESKF_F_SKF_RAND_BYTES 113 +# define ESKF_F_SKF_RSA_SIGN 114 +# define ESKF_F_SKF_SM2_DO_SIGN 115 +# define ESKF_F_SKF_SM3_FINAL 116 +# define ESKF_F_SKF_SM3_INIT 117 +# define ESKF_F_SKF_SM3_UPDATE 118 /* Reason codes. */ -#define SKF_R_OK 110 -#define SKF_R_FAIL 101 -#define SKF_R_UNKNOWNERR 102 -#define SKF_R_NOTSUPPORTYETERR 103 -#define SKF_R_FILEERR 104 -#define SKF_R_INVALIDHANDLEERR 105 -#define SKF_R_INVALIDPARAMERR 106 -#define SKF_R_READFILEERR 107 -#define SKF_R_WRITEFILEERR 108 -#define SKF_R_NAMELENERR 109 -#define SKF_R_KEYUSAGEERR 110 -#define SKF_R_MODULUSLENERR 111 -#define SKF_R_NOTINITIALIZEERR 112 -#define SKF_R_OBJERR 113 -#define SKF_R_MEMORYERR 114 -#define SKF_R_TIMEOUTERR 115 -#define SKF_R_INDATALENERR 116 -#define SKF_R_INDATAERR 117 -#define SKF_R_GENRANDERR 118 -#define SKF_R_HASHOBJERR 119 -#define SKF_R_HASHERR 120 -#define SKF_R_GENRSAKEYERR 121 -#define SKF_R_RSAMODULUSLENERR 122 -#define SKF_R_CSPIMPRTPUBKEYERR 123 -#define SKF_R_RSAENCERR 124 -#define SKF_R_RSADECERR 125 -#define SKF_R_HASHNOTEQUALERR 126 -#define SKF_R_KEYNOTFOUNTERR 127 -#define SKF_R_CERTNOTFOUNTERR 128 -#define SKF_R_NOTEXPORTERR 129 -#define SKF_R_DECRYPTPADERR 130 -#define SKF_R_MACLENERR 131 -#define SKF_R_BUFFER_TOO_SMALL 132 -#define SKF_R_KEYINFOTYPEERR 133 -#define SKF_R_NOT_EVENTERR 134 -#define SKF_R_DEVICE_REMOVED 135 -#define SKF_R_PIN_INCORRECT 136 -#define SKF_R_PIN_LOCKED 137 -#define SKF_R_PIN_INVALID 138 -#define SKF_R_PIN_LEN_RANGE 139 -#define SKF_R_USER_ALREADY_LOGGED_IN 140 -#define SKF_R_USER_PIN_NOT_INITIALIZED 141 -#define SKF_R_USER_TYPE_INVALID 142 -#define SKF_R_APPLICATION_NAME_INVALID 143 -#define SKF_R_APPLICATION_EXISTS 144 -#define SKF_R_USER_NOT_LOGGED_IN 145 -#define SKF_R_APPLICATION_NOT_EXISTS 146 -#define SKF_R_FILE_ALREADY_EXIST 147 -#define SKF_R_NO_ROOM 148 -#define SKF_R_FILE_NOT_EXIST 149 - +# define ESKF_R_NOT_IMPLEMENTED 100 #ifdef __cplusplus } diff --git a/crypto/skf/skf_dummy.c b/engines/skf/skf_dummy.c old mode 100644 new mode 100755 similarity index 100% rename from crypto/skf/skf_dummy.c rename to engines/skf/skf_dummy.c diff --git a/crypto/skf/skftest.c b/engines/skf/skftest.c similarity index 100% rename from crypto/skf/skftest.c rename to engines/skf/skftest.c diff --git a/include/openssl/ffx.h b/include/openssl/ffx.h deleted file mode 120000 index 1a873d3f..00000000 --- a/include/openssl/ffx.h +++ /dev/null @@ -1 +0,0 @@ -../../crypto/ffx/ffx.h \ No newline at end of file diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h index 65eb0f45..35f04c8b 120000 --- a/include/openssl/kdf.h +++ b/include/openssl/kdf.h @@ -1 +1 @@ -../../crypto/ecies/kdf.h \ No newline at end of file +../../crypto/kdf/kdf.h \ No newline at end of file diff --git a/include/openssl/skf.h b/include/openssl/skf.h new file mode 120000 index 00000000..399e19b4 --- /dev/null +++ b/include/openssl/skf.h @@ -0,0 +1 @@ +../../crypto/skf/skf.h \ No newline at end of file diff --git a/include/openssl/skf_ex.h b/include/openssl/skf_ex.h new file mode 120000 index 00000000..4a9de0ad --- /dev/null +++ b/include/openssl/skf_ex.h @@ -0,0 +1 @@ +../../crypto/skf/skf_ex.h \ No newline at end of file diff --git a/include/openssl/sm9.h b/include/openssl/sm9.h new file mode 120000 index 00000000..e9898a60 --- /dev/null +++ b/include/openssl/sm9.h @@ -0,0 +1 @@ +../../crypto/sm9/sm9.h \ No newline at end of file diff --git a/ssl/Makefile b/ssl/Makefile index 5de3dbba..a9d00618 100644 --- a/ssl/Makefile +++ b/ssl/Makefile @@ -114,13 +114,15 @@ bio_ssl.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h bio_ssl.o: ../include/openssl/e_os2.h ../include/openssl/ec.h bio_ssl.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h bio_ssl.o: ../include/openssl/err.h ../include/openssl/evp.h -bio_ssl.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +bio_ssl.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +bio_ssl.o: ../include/openssl/kdf.h ../include/openssl/kssl.h bio_ssl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h bio_ssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h bio_ssl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h bio_ssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h bio_ssl.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h bio_ssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h +bio_ssl.o: ../include/openssl/sm2.h ../include/openssl/sm3.h bio_ssl.o: ../include/openssl/srtp.h ../include/openssl/ssl.h bio_ssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h bio_ssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -132,7 +134,8 @@ d1_both.o: ../include/openssl/crypto.h ../include/openssl/dsa.h d1_both.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h d1_both.o: ../include/openssl/ec.h ../include/openssl/ecdh.h d1_both.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -d1_both.o: ../include/openssl/evp.h ../include/openssl/hmac.h +d1_both.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +d1_both.o: ../include/openssl/hmac.h ../include/openssl/kdf.h d1_both.o: ../include/openssl/kssl.h ../include/openssl/lhash.h d1_both.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h d1_both.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -140,7 +143,8 @@ d1_both.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h d1_both.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h d1_both.o: ../include/openssl/pqueue.h ../include/openssl/rand.h d1_both.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -d1_both.o: ../include/openssl/sha.h ../include/openssl/srtp.h +d1_both.o: ../include/openssl/sha.h ../include/openssl/sm2.h +d1_both.o: ../include/openssl/sm3.h ../include/openssl/srtp.h d1_both.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h d1_both.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h d1_both.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -153,7 +157,8 @@ d1_clnt.o: ../include/openssl/dh.h ../include/openssl/dsa.h d1_clnt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h d1_clnt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h d1_clnt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -d1_clnt.o: ../include/openssl/evp.h ../include/openssl/hmac.h +d1_clnt.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +d1_clnt.o: ../include/openssl/hmac.h ../include/openssl/kdf.h d1_clnt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h d1_clnt.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h d1_clnt.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h @@ -162,19 +167,21 @@ d1_clnt.o: ../include/openssl/pem.h ../include/openssl/pem2.h d1_clnt.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h d1_clnt.o: ../include/openssl/rand.h ../include/openssl/rsa.h d1_clnt.o: ../include/openssl/safestack.h ../include/openssl/sha.h +d1_clnt.o: ../include/openssl/sm2.h ../include/openssl/sm3.h d1_clnt.o: ../include/openssl/srtp.h ../include/openssl/ssl.h d1_clnt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h d1_clnt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h d1_clnt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h d1_clnt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_clnt.c -d1_clnt.o: kssl_lcl.h ssl_locl.h +d1_clnt.o: ssl_locl.h d1_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h d1_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h d1_lib.o: ../include/openssl/crypto.h ../include/openssl/dsa.h d1_lib.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h d1_lib.o: ../include/openssl/ec.h ../include/openssl/ecdh.h d1_lib.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -d1_lib.o: ../include/openssl/evp.h ../include/openssl/hmac.h +d1_lib.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +d1_lib.o: ../include/openssl/hmac.h ../include/openssl/kdf.h d1_lib.o: ../include/openssl/kssl.h ../include/openssl/lhash.h d1_lib.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h d1_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -182,6 +189,7 @@ d1_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h d1_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h d1_lib.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h d1_lib.o: ../include/openssl/safestack.h ../include/openssl/sha.h +d1_lib.o: ../include/openssl/sm2.h ../include/openssl/sm3.h d1_lib.o: ../include/openssl/srtp.h ../include/openssl/ssl.h d1_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h d1_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -194,7 +202,8 @@ d1_meth.o: ../include/openssl/crypto.h ../include/openssl/dsa.h d1_meth.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h d1_meth.o: ../include/openssl/ec.h ../include/openssl/ecdh.h d1_meth.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -d1_meth.o: ../include/openssl/evp.h ../include/openssl/hmac.h +d1_meth.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +d1_meth.o: ../include/openssl/hmac.h ../include/openssl/kdf.h d1_meth.o: ../include/openssl/kssl.h ../include/openssl/lhash.h d1_meth.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h d1_meth.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -202,6 +211,7 @@ d1_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h d1_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h d1_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h d1_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h +d1_meth.o: ../include/openssl/sm2.h ../include/openssl/sm3.h d1_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h d1_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h d1_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -214,7 +224,8 @@ d1_pkt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h d1_pkt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h d1_pkt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h d1_pkt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -d1_pkt.o: ../include/openssl/evp.h ../include/openssl/hmac.h +d1_pkt.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +d1_pkt.o: ../include/openssl/hmac.h ../include/openssl/kdf.h d1_pkt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h d1_pkt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h d1_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -222,7 +233,8 @@ d1_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h d1_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h d1_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h d1_pkt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -d1_pkt.o: ../include/openssl/sha.h ../include/openssl/srtp.h +d1_pkt.o: ../include/openssl/sha.h ../include/openssl/sm2.h +d1_pkt.o: ../include/openssl/sm3.h ../include/openssl/srtp.h d1_pkt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h d1_pkt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h d1_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -234,7 +246,8 @@ d1_srtp.o: ../include/openssl/crypto.h ../include/openssl/dsa.h d1_srtp.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h d1_srtp.o: ../include/openssl/ec.h ../include/openssl/ecdh.h d1_srtp.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -d1_srtp.o: ../include/openssl/evp.h ../include/openssl/hmac.h +d1_srtp.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +d1_srtp.o: ../include/openssl/hmac.h ../include/openssl/kdf.h d1_srtp.o: ../include/openssl/kssl.h ../include/openssl/lhash.h d1_srtp.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h d1_srtp.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -242,6 +255,7 @@ d1_srtp.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h d1_srtp.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h d1_srtp.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h d1_srtp.o: ../include/openssl/safestack.h ../include/openssl/sha.h +d1_srtp.o: ../include/openssl/sm2.h ../include/openssl/sm3.h d1_srtp.o: ../include/openssl/srtp.h ../include/openssl/ssl.h d1_srtp.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h d1_srtp.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -255,7 +269,8 @@ d1_srvr.o: ../include/openssl/dh.h ../include/openssl/dsa.h d1_srvr.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h d1_srvr.o: ../include/openssl/ec.h ../include/openssl/ecdh.h d1_srvr.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -d1_srvr.o: ../include/openssl/evp.h ../include/openssl/hmac.h +d1_srvr.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +d1_srvr.o: ../include/openssl/hmac.h ../include/openssl/kdf.h d1_srvr.o: ../include/openssl/kssl.h ../include/openssl/lhash.h d1_srvr.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h d1_srvr.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h @@ -264,38 +279,152 @@ d1_srvr.o: ../include/openssl/pem.h ../include/openssl/pem2.h d1_srvr.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h d1_srvr.o: ../include/openssl/rand.h ../include/openssl/rsa.h d1_srvr.o: ../include/openssl/safestack.h ../include/openssl/sha.h +d1_srvr.o: ../include/openssl/sm2.h ../include/openssl/sm3.h d1_srvr.o: ../include/openssl/srtp.h ../include/openssl/ssl.h d1_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h d1_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h d1_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h d1_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_srvr.c d1_srvr.o: ssl_locl.h +gm_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h +gm_clnt.o: ../include/openssl/buffer.h ../include/openssl/comp.h +gm_clnt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h +gm_clnt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h +gm_clnt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h +gm_clnt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h +gm_clnt.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +gm_clnt.o: ../include/openssl/hmac.h ../include/openssl/kdf.h +gm_clnt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h +gm_clnt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +gm_clnt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +gm_clnt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +gm_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +gm_clnt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h +gm_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +gm_clnt.o: ../include/openssl/sha.h ../include/openssl/sm2.h +gm_clnt.o: ../include/openssl/sm3.h ../include/openssl/srtp.h +gm_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h +gm_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h +gm_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +gm_clnt.o: ../include/openssl/tls1.h ../include/openssl/x509.h +gm_clnt.o: ../include/openssl/x509_vfy.h gm_clnt.c ssl_locl.h +gm_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h +gm_enc.o: ../include/openssl/buffer.h ../include/openssl/comp.h +gm_enc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h +gm_enc.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h +gm_enc.o: ../include/openssl/ec.h ../include/openssl/ecdh.h +gm_enc.o: ../include/openssl/ecdsa.h ../include/openssl/err.h +gm_enc.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +gm_enc.o: ../include/openssl/hmac.h ../include/openssl/kdf.h +gm_enc.o: ../include/openssl/kssl.h ../include/openssl/lhash.h +gm_enc.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +gm_enc.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +gm_enc.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +gm_enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +gm_enc.o: ../include/openssl/pqueue.h ../include/openssl/rand.h +gm_enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +gm_enc.o: ../include/openssl/sha.h ../include/openssl/sm2.h +gm_enc.o: ../include/openssl/sm3.h ../include/openssl/srtp.h +gm_enc.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h +gm_enc.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h +gm_enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +gm_enc.o: ../include/openssl/tls1.h ../include/openssl/x509.h +gm_enc.o: ../include/openssl/x509_vfy.h gm_enc.c ssl_locl.h +gm_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h +gm_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h +gm_lib.o: ../include/openssl/crypto.h ../include/openssl/dsa.h +gm_lib.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h +gm_lib.o: ../include/openssl/ec.h ../include/openssl/ecdh.h +gm_lib.o: ../include/openssl/ecdsa.h ../include/openssl/err.h +gm_lib.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +gm_lib.o: ../include/openssl/hmac.h ../include/openssl/kdf.h +gm_lib.o: ../include/openssl/kssl.h ../include/openssl/lhash.h +gm_lib.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +gm_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +gm_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +gm_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +gm_lib.o: ../include/openssl/pqueue.h ../include/openssl/rand.h +gm_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +gm_lib.o: ../include/openssl/sha.h ../include/openssl/sm2.h +gm_lib.o: ../include/openssl/sm3.h ../include/openssl/srtp.h +gm_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h +gm_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h +gm_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +gm_lib.o: ../include/openssl/tls1.h ../include/openssl/x509.h +gm_lib.o: ../include/openssl/x509_vfy.h gm_lib.c ssl_locl.h +gm_meth.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h +gm_meth.o: ../include/openssl/buffer.h ../include/openssl/comp.h +gm_meth.o: ../include/openssl/crypto.h ../include/openssl/dsa.h +gm_meth.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h +gm_meth.o: ../include/openssl/ec.h ../include/openssl/ecdh.h +gm_meth.o: ../include/openssl/ecdsa.h ../include/openssl/err.h +gm_meth.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +gm_meth.o: ../include/openssl/hmac.h ../include/openssl/kdf.h +gm_meth.o: ../include/openssl/kssl.h ../include/openssl/lhash.h +gm_meth.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +gm_meth.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +gm_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +gm_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +gm_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h +gm_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h +gm_meth.o: ../include/openssl/sm2.h ../include/openssl/sm3.h +gm_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h +gm_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h +gm_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h +gm_meth.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h +gm_meth.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h gm_meth.c +gm_meth.o: ssl_locl.h +gm_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h +gm_srvr.o: ../include/openssl/buffer.h ../include/openssl/comp.h +gm_srvr.o: ../include/openssl/crypto.h ../include/openssl/dsa.h +gm_srvr.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h +gm_srvr.o: ../include/openssl/ec.h ../include/openssl/ecdh.h +gm_srvr.o: ../include/openssl/ecdsa.h ../include/openssl/err.h +gm_srvr.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +gm_srvr.o: ../include/openssl/hmac.h ../include/openssl/kdf.h +gm_srvr.o: ../include/openssl/kssl.h ../include/openssl/lhash.h +gm_srvr.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +gm_srvr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +gm_srvr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +gm_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +gm_srvr.o: ../include/openssl/pqueue.h ../include/openssl/rand.h +gm_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +gm_srvr.o: ../include/openssl/sha.h ../include/openssl/sm2.h +gm_srvr.o: ../include/openssl/sm3.h ../include/openssl/srtp.h +gm_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h +gm_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h +gm_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +gm_srvr.o: ../include/openssl/tls1.h ../include/openssl/x509.h +gm_srvr.o: ../include/openssl/x509_vfy.h gm_srvr.c ssl_locl.h kssl.o: ../include/openssl/asn1.h ../include/openssl/bio.h kssl.o: ../include/openssl/buffer.h ../include/openssl/comp.h kssl.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h kssl.o: ../include/openssl/e_os2.h ../include/openssl/ec.h kssl.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -kssl.o: ../include/openssl/evp.h ../include/openssl/hmac.h -kssl.o: ../include/openssl/krb5_asn.h ../include/openssl/kssl.h -kssl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -kssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -kssl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -kssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h -kssl.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -kssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h -kssl.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -kssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -kssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -kssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -kssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h kssl.c -kssl.o: kssl_lcl.h +kssl.o: ../include/openssl/err.h ../include/openssl/evp.h +kssl.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +kssl.o: ../include/openssl/kdf.h ../include/openssl/krb5_asn.h +kssl.o: ../include/openssl/kssl.h ../include/openssl/lhash.h +kssl.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +kssl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +kssl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +kssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +kssl.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h +kssl.o: ../include/openssl/sha.h ../include/openssl/sm2.h +kssl.o: ../include/openssl/sm3.h ../include/openssl/srtp.h +kssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h +kssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h +kssl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +kssl.o: ../include/openssl/tls1.h ../include/openssl/x509.h +kssl.o: ../include/openssl/x509_vfy.h kssl.c kssl_lcl.h s23_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h s23_clnt.o: ../include/openssl/buffer.h ../include/openssl/comp.h s23_clnt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h s23_clnt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s23_clnt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s23_clnt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s23_clnt.o: ../include/openssl/evp.h ../include/openssl/hmac.h +s23_clnt.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s23_clnt.o: ../include/openssl/hmac.h ../include/openssl/kdf.h s23_clnt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h s23_clnt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s23_clnt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -303,7 +432,8 @@ s23_clnt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s23_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s23_clnt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h s23_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s23_clnt.o: ../include/openssl/sha.h ../include/openssl/srtp.h +s23_clnt.o: ../include/openssl/sha.h ../include/openssl/sm2.h +s23_clnt.o: ../include/openssl/sm3.h ../include/openssl/srtp.h s23_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h s23_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h s23_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -315,7 +445,8 @@ s23_lib.o: ../include/openssl/crypto.h ../include/openssl/dsa.h s23_lib.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s23_lib.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s23_lib.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s23_lib.o: ../include/openssl/evp.h ../include/openssl/hmac.h +s23_lib.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s23_lib.o: ../include/openssl/hmac.h ../include/openssl/kdf.h s23_lib.o: ../include/openssl/kssl.h ../include/openssl/lhash.h s23_lib.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s23_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -323,6 +454,7 @@ s23_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s23_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s23_lib.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h s23_lib.o: ../include/openssl/safestack.h ../include/openssl/sha.h +s23_lib.o: ../include/openssl/sm2.h ../include/openssl/sm3.h s23_lib.o: ../include/openssl/srtp.h ../include/openssl/ssl.h s23_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h s23_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -335,7 +467,8 @@ s23_meth.o: ../include/openssl/crypto.h ../include/openssl/dsa.h s23_meth.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s23_meth.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s23_meth.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s23_meth.o: ../include/openssl/evp.h ../include/openssl/hmac.h +s23_meth.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s23_meth.o: ../include/openssl/hmac.h ../include/openssl/kdf.h s23_meth.o: ../include/openssl/kssl.h ../include/openssl/lhash.h s23_meth.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s23_meth.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -343,6 +476,7 @@ s23_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s23_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s23_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h s23_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h +s23_meth.o: ../include/openssl/sm2.h ../include/openssl/sm3.h s23_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h s23_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h s23_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -355,7 +489,8 @@ s23_pkt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h s23_pkt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s23_pkt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s23_pkt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s23_pkt.o: ../include/openssl/evp.h ../include/openssl/hmac.h +s23_pkt.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s23_pkt.o: ../include/openssl/hmac.h ../include/openssl/kdf.h s23_pkt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h s23_pkt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s23_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -363,6 +498,7 @@ s23_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s23_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s23_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h s23_pkt.o: ../include/openssl/safestack.h ../include/openssl/sha.h +s23_pkt.o: ../include/openssl/sm2.h ../include/openssl/sm3.h s23_pkt.o: ../include/openssl/srtp.h ../include/openssl/ssl.h s23_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h s23_pkt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -375,7 +511,8 @@ s23_srvr.o: ../include/openssl/crypto.h ../include/openssl/dsa.h s23_srvr.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s23_srvr.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s23_srvr.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s23_srvr.o: ../include/openssl/evp.h ../include/openssl/hmac.h +s23_srvr.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s23_srvr.o: ../include/openssl/hmac.h ../include/openssl/kdf.h s23_srvr.o: ../include/openssl/kssl.h ../include/openssl/lhash.h s23_srvr.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s23_srvr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -383,7 +520,8 @@ s23_srvr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s23_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s23_srvr.o: ../include/openssl/pqueue.h ../include/openssl/rand.h s23_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s23_srvr.o: ../include/openssl/sha.h ../include/openssl/srtp.h +s23_srvr.o: ../include/openssl/sha.h ../include/openssl/sm2.h +s23_srvr.o: ../include/openssl/sm3.h ../include/openssl/srtp.h s23_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h s23_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h s23_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -395,7 +533,8 @@ s2_clnt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h s2_clnt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s2_clnt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s2_clnt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s2_clnt.o: ../include/openssl/evp.h ../include/openssl/hmac.h +s2_clnt.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s2_clnt.o: ../include/openssl/hmac.h ../include/openssl/kdf.h s2_clnt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h s2_clnt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s2_clnt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -403,7 +542,8 @@ s2_clnt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s2_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s2_clnt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h s2_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s2_clnt.o: ../include/openssl/sha.h ../include/openssl/srtp.h +s2_clnt.o: ../include/openssl/sha.h ../include/openssl/sm2.h +s2_clnt.o: ../include/openssl/sm3.h ../include/openssl/srtp.h s2_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h s2_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h s2_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -415,7 +555,8 @@ s2_enc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h s2_enc.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s2_enc.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s2_enc.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s2_enc.o: ../include/openssl/evp.h ../include/openssl/hmac.h +s2_enc.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s2_enc.o: ../include/openssl/hmac.h ../include/openssl/kdf.h s2_enc.o: ../include/openssl/kssl.h ../include/openssl/lhash.h s2_enc.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s2_enc.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -423,6 +564,7 @@ s2_enc.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s2_enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s2_enc.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h s2_enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h +s2_enc.o: ../include/openssl/sm2.h ../include/openssl/sm3.h s2_enc.o: ../include/openssl/srtp.h ../include/openssl/ssl.h s2_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h s2_enc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -435,7 +577,8 @@ s2_lib.o: ../include/openssl/crypto.h ../include/openssl/dsa.h s2_lib.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s2_lib.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s2_lib.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s2_lib.o: ../include/openssl/evp.h ../include/openssl/hmac.h +s2_lib.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s2_lib.o: ../include/openssl/hmac.h ../include/openssl/kdf.h s2_lib.o: ../include/openssl/kssl.h ../include/openssl/lhash.h s2_lib.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h s2_lib.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h @@ -443,7 +586,8 @@ s2_lib.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h s2_lib.o: ../include/openssl/pem.h ../include/openssl/pem2.h s2_lib.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h s2_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s2_lib.o: ../include/openssl/sha.h ../include/openssl/srtp.h +s2_lib.o: ../include/openssl/sha.h ../include/openssl/sm2.h +s2_lib.o: ../include/openssl/sm3.h ../include/openssl/srtp.h s2_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h s2_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h s2_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -455,7 +599,8 @@ s2_meth.o: ../include/openssl/crypto.h ../include/openssl/dsa.h s2_meth.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s2_meth.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s2_meth.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s2_meth.o: ../include/openssl/evp.h ../include/openssl/hmac.h +s2_meth.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s2_meth.o: ../include/openssl/hmac.h ../include/openssl/kdf.h s2_meth.o: ../include/openssl/kssl.h ../include/openssl/lhash.h s2_meth.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s2_meth.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -463,6 +608,7 @@ s2_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s2_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s2_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h s2_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h +s2_meth.o: ../include/openssl/sm2.h ../include/openssl/sm3.h s2_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h s2_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h s2_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -475,7 +621,8 @@ s2_pkt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h s2_pkt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s2_pkt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s2_pkt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s2_pkt.o: ../include/openssl/evp.h ../include/openssl/hmac.h +s2_pkt.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s2_pkt.o: ../include/openssl/hmac.h ../include/openssl/kdf.h s2_pkt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h s2_pkt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s2_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -483,6 +630,7 @@ s2_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s2_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s2_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h s2_pkt.o: ../include/openssl/safestack.h ../include/openssl/sha.h +s2_pkt.o: ../include/openssl/sm2.h ../include/openssl/sm3.h s2_pkt.o: ../include/openssl/srtp.h ../include/openssl/ssl.h s2_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h s2_pkt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -496,7 +644,8 @@ s2_srvr.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h s2_srvr.o: ../include/openssl/e_os2.h ../include/openssl/ec.h s2_srvr.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h s2_srvr.o: ../include/openssl/err.h ../include/openssl/evp.h -s2_srvr.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +s2_srvr.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +s2_srvr.o: ../include/openssl/kdf.h ../include/openssl/kssl.h s2_srvr.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h s2_srvr.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h s2_srvr.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h @@ -504,6 +653,7 @@ s2_srvr.o: ../include/openssl/pem.h ../include/openssl/pem2.h s2_srvr.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h s2_srvr.o: ../include/openssl/rand.h ../include/openssl/rsa.h s2_srvr.o: ../include/openssl/safestack.h ../include/openssl/sha.h +s2_srvr.o: ../include/openssl/sm2.h ../include/openssl/sm3.h s2_srvr.o: ../include/openssl/srtp.h ../include/openssl/ssl.h s2_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h s2_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -516,7 +666,8 @@ s3_both.o: ../include/openssl/crypto.h ../include/openssl/dsa.h s3_both.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s3_both.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s3_both.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s3_both.o: ../include/openssl/evp.h ../include/openssl/hmac.h +s3_both.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s3_both.o: ../include/openssl/hmac.h ../include/openssl/kdf.h s3_both.o: ../include/openssl/kssl.h ../include/openssl/lhash.h s3_both.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s3_both.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -524,7 +675,8 @@ s3_both.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s3_both.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s3_both.o: ../include/openssl/pqueue.h ../include/openssl/rand.h s3_both.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s3_both.o: ../include/openssl/sha.h ../include/openssl/srtp.h +s3_both.o: ../include/openssl/sha.h ../include/openssl/sm2.h +s3_both.o: ../include/openssl/sm3.h ../include/openssl/srtp.h s3_both.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h s3_both.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h s3_both.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -537,7 +689,8 @@ s3_cbc.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h s3_cbc.o: ../include/openssl/e_os2.h ../include/openssl/ec.h s3_cbc.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h s3_cbc.o: ../include/openssl/err.h ../include/openssl/evp.h -s3_cbc.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +s3_cbc.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +s3_cbc.o: ../include/openssl/kdf.h ../include/openssl/kssl.h s3_cbc.o: ../include/openssl/lhash.h ../include/openssl/md5.h s3_cbc.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s3_cbc.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -545,6 +698,7 @@ s3_cbc.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s3_cbc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s3_cbc.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h s3_cbc.o: ../include/openssl/safestack.h ../include/openssl/sha.h +s3_cbc.o: ../include/openssl/sm2.h ../include/openssl/sm3.h s3_cbc.o: ../include/openssl/srtp.h ../include/openssl/ssl.h s3_cbc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h s3_cbc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -559,7 +713,8 @@ s3_clnt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s3_clnt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s3_clnt.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h s3_clnt.o: ../include/openssl/err.h ../include/openssl/evp.h -s3_clnt.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +s3_clnt.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +s3_clnt.o: ../include/openssl/kdf.h ../include/openssl/kssl.h s3_clnt.o: ../include/openssl/lhash.h ../include/openssl/md5.h s3_clnt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s3_clnt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -567,7 +722,8 @@ s3_clnt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s3_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s3_clnt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h s3_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s3_clnt.o: ../include/openssl/sha.h ../include/openssl/srtp.h +s3_clnt.o: ../include/openssl/sha.h ../include/openssl/sm2.h +s3_clnt.o: ../include/openssl/sm3.h ../include/openssl/srtp.h s3_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h s3_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h s3_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -579,7 +735,8 @@ s3_enc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h s3_enc.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s3_enc.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s3_enc.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s3_enc.o: ../include/openssl/evp.h ../include/openssl/hmac.h +s3_enc.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s3_enc.o: ../include/openssl/hmac.h ../include/openssl/kdf.h s3_enc.o: ../include/openssl/kssl.h ../include/openssl/lhash.h s3_enc.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h s3_enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h @@ -587,7 +744,8 @@ s3_enc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h s3_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h s3_enc.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h s3_enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s3_enc.o: ../include/openssl/sha.h ../include/openssl/srtp.h +s3_enc.o: ../include/openssl/sha.h ../include/openssl/sm2.h +s3_enc.o: ../include/openssl/sm3.h ../include/openssl/srtp.h s3_enc.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h s3_enc.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h s3_enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -600,7 +758,8 @@ s3_lib.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h s3_lib.o: ../include/openssl/e_os2.h ../include/openssl/ec.h s3_lib.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h s3_lib.o: ../include/openssl/err.h ../include/openssl/evp.h -s3_lib.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +s3_lib.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +s3_lib.o: ../include/openssl/kdf.h ../include/openssl/kssl.h s3_lib.o: ../include/openssl/lhash.h ../include/openssl/md5.h s3_lib.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s3_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -608,6 +767,7 @@ s3_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s3_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s3_lib.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h s3_lib.o: ../include/openssl/safestack.h ../include/openssl/sha.h +s3_lib.o: ../include/openssl/sm2.h ../include/openssl/sm3.h s3_lib.o: ../include/openssl/srtp.h ../include/openssl/ssl.h s3_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h s3_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -620,7 +780,8 @@ s3_meth.o: ../include/openssl/crypto.h ../include/openssl/dsa.h s3_meth.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s3_meth.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s3_meth.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s3_meth.o: ../include/openssl/evp.h ../include/openssl/hmac.h +s3_meth.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s3_meth.o: ../include/openssl/hmac.h ../include/openssl/kdf.h s3_meth.o: ../include/openssl/kssl.h ../include/openssl/lhash.h s3_meth.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s3_meth.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -628,6 +789,7 @@ s3_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s3_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s3_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h s3_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h +s3_meth.o: ../include/openssl/sm2.h ../include/openssl/sm3.h s3_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h s3_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h s3_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -640,7 +802,8 @@ s3_pkt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h s3_pkt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h s3_pkt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h s3_pkt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s3_pkt.o: ../include/openssl/evp.h ../include/openssl/hmac.h +s3_pkt.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +s3_pkt.o: ../include/openssl/hmac.h ../include/openssl/kdf.h s3_pkt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h s3_pkt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h s3_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -648,7 +811,8 @@ s3_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h s3_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h s3_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h s3_pkt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s3_pkt.o: ../include/openssl/sha.h ../include/openssl/srtp.h +s3_pkt.o: ../include/openssl/sha.h ../include/openssl/sm2.h +s3_pkt.o: ../include/openssl/sm3.h ../include/openssl/srtp.h s3_pkt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h s3_pkt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h s3_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -662,28 +826,30 @@ s3_srvr.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h s3_srvr.o: ../include/openssl/e_os2.h ../include/openssl/ec.h s3_srvr.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h s3_srvr.o: ../include/openssl/err.h ../include/openssl/evp.h -s3_srvr.o: ../include/openssl/hmac.h ../include/openssl/krb5_asn.h -s3_srvr.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s3_srvr.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h -s3_srvr.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -s3_srvr.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -s3_srvr.o: ../include/openssl/pem.h ../include/openssl/pem2.h -s3_srvr.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -s3_srvr.o: ../include/openssl/rand.h ../include/openssl/rsa.h -s3_srvr.o: ../include/openssl/safestack.h ../include/openssl/sha.h -s3_srvr.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -s3_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -s3_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -s3_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -s3_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h kssl_lcl.h -s3_srvr.o: s3_srvr.c ssl_locl.h +s3_srvr.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +s3_srvr.o: ../include/openssl/kdf.h ../include/openssl/kssl.h +s3_srvr.o: ../include/openssl/lhash.h ../include/openssl/md5.h +s3_srvr.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +s3_srvr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +s3_srvr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +s3_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +s3_srvr.o: ../include/openssl/pqueue.h ../include/openssl/rand.h +s3_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +s3_srvr.o: ../include/openssl/sha.h ../include/openssl/sm2.h +s3_srvr.o: ../include/openssl/sm3.h ../include/openssl/srtp.h +s3_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h +s3_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h +s3_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +s3_srvr.o: ../include/openssl/tls1.h ../include/openssl/x509.h +s3_srvr.o: ../include/openssl/x509_vfy.h kssl_lcl.h s3_srvr.c ssl_locl.h ssl_algs.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h ssl_algs.o: ../include/openssl/buffer.h ../include/openssl/comp.h ssl_algs.o: ../include/openssl/crypto.h ../include/openssl/dsa.h ssl_algs.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h ssl_algs.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ssl_algs.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -ssl_algs.o: ../include/openssl/evp.h ../include/openssl/hmac.h +ssl_algs.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +ssl_algs.o: ../include/openssl/hmac.h ../include/openssl/kdf.h ssl_algs.o: ../include/openssl/kssl.h ../include/openssl/lhash.h ssl_algs.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h ssl_algs.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -691,6 +857,7 @@ ssl_algs.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h ssl_algs.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h ssl_algs.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h ssl_algs.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ssl_algs.o: ../include/openssl/sm2.h ../include/openssl/sm3.h ssl_algs.o: ../include/openssl/srtp.h ../include/openssl/ssl.h ssl_algs.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h ssl_algs.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -704,14 +871,16 @@ ssl_asn1.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h ssl_asn1.o: ../include/openssl/e_os2.h ../include/openssl/ec.h ssl_asn1.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h ssl_asn1.o: ../include/openssl/err.h ../include/openssl/evp.h -ssl_asn1.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +ssl_asn1.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +ssl_asn1.o: ../include/openssl/kdf.h ../include/openssl/kssl.h ssl_asn1.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h ssl_asn1.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h ssl_asn1.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h ssl_asn1.o: ../include/openssl/pem.h ../include/openssl/pem2.h ssl_asn1.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h ssl_asn1.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -ssl_asn1.o: ../include/openssl/sha.h ../include/openssl/srtp.h +ssl_asn1.o: ../include/openssl/sha.h ../include/openssl/sm2.h +ssl_asn1.o: ../include/openssl/sm3.h ../include/openssl/srtp.h ssl_asn1.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h ssl_asn1.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h ssl_asn1.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -725,7 +894,8 @@ ssl_cert.o: ../include/openssl/dh.h ../include/openssl/dsa.h ssl_cert.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h ssl_cert.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ssl_cert.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -ssl_cert.o: ../include/openssl/evp.h ../include/openssl/hmac.h +ssl_cert.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +ssl_cert.o: ../include/openssl/hmac.h ../include/openssl/kdf.h ssl_cert.o: ../include/openssl/kssl.h ../include/openssl/lhash.h ssl_cert.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h ssl_cert.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -733,6 +903,7 @@ ssl_cert.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h ssl_cert.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h ssl_cert.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h ssl_cert.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ssl_cert.o: ../include/openssl/sm2.h ../include/openssl/sm3.h ssl_cert.o: ../include/openssl/srtp.h ../include/openssl/ssl.h ssl_cert.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h ssl_cert.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -746,14 +917,16 @@ ssl_ciph.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h ssl_ciph.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ssl_ciph.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h ssl_ciph.o: ../include/openssl/err.h ../include/openssl/evp.h -ssl_ciph.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +ssl_ciph.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +ssl_ciph.o: ../include/openssl/kdf.h ../include/openssl/kssl.h ssl_ciph.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h ssl_ciph.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h ssl_ciph.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h ssl_ciph.o: ../include/openssl/pem.h ../include/openssl/pem2.h ssl_ciph.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h ssl_ciph.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -ssl_ciph.o: ../include/openssl/sha.h ../include/openssl/srtp.h +ssl_ciph.o: ../include/openssl/sha.h ../include/openssl/sm2.h +ssl_ciph.o: ../include/openssl/sm3.h ../include/openssl/srtp.h ssl_ciph.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h ssl_ciph.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h ssl_ciph.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -766,7 +939,8 @@ ssl_conf.o: ../include/openssl/dh.h ../include/openssl/dsa.h ssl_conf.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h ssl_conf.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ssl_conf.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -ssl_conf.o: ../include/openssl/evp.h ../include/openssl/hmac.h +ssl_conf.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +ssl_conf.o: ../include/openssl/hmac.h ../include/openssl/kdf.h ssl_conf.o: ../include/openssl/kssl.h ../include/openssl/lhash.h ssl_conf.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h ssl_conf.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -774,6 +948,7 @@ ssl_conf.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h ssl_conf.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h ssl_conf.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h ssl_conf.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ssl_conf.o: ../include/openssl/sm2.h ../include/openssl/sm3.h ssl_conf.o: ../include/openssl/srtp.h ../include/openssl/ssl.h ssl_conf.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h ssl_conf.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -786,13 +961,15 @@ ssl_err.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h ssl_err.o: ../include/openssl/e_os2.h ../include/openssl/ec.h ssl_err.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h ssl_err.o: ../include/openssl/err.h ../include/openssl/evp.h -ssl_err.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +ssl_err.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +ssl_err.o: ../include/openssl/kdf.h ../include/openssl/kssl.h ssl_err.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h ssl_err.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h ssl_err.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h ssl_err.o: ../include/openssl/pem.h ../include/openssl/pem2.h ssl_err.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h ssl_err.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ssl_err.o: ../include/openssl/sm2.h ../include/openssl/sm3.h ssl_err.o: ../include/openssl/srtp.h ../include/openssl/ssl.h ssl_err.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h ssl_err.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -804,13 +981,15 @@ ssl_err2.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h ssl_err2.o: ../include/openssl/e_os2.h ../include/openssl/ec.h ssl_err2.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h ssl_err2.o: ../include/openssl/err.h ../include/openssl/evp.h -ssl_err2.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +ssl_err2.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +ssl_err2.o: ../include/openssl/kdf.h ../include/openssl/kssl.h ssl_err2.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h ssl_err2.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h ssl_err2.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h ssl_err2.o: ../include/openssl/pem.h ../include/openssl/pem2.h ssl_err2.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h ssl_err2.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ssl_err2.o: ../include/openssl/sm2.h ../include/openssl/sm3.h ssl_err2.o: ../include/openssl/srtp.h ../include/openssl/ssl.h ssl_err2.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h ssl_err2.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -824,7 +1003,8 @@ ssl_lib.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h ssl_lib.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ssl_lib.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h ssl_lib.o: ../include/openssl/err.h ../include/openssl/evp.h -ssl_lib.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +ssl_lib.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +ssl_lib.o: ../include/openssl/kdf.h ../include/openssl/kssl.h ssl_lib.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h ssl_lib.o: ../include/openssl/objects.h ../include/openssl/ocsp.h ssl_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -832,7 +1012,8 @@ ssl_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h ssl_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h ssl_lib.o: ../include/openssl/pqueue.h ../include/openssl/rand.h ssl_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -ssl_lib.o: ../include/openssl/sha.h ../include/openssl/srtp.h +ssl_lib.o: ../include/openssl/sha.h ../include/openssl/sm2.h +ssl_lib.o: ../include/openssl/sm3.h ../include/openssl/srtp.h ssl_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h ssl_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h ssl_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -845,7 +1026,8 @@ ssl_rsa.o: ../include/openssl/crypto.h ../include/openssl/dsa.h ssl_rsa.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h ssl_rsa.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ssl_rsa.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -ssl_rsa.o: ../include/openssl/evp.h ../include/openssl/hmac.h +ssl_rsa.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +ssl_rsa.o: ../include/openssl/hmac.h ../include/openssl/kdf.h ssl_rsa.o: ../include/openssl/kssl.h ../include/openssl/lhash.h ssl_rsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h ssl_rsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -853,6 +1035,7 @@ ssl_rsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h ssl_rsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h ssl_rsa.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h ssl_rsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ssl_rsa.o: ../include/openssl/sm2.h ../include/openssl/sm3.h ssl_rsa.o: ../include/openssl/srtp.h ../include/openssl/ssl.h ssl_rsa.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h ssl_rsa.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -866,7 +1049,8 @@ ssl_sess.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h ssl_sess.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ssl_sess.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h ssl_sess.o: ../include/openssl/err.h ../include/openssl/evp.h -ssl_sess.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +ssl_sess.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +ssl_sess.o: ../include/openssl/kdf.h ../include/openssl/kssl.h ssl_sess.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h ssl_sess.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h ssl_sess.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h @@ -874,6 +1058,7 @@ ssl_sess.o: ../include/openssl/pem.h ../include/openssl/pem2.h ssl_sess.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h ssl_sess.o: ../include/openssl/rand.h ../include/openssl/rsa.h ssl_sess.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ssl_sess.o: ../include/openssl/sm2.h ../include/openssl/sm3.h ssl_sess.o: ../include/openssl/srtp.h ../include/openssl/ssl.h ssl_sess.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h ssl_sess.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -886,7 +1071,8 @@ ssl_stat.o: ../include/openssl/crypto.h ../include/openssl/dsa.h ssl_stat.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h ssl_stat.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ssl_stat.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -ssl_stat.o: ../include/openssl/evp.h ../include/openssl/hmac.h +ssl_stat.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +ssl_stat.o: ../include/openssl/hmac.h ../include/openssl/kdf.h ssl_stat.o: ../include/openssl/kssl.h ../include/openssl/lhash.h ssl_stat.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h ssl_stat.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -894,6 +1080,7 @@ ssl_stat.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h ssl_stat.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h ssl_stat.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h ssl_stat.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ssl_stat.o: ../include/openssl/sm2.h ../include/openssl/sm3.h ssl_stat.o: ../include/openssl/srtp.h ../include/openssl/ssl.h ssl_stat.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h ssl_stat.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -906,7 +1093,8 @@ ssl_txt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h ssl_txt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h ssl_txt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ssl_txt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -ssl_txt.o: ../include/openssl/evp.h ../include/openssl/hmac.h +ssl_txt.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +ssl_txt.o: ../include/openssl/hmac.h ../include/openssl/kdf.h ssl_txt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h ssl_txt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h ssl_txt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -914,6 +1102,7 @@ ssl_txt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h ssl_txt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h ssl_txt.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h ssl_txt.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ssl_txt.o: ../include/openssl/sm2.h ../include/openssl/sm3.h ssl_txt.o: ../include/openssl/srtp.h ../include/openssl/ssl.h ssl_txt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h ssl_txt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -926,7 +1115,8 @@ ssl_utst.o: ../include/openssl/crypto.h ../include/openssl/dsa.h ssl_utst.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h ssl_utst.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ssl_utst.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -ssl_utst.o: ../include/openssl/evp.h ../include/openssl/hmac.h +ssl_utst.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +ssl_utst.o: ../include/openssl/hmac.h ../include/openssl/kdf.h ssl_utst.o: ../include/openssl/kssl.h ../include/openssl/lhash.h ssl_utst.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h ssl_utst.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -934,6 +1124,7 @@ ssl_utst.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h ssl_utst.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h ssl_utst.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h ssl_utst.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ssl_utst.o: ../include/openssl/sm2.h ../include/openssl/sm3.h ssl_utst.o: ../include/openssl/srtp.h ../include/openssl/ssl.h ssl_utst.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h ssl_utst.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -946,7 +1137,8 @@ t1_clnt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h t1_clnt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h t1_clnt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h t1_clnt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -t1_clnt.o: ../include/openssl/evp.h ../include/openssl/hmac.h +t1_clnt.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +t1_clnt.o: ../include/openssl/hmac.h ../include/openssl/kdf.h t1_clnt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h t1_clnt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h t1_clnt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -954,7 +1146,8 @@ t1_clnt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h t1_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h t1_clnt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h t1_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -t1_clnt.o: ../include/openssl/sha.h ../include/openssl/srtp.h +t1_clnt.o: ../include/openssl/sha.h ../include/openssl/sm2.h +t1_clnt.o: ../include/openssl/sm3.h ../include/openssl/srtp.h t1_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h t1_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h t1_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -966,7 +1159,8 @@ t1_enc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h t1_enc.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h t1_enc.o: ../include/openssl/ec.h ../include/openssl/ecdh.h t1_enc.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -t1_enc.o: ../include/openssl/evp.h ../include/openssl/hmac.h +t1_enc.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +t1_enc.o: ../include/openssl/hmac.h ../include/openssl/kdf.h t1_enc.o: ../include/openssl/kssl.h ../include/openssl/lhash.h t1_enc.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h t1_enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h @@ -975,6 +1169,7 @@ t1_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h t1_enc.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h t1_enc.o: ../include/openssl/rand.h ../include/openssl/rsa.h t1_enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h +t1_enc.o: ../include/openssl/sm2.h ../include/openssl/sm3.h t1_enc.o: ../include/openssl/srtp.h ../include/openssl/ssl.h t1_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h t1_enc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -987,7 +1182,8 @@ t1_ext.o: ../include/openssl/crypto.h ../include/openssl/dsa.h t1_ext.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h t1_ext.o: ../include/openssl/ec.h ../include/openssl/ecdh.h t1_ext.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -t1_ext.o: ../include/openssl/evp.h ../include/openssl/hmac.h +t1_ext.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +t1_ext.o: ../include/openssl/hmac.h ../include/openssl/kdf.h t1_ext.o: ../include/openssl/kssl.h ../include/openssl/lhash.h t1_ext.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h t1_ext.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -995,6 +1191,7 @@ t1_ext.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h t1_ext.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h t1_ext.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h t1_ext.o: ../include/openssl/safestack.h ../include/openssl/sha.h +t1_ext.o: ../include/openssl/sm2.h ../include/openssl/sm3.h t1_ext.o: ../include/openssl/srtp.h ../include/openssl/ssl.h t1_ext.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h t1_ext.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -1008,7 +1205,8 @@ t1_lib.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h t1_lib.o: ../include/openssl/e_os2.h ../include/openssl/ec.h t1_lib.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h t1_lib.o: ../include/openssl/err.h ../include/openssl/evp.h -t1_lib.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +t1_lib.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +t1_lib.o: ../include/openssl/kdf.h ../include/openssl/kssl.h t1_lib.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h t1_lib.o: ../include/openssl/objects.h ../include/openssl/ocsp.h t1_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -1016,7 +1214,8 @@ t1_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h t1_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h t1_lib.o: ../include/openssl/pqueue.h ../include/openssl/rand.h t1_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -t1_lib.o: ../include/openssl/sha.h ../include/openssl/srtp.h +t1_lib.o: ../include/openssl/sha.h ../include/openssl/sm2.h +t1_lib.o: ../include/openssl/sm3.h ../include/openssl/srtp.h t1_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h t1_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h t1_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -1029,7 +1228,8 @@ t1_meth.o: ../include/openssl/crypto.h ../include/openssl/dsa.h t1_meth.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h t1_meth.o: ../include/openssl/ec.h ../include/openssl/ecdh.h t1_meth.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -t1_meth.o: ../include/openssl/evp.h ../include/openssl/hmac.h +t1_meth.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +t1_meth.o: ../include/openssl/hmac.h ../include/openssl/kdf.h t1_meth.o: ../include/openssl/kssl.h ../include/openssl/lhash.h t1_meth.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h t1_meth.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -1037,6 +1237,7 @@ t1_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h t1_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h t1_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h t1_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h +t1_meth.o: ../include/openssl/sm2.h ../include/openssl/sm3.h t1_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h t1_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h t1_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -1049,7 +1250,8 @@ t1_reneg.o: ../include/openssl/crypto.h ../include/openssl/dsa.h t1_reneg.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h t1_reneg.o: ../include/openssl/ec.h ../include/openssl/ecdh.h t1_reneg.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -t1_reneg.o: ../include/openssl/evp.h ../include/openssl/hmac.h +t1_reneg.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +t1_reneg.o: ../include/openssl/hmac.h ../include/openssl/kdf.h t1_reneg.o: ../include/openssl/kssl.h ../include/openssl/lhash.h t1_reneg.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h t1_reneg.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -1057,6 +1259,7 @@ t1_reneg.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h t1_reneg.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h t1_reneg.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h t1_reneg.o: ../include/openssl/safestack.h ../include/openssl/sha.h +t1_reneg.o: ../include/openssl/sm2.h ../include/openssl/sm3.h t1_reneg.o: ../include/openssl/srtp.h ../include/openssl/ssl.h t1_reneg.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h t1_reneg.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -1069,7 +1272,8 @@ t1_srvr.o: ../include/openssl/crypto.h ../include/openssl/dsa.h t1_srvr.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h t1_srvr.o: ../include/openssl/ec.h ../include/openssl/ecdh.h t1_srvr.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -t1_srvr.o: ../include/openssl/evp.h ../include/openssl/hmac.h +t1_srvr.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +t1_srvr.o: ../include/openssl/hmac.h ../include/openssl/kdf.h t1_srvr.o: ../include/openssl/kssl.h ../include/openssl/lhash.h t1_srvr.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h t1_srvr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -1077,7 +1281,8 @@ t1_srvr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h t1_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h t1_srvr.o: ../include/openssl/pqueue.h ../include/openssl/rand.h t1_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -t1_srvr.o: ../include/openssl/sha.h ../include/openssl/srtp.h +t1_srvr.o: ../include/openssl/sha.h ../include/openssl/sm2.h +t1_srvr.o: ../include/openssl/sm3.h ../include/openssl/srtp.h t1_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h t1_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h t1_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -1089,7 +1294,8 @@ t1_trce.o: ../include/openssl/crypto.h ../include/openssl/dsa.h t1_trce.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h t1_trce.o: ../include/openssl/ec.h ../include/openssl/ecdh.h t1_trce.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -t1_trce.o: ../include/openssl/evp.h ../include/openssl/hmac.h +t1_trce.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +t1_trce.o: ../include/openssl/hmac.h ../include/openssl/kdf.h t1_trce.o: ../include/openssl/kssl.h ../include/openssl/lhash.h t1_trce.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h t1_trce.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -1097,6 +1303,7 @@ t1_trce.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h t1_trce.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h t1_trce.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h t1_trce.o: ../include/openssl/safestack.h ../include/openssl/sha.h +t1_trce.o: ../include/openssl/sm2.h ../include/openssl/sm3.h t1_trce.o: ../include/openssl/srtp.h ../include/openssl/ssl.h t1_trce.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h t1_trce.o: ../include/openssl/ssl3.h ../include/openssl/stack.h @@ -1110,7 +1317,8 @@ tls_srp.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h tls_srp.o: ../include/openssl/e_os2.h ../include/openssl/ec.h tls_srp.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h tls_srp.o: ../include/openssl/err.h ../include/openssl/evp.h -tls_srp.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +tls_srp.o: ../include/openssl/gmssl1.h ../include/openssl/hmac.h +tls_srp.o: ../include/openssl/kdf.h ../include/openssl/kssl.h tls_srp.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h tls_srp.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h tls_srp.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h @@ -1118,6 +1326,7 @@ tls_srp.o: ../include/openssl/pem.h ../include/openssl/pem2.h tls_srp.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h tls_srp.o: ../include/openssl/rand.h ../include/openssl/rsa.h tls_srp.o: ../include/openssl/safestack.h ../include/openssl/sha.h +tls_srp.o: ../include/openssl/sm2.h ../include/openssl/sm3.h tls_srp.o: ../include/openssl/srp.h ../include/openssl/srtp.h tls_srp.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h tls_srp.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h diff --git a/test/Makefile b/test/Makefile index e695073f..3c698507 100644 --- a/test/Makefile +++ b/test/Makefile @@ -542,18 +542,11 @@ dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) # DO NOT DELETE THIS LINE -- make depend depends on it. -asn1test.o: ../include/openssl/asn1.h ../include/openssl/asn1_mac.h -asn1test.o: ../include/openssl/bio.h ../include/openssl/buffer.h -asn1test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -asn1test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -asn1test.o: ../include/openssl/ecdsa.h ../include/openssl/evp.h -asn1test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -asn1test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +asn1test.o: ../include/openssl/buffer.h ../include/openssl/crypto.h +asn1test.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h asn1test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -asn1test.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -asn1test.o: ../include/openssl/sha.h ../include/openssl/stack.h -asn1test.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -asn1test.o: ../include/openssl/x509_vfy.h asn1test.c +asn1test.o: ../include/openssl/safestack.h ../include/openssl/stack.h +asn1test.o: ../include/openssl/symhacks.h asn1test.c bftest.o: ../e_os.h ../include/openssl/blowfish.h ../include/openssl/e_os2.h bftest.o: ../include/openssl/opensslconf.h bftest.c bntest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h @@ -562,21 +555,24 @@ bntest.o: ../include/openssl/crypto.h ../include/openssl/dh.h bntest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h bntest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h bntest.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -bntest.o: ../include/openssl/evp.h ../include/openssl/lhash.h -bntest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -bntest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -bntest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -bntest.o: ../include/openssl/rand.h ../include/openssl/rsa.h -bntest.o: ../include/openssl/safestack.h ../include/openssl/sha.h -bntest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -bntest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h bntest.c +bntest.o: ../include/openssl/evp.h ../include/openssl/kdf.h +bntest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +bntest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +bntest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +bntest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h +bntest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +bntest.o: ../include/openssl/sha.h ../include/openssl/sm2.h +bntest.o: ../include/openssl/sm3.h ../include/openssl/stack.h +bntest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h +bntest.o: ../include/openssl/x509_vfy.h bntest.c casttest.o: ../e_os.h ../include/openssl/cast.h ../include/openssl/e_os2.h casttest.o: ../include/openssl/opensslconf.h casttest.c constant_time_test.o: ../crypto/constant_time_locl.h ../e_os.h constant_time_test.o: ../include/openssl/e_os2.h constant_time_test.o: ../include/openssl/opensslconf.h constant_time_test.c -destest.o: ../include/openssl/des.h ../include/openssl/des_old.h -destest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h +destest.o: ../include/openssl/crypto.h ../include/openssl/des.h +destest.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h +destest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h destest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h destest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h destest.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h destest.c @@ -607,70 +603,88 @@ ecdhtest.o: ../include/openssl/sha.h ../include/openssl/stack.h ecdhtest.o: ../include/openssl/symhacks.h ecdhtest.c ecdsatest.o: ../include/openssl/asn1.h ../include/openssl/bio.h ecdsatest.o: ../include/openssl/bn.h ../include/openssl/buffer.h -ecdsatest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h +ecdsatest.o: ../include/openssl/crypto.h ../include/openssl/dh.h +ecdsatest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h ecdsatest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ecdsatest.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h ecdsatest.o: ../include/openssl/err.h ../include/openssl/evp.h -ecdsatest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -ecdsatest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -ecdsatest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ecdsatest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h +ecdsatest.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +ecdsatest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +ecdsatest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +ecdsatest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h +ecdsatest.o: ../include/openssl/rand.h ../include/openssl/rsa.h ecdsatest.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ecdsatest.o: ../include/openssl/sm2.h ../include/openssl/sm3.h ecdsatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -ecdsatest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -ecdsatest.o: ecdsatest.c +ecdsatest.o: ../include/openssl/ui.h ../include/openssl/x509.h +ecdsatest.o: ../include/openssl/x509_vfy.h ecdsatest.c ectest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h ectest.o: ../include/openssl/bn.h ../include/openssl/buffer.h -ectest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h +ectest.o: ../include/openssl/crypto.h ../include/openssl/dh.h +ectest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h ectest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ectest.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h ectest.o: ../include/openssl/err.h ../include/openssl/evp.h -ectest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -ectest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -ectest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ectest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h +ectest.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +ectest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +ectest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +ectest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h +ectest.o: ../include/openssl/rand.h ../include/openssl/rsa.h ectest.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ectest.o: ../include/openssl/sm2.h ../include/openssl/sm3.h ectest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -ectest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ectest.c +ectest.o: ../include/openssl/ui.h ../include/openssl/x509.h +ectest.o: ../include/openssl/x509_vfy.h ectest.c enginetest.o: ../include/openssl/asn1.h ../include/openssl/bio.h -enginetest.o: ../include/openssl/buffer.h ../include/openssl/crypto.h -enginetest.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -enginetest.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -enginetest.o: ../include/openssl/engine.h ../include/openssl/err.h -enginetest.o: ../include/openssl/evp.h ../include/openssl/lhash.h +enginetest.o: ../include/openssl/bn.h ../include/openssl/buffer.h +enginetest.o: ../include/openssl/crypto.h ../include/openssl/dh.h +enginetest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h +enginetest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h +enginetest.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h +enginetest.o: ../include/openssl/err.h ../include/openssl/evp.h +enginetest.o: ../include/openssl/kdf.h ../include/openssl/lhash.h enginetest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h enginetest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h enginetest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h +enginetest.o: ../include/openssl/rand.h ../include/openssl/rsa.h enginetest.o: ../include/openssl/safestack.h ../include/openssl/sha.h +enginetest.o: ../include/openssl/sm2.h ../include/openssl/sm3.h enginetest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -enginetest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -enginetest.o: enginetest.c +enginetest.o: ../include/openssl/ui.h ../include/openssl/x509.h +enginetest.o: ../include/openssl/x509_vfy.h enginetest.c evp_extra_test.o: ../include/openssl/asn1.h ../include/openssl/bio.h -evp_extra_test.o: ../include/openssl/buffer.h ../include/openssl/crypto.h -evp_extra_test.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -evp_extra_test.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -evp_extra_test.o: ../include/openssl/err.h ../include/openssl/evp.h +evp_extra_test.o: ../include/openssl/bn.h ../include/openssl/buffer.h +evp_extra_test.o: ../include/openssl/crypto.h ../include/openssl/dh.h +evp_extra_test.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h +evp_extra_test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h +evp_extra_test.o: ../include/openssl/ecdsa.h ../include/openssl/err.h +evp_extra_test.o: ../include/openssl/evp.h ../include/openssl/kdf.h evp_extra_test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h evp_extra_test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h evp_extra_test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h evp_extra_test.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h evp_extra_test.o: ../include/openssl/safestack.h ../include/openssl/sha.h +evp_extra_test.o: ../include/openssl/sm2.h ../include/openssl/sm3.h evp_extra_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h evp_extra_test.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h evp_extra_test.o: evp_extra_test.c evp_test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -evp_test.o: ../include/openssl/buffer.h ../include/openssl/conf.h -evp_test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -evp_test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -evp_test.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -evp_test.o: ../include/openssl/err.h ../include/openssl/evp.h +evp_test.o: ../include/openssl/bn.h ../include/openssl/buffer.h +evp_test.o: ../include/openssl/conf.h ../include/openssl/crypto.h +evp_test.o: ../include/openssl/dh.h ../include/openssl/dsa.h +evp_test.o: ../include/openssl/e_os2.h ../include/openssl/ec.h +evp_test.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h +evp_test.o: ../include/openssl/engine.h ../include/openssl/err.h +evp_test.o: ../include/openssl/evp.h ../include/openssl/kdf.h evp_test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h evp_test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h evp_test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -evp_test.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -evp_test.o: ../include/openssl/sha.h ../include/openssl/stack.h -evp_test.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -evp_test.o: ../include/openssl/x509_vfy.h evp_test.c +evp_test.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h +evp_test.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +evp_test.o: ../include/openssl/sha.h ../include/openssl/sm2.h +evp_test.o: ../include/openssl/sm3.h ../include/openssl/stack.h +evp_test.o: ../include/openssl/symhacks.h ../include/openssl/ui.h +evp_test.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h evp_test.c exptest.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/bn.h exptest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h exptest.o: ../include/openssl/err.h ../include/openssl/lhash.h @@ -679,12 +693,14 @@ exptest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h exptest.o: ../include/openssl/safestack.h ../include/openssl/stack.h exptest.o: ../include/openssl/symhacks.h exptest.c heartbeat_test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -heartbeat_test.o: ../include/openssl/buffer.h ../include/openssl/comp.h -heartbeat_test.o: ../include/openssl/crypto.h ../include/openssl/dsa.h +heartbeat_test.o: ../include/openssl/bn.h ../include/openssl/buffer.h +heartbeat_test.o: ../include/openssl/comp.h ../include/openssl/crypto.h +heartbeat_test.o: ../include/openssl/dh.h ../include/openssl/dsa.h heartbeat_test.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h heartbeat_test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h heartbeat_test.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -heartbeat_test.o: ../include/openssl/evp.h ../include/openssl/hmac.h +heartbeat_test.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +heartbeat_test.o: ../include/openssl/hmac.h ../include/openssl/kdf.h heartbeat_test.o: ../include/openssl/kssl.h ../include/openssl/lhash.h heartbeat_test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h heartbeat_test.o: ../include/openssl/opensslconf.h @@ -692,7 +708,8 @@ heartbeat_test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h heartbeat_test.o: ../include/openssl/pem.h ../include/openssl/pem2.h heartbeat_test.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h heartbeat_test.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -heartbeat_test.o: ../include/openssl/sha.h ../include/openssl/srtp.h +heartbeat_test.o: ../include/openssl/sha.h ../include/openssl/sm2.h +heartbeat_test.o: ../include/openssl/sm3.h ../include/openssl/srtp.h heartbeat_test.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h heartbeat_test.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h heartbeat_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h @@ -700,18 +717,20 @@ heartbeat_test.o: ../include/openssl/tls1.h ../include/openssl/x509.h heartbeat_test.o: ../include/openssl/x509_vfy.h ../ssl/ssl_locl.h heartbeat_test.o: ../test/testutil.h heartbeat_test.c hmactest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -hmactest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -hmactest.o: ../include/openssl/evp.h ../include/openssl/hmac.h -hmactest.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h -hmactest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -hmactest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -hmactest.o: ../include/openssl/safestack.h ../include/openssl/stack.h -hmactest.o: ../include/openssl/symhacks.h hmactest.c +hmactest.o: ../include/openssl/bn.h ../include/openssl/crypto.h +hmactest.o: ../include/openssl/e_os2.h ../include/openssl/evp.h +hmactest.o: ../include/openssl/hmac.h ../include/openssl/md5.h +hmactest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +hmactest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +hmactest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h +hmactest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h hmactest.c ideatest.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/idea.h ideatest.o: ../include/openssl/opensslconf.h ideatest.c -igetest.o: ../include/openssl/aes.h ../include/openssl/e_os2.h -igetest.o: ../include/openssl/opensslconf.h ../include/openssl/ossl_typ.h -igetest.o: ../include/openssl/rand.h igetest.c +igetest.o: ../include/openssl/buffer.h ../include/openssl/crypto.h +igetest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h +igetest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +igetest.o: ../include/openssl/safestack.h ../include/openssl/stack.h +igetest.o: ../include/openssl/symhacks.h igetest.c jpaketest.o: ../include/openssl/buffer.h ../include/openssl/crypto.h jpaketest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h jpaketest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h @@ -723,28 +742,31 @@ md2test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h md2test.o: ../include/openssl/safestack.h ../include/openssl/stack.h md2test.o: ../include/openssl/symhacks.h md2test.c md4test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -md4test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -md4test.o: ../include/openssl/evp.h ../include/openssl/md4.h -md4test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -md4test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -md4test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -md4test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h md4test.c +md4test.o: ../include/openssl/bn.h ../include/openssl/crypto.h +md4test.o: ../include/openssl/e_os2.h ../include/openssl/evp.h +md4test.o: ../include/openssl/md4.h ../include/openssl/obj_mac.h +md4test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +md4test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +md4test.o: ../include/openssl/safestack.h ../include/openssl/stack.h +md4test.o: ../include/openssl/symhacks.h md4test.c md5test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -md5test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -md5test.o: ../include/openssl/evp.h ../include/openssl/md5.h -md5test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -md5test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -md5test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -md5test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h md5test.c +md5test.o: ../include/openssl/bn.h ../include/openssl/crypto.h +md5test.o: ../include/openssl/e_os2.h ../include/openssl/evp.h +md5test.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h +md5test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +md5test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +md5test.o: ../include/openssl/safestack.h ../include/openssl/stack.h +md5test.o: ../include/openssl/symhacks.h md5test.c mdc2test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -mdc2test.o: ../include/openssl/crypto.h ../include/openssl/des.h -mdc2test.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h -mdc2test.o: ../include/openssl/evp.h ../include/openssl/mdc2.h -mdc2test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -mdc2test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -mdc2test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -mdc2test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -mdc2test.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h mdc2test.c +mdc2test.o: ../include/openssl/bn.h ../include/openssl/crypto.h +mdc2test.o: ../include/openssl/des.h ../include/openssl/des_old.h +mdc2test.o: ../include/openssl/e_os2.h ../include/openssl/evp.h +mdc2test.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h +mdc2test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +mdc2test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +mdc2test.o: ../include/openssl/safestack.h ../include/openssl/stack.h +mdc2test.o: ../include/openssl/symhacks.h ../include/openssl/ui.h +mdc2test.o: ../include/openssl/ui_compat.h mdc2test.c randtest.o: ../e_os.h ../include/openssl/e_os2.h randtest.o: ../include/openssl/opensslconf.h ../include/openssl/ossl_typ.h randtest.o: ../include/openssl/rand.h randtest.c @@ -759,12 +781,13 @@ rc5test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h rc5test.o: ../include/openssl/safestack.h ../include/openssl/stack.h rc5test.o: ../include/openssl/symhacks.h rc5test.c rmdtest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -rmdtest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -rmdtest.o: ../include/openssl/evp.h ../include/openssl/obj_mac.h -rmdtest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -rmdtest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -rmdtest.o: ../include/openssl/ripemd.h ../include/openssl/safestack.h -rmdtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h rmdtest.c +rmdtest.o: ../include/openssl/bn.h ../include/openssl/crypto.h +rmdtest.o: ../include/openssl/e_os2.h ../include/openssl/evp.h +rmdtest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +rmdtest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +rmdtest.o: ../include/openssl/ossl_typ.h ../include/openssl/ripemd.h +rmdtest.o: ../include/openssl/safestack.h ../include/openssl/stack.h +rmdtest.o: ../include/openssl/symhacks.h rmdtest.c rsa_test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h rsa_test.o: ../include/openssl/bn.h ../include/openssl/crypto.h rsa_test.o: ../include/openssl/e_os2.h ../include/openssl/err.h @@ -774,19 +797,21 @@ rsa_test.o: ../include/openssl/rand.h ../include/openssl/rsa.h rsa_test.o: ../include/openssl/safestack.h ../include/openssl/stack.h rsa_test.o: ../include/openssl/symhacks.h rsa_test.c sha1test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -sha1test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -sha1test.o: ../include/openssl/evp.h ../include/openssl/obj_mac.h -sha1test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -sha1test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -sha1test.o: ../include/openssl/safestack.h ../include/openssl/sha.h -sha1test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h sha1test.c +sha1test.o: ../include/openssl/bn.h ../include/openssl/crypto.h +sha1test.o: ../include/openssl/e_os2.h ../include/openssl/evp.h +sha1test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +sha1test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +sha1test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h +sha1test.o: ../include/openssl/sha.h ../include/openssl/stack.h +sha1test.o: ../include/openssl/symhacks.h sha1test.c shatest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -shatest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -shatest.o: ../include/openssl/evp.h ../include/openssl/obj_mac.h -shatest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -shatest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -shatest.o: ../include/openssl/safestack.h ../include/openssl/sha.h -shatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h shatest.c +shatest.o: ../include/openssl/bn.h ../include/openssl/crypto.h +shatest.o: ../include/openssl/e_os2.h ../include/openssl/evp.h +shatest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +shatest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +shatest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h +shatest.o: ../include/openssl/sha.h ../include/openssl/stack.h +shatest.o: ../include/openssl/symhacks.h shatest.c srptest.o: ../include/openssl/bio.h ../include/openssl/bn.h srptest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h srptest.o: ../include/openssl/err.h ../include/openssl/lhash.h @@ -802,7 +827,8 @@ ssltest.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h ssltest.o: ../include/openssl/e_os2.h ../include/openssl/ec.h ssltest.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h ssltest.o: ../include/openssl/engine.h ../include/openssl/err.h -ssltest.o: ../include/openssl/evp.h ../include/openssl/hmac.h +ssltest.o: ../include/openssl/evp.h ../include/openssl/gmssl1.h +ssltest.o: ../include/openssl/hmac.h ../include/openssl/kdf.h ssltest.o: ../include/openssl/kssl.h ../include/openssl/lhash.h ssltest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h ssltest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h @@ -810,41 +836,49 @@ ssltest.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h ssltest.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h ssltest.o: ../include/openssl/pqueue.h ../include/openssl/rand.h ssltest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -ssltest.o: ../include/openssl/sha.h ../include/openssl/srp.h +ssltest.o: ../include/openssl/sha.h ../include/openssl/sm2.h +ssltest.o: ../include/openssl/sm3.h ../include/openssl/srp.h ssltest.o: ../include/openssl/srtp.h ../include/openssl/ssl.h ssltest.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h ssltest.o: ../include/openssl/ssl3.h ../include/openssl/stack.h ssltest.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -ssltest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -ssltest.o: ../include/openssl/x509v3.h ssltest.c +ssltest.o: ../include/openssl/ui.h ../include/openssl/x509.h +ssltest.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h ssltest.c v3nametest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -v3nametest.o: ../include/openssl/buffer.h ../include/openssl/conf.h -v3nametest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -v3nametest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -v3nametest.o: ../include/openssl/ecdsa.h ../include/openssl/evp.h -v3nametest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -v3nametest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -v3nametest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -v3nametest.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -v3nametest.o: ../include/openssl/sha.h ../include/openssl/stack.h +v3nametest.o: ../include/openssl/bn.h ../include/openssl/buffer.h +v3nametest.o: ../include/openssl/conf.h ../include/openssl/crypto.h +v3nametest.o: ../include/openssl/dh.h ../include/openssl/dsa.h +v3nametest.o: ../include/openssl/e_os2.h ../include/openssl/ec.h +v3nametest.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h +v3nametest.o: ../include/openssl/err.h ../include/openssl/evp.h +v3nametest.o: ../include/openssl/kdf.h ../include/openssl/lhash.h +v3nametest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +v3nametest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +v3nametest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h +v3nametest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +v3nametest.o: ../include/openssl/sha.h ../include/openssl/sm2.h +v3nametest.o: ../include/openssl/sm3.h ../include/openssl/stack.h v3nametest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h v3nametest.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h v3nametest.o: v3nametest.c verify_extra_test.o: ../include/openssl/asn1.h ../include/openssl/bio.h -verify_extra_test.o: ../include/openssl/buffer.h ../include/openssl/crypto.h -verify_extra_test.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -verify_extra_test.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -verify_extra_test.o: ../include/openssl/err.h ../include/openssl/evp.h +verify_extra_test.o: ../include/openssl/bn.h ../include/openssl/buffer.h +verify_extra_test.o: ../include/openssl/crypto.h ../include/openssl/dh.h +verify_extra_test.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h +verify_extra_test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h +verify_extra_test.o: ../include/openssl/ecdsa.h ../include/openssl/err.h +verify_extra_test.o: ../include/openssl/evp.h ../include/openssl/kdf.h verify_extra_test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h verify_extra_test.o: ../include/openssl/objects.h verify_extra_test.o: ../include/openssl/opensslconf.h verify_extra_test.o: ../include/openssl/opensslv.h verify_extra_test.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h verify_extra_test.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -verify_extra_test.o: ../include/openssl/safestack.h ../include/openssl/sha.h -verify_extra_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -verify_extra_test.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -verify_extra_test.o: verify_extra_test.c +verify_extra_test.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +verify_extra_test.o: ../include/openssl/sha.h ../include/openssl/sm2.h +verify_extra_test.o: ../include/openssl/sm3.h ../include/openssl/stack.h +verify_extra_test.o: ../include/openssl/symhacks.h ../include/openssl/x509.h +verify_extra_test.o: ../include/openssl/x509_vfy.h verify_extra_test.c wp_test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h wp_test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h wp_test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h diff --git a/test/asn1test.c b/test/asn1test.c deleted file mode 100755 index 4782f300..00000000 --- a/test/asn1test.c +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include - -typedef struct X { - STACK_OF(X509_EXTENSION) *ext; -} X; - -/* This isn't meant to run particularly, it's just to test type checking */ -int main(int argc, char **argv) -{ - X *x = NULL; - unsigned char **pp = NULL; - - M_ASN1_I2D_vars(x); - M_ASN1_I2D_len_SEQUENCE_opt_type(X509_EXTENSION, x->ext, - i2d_X509_EXTENSION); - M_ASN1_I2D_seq_total(); - M_ASN1_I2D_put_SEQUENCE_opt_type(X509_EXTENSION, x->ext, - i2d_X509_EXTENSION); - M_ASN1_I2D_finish(); -} diff --git a/test/asn1test.c b/test/asn1test.c new file mode 120000 index 00000000..49f44f8b --- /dev/null +++ b/test/asn1test.c @@ -0,0 +1 @@ +dummytest.c \ No newline at end of file diff --git a/test/igetest.c b/test/igetest.c deleted file mode 100644 index 0c7b3573..00000000 --- a/test/igetest.c +++ /dev/null @@ -1,484 +0,0 @@ -/* test/igetest.c -*- mode:C; c-file-style: "eay" -*- */ -/* ==================================================================== - * Copyright (c) 2006 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 -#include -#include -#include -#include - -#define TEST_SIZE 128 -#define BIG_TEST_SIZE 10240 - -static void hexdump(FILE *f, const char *title, const unsigned char *s, int l) -{ - int n = 0; - - fprintf(f, "%s", title); - for (; n < l; ++n) { - if ((n % 16) == 0) - fprintf(f, "\n%04x", n); - fprintf(f, " %02x", s[n]); - } - fprintf(f, "\n"); -} - -#define MAX_VECTOR_SIZE 64 - -struct ige_test { - const unsigned char key[16]; - const unsigned char iv[32]; - const unsigned char in[MAX_VECTOR_SIZE]; - const unsigned char out[MAX_VECTOR_SIZE]; - const size_t length; - const int encrypt; -}; - -static struct ige_test const ige_test_vectors[] = { - {{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, - 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f}, /* key */ - {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, - 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, - 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, - 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f}, /* iv */ - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* in */ - {0x1a, 0x85, 0x19, 0xa6, 0x55, 0x7b, 0xe6, 0x52, - 0xe9, 0xda, 0x8e, 0x43, 0xda, 0x4e, 0xf4, 0x45, - 0x3c, 0xf4, 0x56, 0xb4, 0xca, 0x48, 0x8a, 0xa3, - 0x83, 0xc7, 0x9c, 0x98, 0xb3, 0x47, 0x97, 0xcb}, /* out */ - 32, AES_ENCRYPT}, /* test vector 0 */ - - {{0x54, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, - 0x61, 0x6e, 0x20, 0x69, 0x6d, 0x70, 0x6c, 0x65}, /* key */ - {0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x49, 0x47, 0x45, - 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x20, 0x66, 0x6f, - 0x72, 0x20, 0x4f, 0x70, 0x65, 0x6e, 0x53, 0x53}, /* iv */ - {0x4c, 0x2e, 0x20, 0x4c, 0x65, 0x74, 0x27, 0x73, - 0x20, 0x68, 0x6f, 0x70, 0x65, 0x20, 0x42, 0x65, - 0x6e, 0x20, 0x67, 0x6f, 0x74, 0x20, 0x69, 0x74, - 0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x21, 0x0a}, /* in */ - {0x99, 0x70, 0x64, 0x87, 0xa1, 0xcd, 0xe6, 0x13, - 0xbc, 0x6d, 0xe0, 0xb6, 0xf2, 0x4b, 0x1c, 0x7a, - 0xa4, 0x48, 0xc8, 0xb9, 0xc3, 0x40, 0x3e, 0x34, - 0x67, 0xa8, 0xca, 0xd8, 0x93, 0x40, 0xf5, 0x3b}, /* out */ - 32, AES_DECRYPT}, /* test vector 1 */ -}; - -struct bi_ige_test { - const unsigned char key1[32]; - const unsigned char key2[32]; - const unsigned char iv[64]; - const unsigned char in[MAX_VECTOR_SIZE]; - const unsigned char out[MAX_VECTOR_SIZE]; - const size_t keysize; - const size_t length; - const int encrypt; -}; - -static struct bi_ige_test const bi_ige_test_vectors[] = { - {{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, - 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f}, /* key1 */ - {0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, - 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f}, /* key2 */ - {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, - 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, - 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, - 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, - 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, - 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, - 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f}, /* iv */ - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* in */ - {0x14, 0x40, 0x6f, 0xae, 0xa2, 0x79, 0xf2, 0x56, - 0x1f, 0x86, 0xeb, 0x3b, 0x7d, 0xff, 0x53, 0xdc, - 0x4e, 0x27, 0x0c, 0x03, 0xde, 0x7c, 0xe5, 0x16, - 0x6a, 0x9c, 0x20, 0x33, 0x9d, 0x33, 0xfe, 0x12}, /* out */ - 16, 32, AES_ENCRYPT}, /* test vector 0 */ - {{0x58, 0x0a, 0x06, 0xe9, 0x97, 0x07, 0x59, 0x5c, - 0x9e, 0x19, 0xd2, 0xa7, 0xbb, 0x40, 0x2b, 0x7a, - 0xc7, 0xd8, 0x11, 0x9e, 0x4c, 0x51, 0x35, 0x75, - 0x64, 0x28, 0x0f, 0x23, 0xad, 0x74, 0xac, 0x37}, /* key1 */ - {0xd1, 0x80, 0xa0, 0x31, 0x47, 0xa3, 0x11, 0x13, - 0x86, 0x26, 0x9e, 0x6d, 0xff, 0xaf, 0x72, 0x74, - 0x5b, 0xa2, 0x35, 0x81, 0xd2, 0xa6, 0x3d, 0x21, - 0x67, 0x7b, 0x58, 0xa8, 0x18, 0xf9, 0x72, 0xe4}, /* key2 */ - {0x80, 0x3d, 0xbd, 0x4c, 0xe6, 0x7b, 0x06, 0xa9, - 0x53, 0x35, 0xd5, 0x7e, 0x71, 0xc1, 0x70, 0x70, - 0x74, 0x9a, 0x00, 0x28, 0x0c, 0xbf, 0x6c, 0x42, - 0x9b, 0xa4, 0xdd, 0x65, 0x11, 0x77, 0x7c, 0x67, - 0xfe, 0x76, 0x0a, 0xf0, 0xd5, 0xc6, 0x6e, 0x6a, - 0xe7, 0x5e, 0x4c, 0xf2, 0x7e, 0x9e, 0xf9, 0x20, - 0x0e, 0x54, 0x6f, 0x2d, 0x8a, 0x8d, 0x7e, 0xbd, - 0x48, 0x79, 0x37, 0x99, 0xff, 0x27, 0x93, 0xa3}, /* iv */ - {0xf1, 0x54, 0x3d, 0xca, 0xfe, 0xb5, 0xef, 0x1c, - 0x4f, 0xa6, 0x43, 0xf6, 0xe6, 0x48, 0x57, 0xf0, - 0xee, 0x15, 0x7f, 0xe3, 0xe7, 0x2f, 0xd0, 0x2f, - 0x11, 0x95, 0x7a, 0x17, 0x00, 0xab, 0xa7, 0x0b, - 0xbe, 0x44, 0x09, 0x9c, 0xcd, 0xac, 0xa8, 0x52, - 0xa1, 0x8e, 0x7b, 0x75, 0xbc, 0xa4, 0x92, 0x5a, - 0xab, 0x46, 0xd3, 0x3a, 0xa0, 0xd5, 0x35, 0x1c, - 0x55, 0xa4, 0xb3, 0xa8, 0x40, 0x81, 0xa5, 0x0b}, /* in */ - {0x42, 0xe5, 0x28, 0x30, 0x31, 0xc2, 0xa0, 0x23, - 0x68, 0x49, 0x4e, 0xb3, 0x24, 0x59, 0x92, 0x79, - 0xc1, 0xa5, 0xcc, 0xe6, 0x76, 0x53, 0xb1, 0xcf, - 0x20, 0x86, 0x23, 0xe8, 0x72, 0x55, 0x99, 0x92, - 0x0d, 0x16, 0x1c, 0x5a, 0x2f, 0xce, 0xcb, 0x51, - 0xe2, 0x67, 0xfa, 0x10, 0xec, 0xcd, 0x3d, 0x67, - 0xa5, 0xe6, 0xf7, 0x31, 0x26, 0xb0, 0x0d, 0x76, - 0x5e, 0x28, 0xdc, 0x7f, 0x01, 0xc5, 0xa5, 0x4c}, /* out */ - 32, 64, AES_ENCRYPT}, /* test vector 1 */ - -}; - -static int run_test_vectors(void) -{ - unsigned int n; - int errs = 0; - - for (n = 0; n < sizeof(ige_test_vectors) / sizeof(ige_test_vectors[0]); - ++n) { - const struct ige_test *const v = &ige_test_vectors[n]; - AES_KEY key; - unsigned char buf[MAX_VECTOR_SIZE]; - unsigned char iv[AES_BLOCK_SIZE * 2]; - - assert(v->length <= MAX_VECTOR_SIZE); - - if (v->encrypt == AES_ENCRYPT) - AES_set_encrypt_key(v->key, 8 * sizeof v->key, &key); - else - AES_set_decrypt_key(v->key, 8 * sizeof v->key, &key); - memcpy(iv, v->iv, sizeof iv); - AES_ige_encrypt(v->in, buf, v->length, &key, iv, v->encrypt); - - if (memcmp(v->out, buf, v->length)) { - printf("IGE test vector %d failed\n", n); - hexdump(stdout, "key", v->key, sizeof v->key); - hexdump(stdout, "iv", v->iv, sizeof v->iv); - hexdump(stdout, "in", v->in, v->length); - hexdump(stdout, "expected", v->out, v->length); - hexdump(stdout, "got", buf, v->length); - - ++errs; - } - - /* try with in == out */ - memcpy(iv, v->iv, sizeof iv); - memcpy(buf, v->in, v->length); - AES_ige_encrypt(buf, buf, v->length, &key, iv, v->encrypt); - - if (memcmp(v->out, buf, v->length)) { - printf("IGE test vector %d failed (with in == out)\n", n); - hexdump(stdout, "key", v->key, sizeof v->key); - hexdump(stdout, "iv", v->iv, sizeof v->iv); - hexdump(stdout, "in", v->in, v->length); - hexdump(stdout, "expected", v->out, v->length); - hexdump(stdout, "got", buf, v->length); - - ++errs; - } - } - - for (n = 0; - n < sizeof(bi_ige_test_vectors) / sizeof(bi_ige_test_vectors[0]); - ++n) { - const struct bi_ige_test *const v = &bi_ige_test_vectors[n]; - AES_KEY key1; - AES_KEY key2; - unsigned char buf[MAX_VECTOR_SIZE]; - - assert(v->length <= MAX_VECTOR_SIZE); - - if (v->encrypt == AES_ENCRYPT) { - AES_set_encrypt_key(v->key1, 8 * v->keysize, &key1); - AES_set_encrypt_key(v->key2, 8 * v->keysize, &key2); - } else { - AES_set_decrypt_key(v->key1, 8 * v->keysize, &key1); - AES_set_decrypt_key(v->key2, 8 * v->keysize, &key2); - } - - AES_bi_ige_encrypt(v->in, buf, v->length, &key1, &key2, v->iv, - v->encrypt); - - if (memcmp(v->out, buf, v->length)) { - printf("Bidirectional IGE test vector %d failed\n", n); - hexdump(stdout, "key 1", v->key1, sizeof v->key1); - hexdump(stdout, "key 2", v->key2, sizeof v->key2); - hexdump(stdout, "iv", v->iv, sizeof v->iv); - hexdump(stdout, "in", v->in, v->length); - hexdump(stdout, "expected", v->out, v->length); - hexdump(stdout, "got", buf, v->length); - - ++errs; - } - } - - return errs; -} - -int main(int argc, char **argv) -{ - unsigned char rkey[16]; - unsigned char rkey2[16]; - AES_KEY key; - AES_KEY key2; - unsigned char plaintext[BIG_TEST_SIZE]; - unsigned char ciphertext[BIG_TEST_SIZE]; - unsigned char checktext[BIG_TEST_SIZE]; - unsigned char iv[AES_BLOCK_SIZE * 4]; - unsigned char saved_iv[AES_BLOCK_SIZE * 4]; - int err = 0; - unsigned int n; - unsigned matches; - - assert(BIG_TEST_SIZE >= TEST_SIZE); - - RAND_pseudo_bytes(rkey, sizeof rkey); - RAND_pseudo_bytes(plaintext, sizeof plaintext); - RAND_pseudo_bytes(iv, sizeof iv); - memcpy(saved_iv, iv, sizeof saved_iv); - - /* Forward IGE only... */ - - /* Straight encrypt/decrypt */ - AES_set_encrypt_key(rkey, 8 * sizeof rkey, &key); - AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE, &key, iv, AES_ENCRYPT); - - AES_set_decrypt_key(rkey, 8 * sizeof rkey, &key); - memcpy(iv, saved_iv, sizeof iv); - AES_ige_encrypt(ciphertext, checktext, TEST_SIZE, &key, iv, AES_DECRYPT); - - if (memcmp(checktext, plaintext, TEST_SIZE)) { - printf("Encrypt+decrypt doesn't match\n"); - hexdump(stdout, "Plaintext", plaintext, TEST_SIZE); - hexdump(stdout, "Checktext", checktext, TEST_SIZE); - ++err; - } - - /* Now check encrypt chaining works */ - AES_set_encrypt_key(rkey, 8 * sizeof rkey, &key); - memcpy(iv, saved_iv, sizeof iv); - AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE / 2, &key, iv, - AES_ENCRYPT); - AES_ige_encrypt(plaintext + TEST_SIZE / 2, - ciphertext + TEST_SIZE / 2, TEST_SIZE / 2, - &key, iv, AES_ENCRYPT); - - AES_set_decrypt_key(rkey, 8 * sizeof rkey, &key); - memcpy(iv, saved_iv, sizeof iv); - AES_ige_encrypt(ciphertext, checktext, TEST_SIZE, &key, iv, AES_DECRYPT); - - if (memcmp(checktext, plaintext, TEST_SIZE)) { - printf("Chained encrypt+decrypt doesn't match\n"); - hexdump(stdout, "Plaintext", plaintext, TEST_SIZE); - hexdump(stdout, "Checktext", checktext, TEST_SIZE); - ++err; - } - - /* And check decrypt chaining */ - AES_set_encrypt_key(rkey, 8 * sizeof rkey, &key); - memcpy(iv, saved_iv, sizeof iv); - AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE / 2, &key, iv, - AES_ENCRYPT); - AES_ige_encrypt(plaintext + TEST_SIZE / 2, - ciphertext + TEST_SIZE / 2, TEST_SIZE / 2, - &key, iv, AES_ENCRYPT); - - AES_set_decrypt_key(rkey, 8 * sizeof rkey, &key); - memcpy(iv, saved_iv, sizeof iv); - AES_ige_encrypt(ciphertext, checktext, TEST_SIZE / 2, &key, iv, - AES_DECRYPT); - AES_ige_encrypt(ciphertext + TEST_SIZE / 2, - checktext + TEST_SIZE / 2, TEST_SIZE / 2, &key, iv, - AES_DECRYPT); - - if (memcmp(checktext, plaintext, TEST_SIZE)) { - printf("Chained encrypt+chained decrypt doesn't match\n"); - hexdump(stdout, "Plaintext", plaintext, TEST_SIZE); - hexdump(stdout, "Checktext", checktext, TEST_SIZE); - ++err; - } - - /* make sure garble extends forwards only */ - AES_set_encrypt_key(rkey, 8 * sizeof rkey, &key); - memcpy(iv, saved_iv, sizeof iv); - AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv, - AES_ENCRYPT); - - /* corrupt halfway through */ - ++ciphertext[sizeof ciphertext / 2]; - AES_set_decrypt_key(rkey, 8 * sizeof rkey, &key); - memcpy(iv, saved_iv, sizeof iv); - AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv, - AES_DECRYPT); - - matches = 0; - for (n = 0; n < sizeof checktext; ++n) - if (checktext[n] == plaintext[n]) - ++matches; - - if (matches > sizeof checktext / 2 + sizeof checktext / 100) { - printf("More than 51%% matches after garbling\n"); - ++err; - } - - if (matches < sizeof checktext / 2) { - printf("Garble extends backwards!\n"); - ++err; - } - - /* Bi-directional IGE */ - - /* - * Note that we don't have to recover the IV, because chaining isn't - */ - /* possible with biIGE, so the IV is not updated. */ - - RAND_pseudo_bytes(rkey2, sizeof rkey2); - - /* Straight encrypt/decrypt */ - AES_set_encrypt_key(rkey, 8 * sizeof rkey, &key); - AES_set_encrypt_key(rkey2, 8 * sizeof rkey2, &key2); - AES_bi_ige_encrypt(plaintext, ciphertext, TEST_SIZE, &key, &key2, iv, - AES_ENCRYPT); - - AES_set_decrypt_key(rkey, 8 * sizeof rkey, &key); - AES_set_decrypt_key(rkey2, 8 * sizeof rkey2, &key2); - AES_bi_ige_encrypt(ciphertext, checktext, TEST_SIZE, &key, &key2, iv, - AES_DECRYPT); - - if (memcmp(checktext, plaintext, TEST_SIZE)) { - printf("Encrypt+decrypt doesn't match\n"); - hexdump(stdout, "Plaintext", plaintext, TEST_SIZE); - hexdump(stdout, "Checktext", checktext, TEST_SIZE); - ++err; - } - - /* make sure garble extends both ways */ - AES_set_encrypt_key(rkey, 8 * sizeof rkey, &key); - AES_set_encrypt_key(rkey2, 8 * sizeof rkey2, &key2); - AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv, - AES_ENCRYPT); - - /* corrupt halfway through */ - ++ciphertext[sizeof ciphertext / 2]; - AES_set_decrypt_key(rkey, 8 * sizeof rkey, &key); - AES_set_decrypt_key(rkey2, 8 * sizeof rkey2, &key2); - AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv, - AES_DECRYPT); - - matches = 0; - for (n = 0; n < sizeof checktext; ++n) - if (checktext[n] == plaintext[n]) - ++matches; - - if (matches > sizeof checktext / 100) { - printf("More than 1%% matches after bidirectional garbling\n"); - ++err; - } - - /* make sure garble extends both ways (2) */ - AES_set_encrypt_key(rkey, 8 * sizeof rkey, &key); - AES_set_encrypt_key(rkey2, 8 * sizeof rkey2, &key2); - AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv, - AES_ENCRYPT); - - /* corrupt right at the end */ - ++ciphertext[sizeof ciphertext - 1]; - AES_set_decrypt_key(rkey, 8 * sizeof rkey, &key); - AES_set_decrypt_key(rkey2, 8 * sizeof rkey2, &key2); - AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv, - AES_DECRYPT); - - matches = 0; - for (n = 0; n < sizeof checktext; ++n) - if (checktext[n] == plaintext[n]) - ++matches; - - if (matches > sizeof checktext / 100) { - printf("More than 1%% matches after bidirectional garbling (2)\n"); - ++err; - } - - /* make sure garble extends both ways (3) */ - AES_set_encrypt_key(rkey, 8 * sizeof rkey, &key); - AES_set_encrypt_key(rkey2, 8 * sizeof rkey2, &key2); - AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv, - AES_ENCRYPT); - - /* corrupt right at the start */ - ++ciphertext[0]; - AES_set_decrypt_key(rkey, 8 * sizeof rkey, &key); - AES_set_decrypt_key(rkey2, 8 * sizeof rkey2, &key2); - AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv, - AES_DECRYPT); - - matches = 0; - for (n = 0; n < sizeof checktext; ++n) - if (checktext[n] == plaintext[n]) - ++matches; - - if (matches > sizeof checktext / 100) { - printf("More than 1%% matches after bidirectional garbling (3)\n"); - ++err; - } - - err += run_test_vectors(); - - return err; -} diff --git a/test/igetest.c b/test/igetest.c new file mode 120000 index 00000000..49f44f8b --- /dev/null +++ b/test/igetest.c @@ -0,0 +1 @@ +dummytest.c \ No newline at end of file diff --git a/test/jpaketest.c b/test/jpaketest.c deleted file mode 100644 index 554acc22..00000000 --- a/test/jpaketest.c +++ /dev/null @@ -1,57 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - -int main(int argc, char *argv[]) -{ - char *p, *q = 0, *program; - - p = strrchr(argv[0], '/'); - if (!p) - p = strrchr(argv[0], '\\'); -#ifdef OPENSSL_SYS_VMS - if (!p) - p = strrchr(argv[0], ']'); - if (p) - q = strrchr(p, '>'); - if (q) - p = q; - if (!p) - p = strrchr(argv[0], ':'); - q = 0; -#endif - if (p) - p++; - if (!p) - p = argv[0]; - if (p) - q = strchr(p, '.'); - if (p && !q) - q = p + strlen(p); - - if (!p) - program = BUF_strdup("(unknown)"); - else { - program = OPENSSL_malloc((q - p) + 1); - strncpy(program, p, q - p); - program[q - p] = '\0'; - } - - for (p = program; *p; p++) - if (islower((unsigned char)(*p))) - *p = toupper((unsigned char)(*p)); - - q = strstr(program, "TEST"); - if (q > p && q[-1] == '_') - q--; - *q = '\0'; - - printf("No %s support\n", program); - - OPENSSL_free(program); - return (0); -} diff --git a/test/jpaketest.c b/test/jpaketest.c new file mode 120000 index 00000000..49f44f8b --- /dev/null +++ b/test/jpaketest.c @@ -0,0 +1 @@ +dummytest.c \ No newline at end of file diff --git a/test/kdftest.c b/test/kdftest.c new file mode 120000 index 00000000..a9a2ffe9 --- /dev/null +++ b/test/kdftest.c @@ -0,0 +1 @@ +../crypto/kdf/kdftest.c \ No newline at end of file diff --git a/test/md2test.c b/test/md2test.c deleted file mode 100644 index 554acc22..00000000 --- a/test/md2test.c +++ /dev/null @@ -1,57 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - -int main(int argc, char *argv[]) -{ - char *p, *q = 0, *program; - - p = strrchr(argv[0], '/'); - if (!p) - p = strrchr(argv[0], '\\'); -#ifdef OPENSSL_SYS_VMS - if (!p) - p = strrchr(argv[0], ']'); - if (p) - q = strrchr(p, '>'); - if (q) - p = q; - if (!p) - p = strrchr(argv[0], ':'); - q = 0; -#endif - if (p) - p++; - if (!p) - p = argv[0]; - if (p) - q = strchr(p, '.'); - if (p && !q) - q = p + strlen(p); - - if (!p) - program = BUF_strdup("(unknown)"); - else { - program = OPENSSL_malloc((q - p) + 1); - strncpy(program, p, q - p); - program[q - p] = '\0'; - } - - for (p = program; *p; p++) - if (islower((unsigned char)(*p))) - *p = toupper((unsigned char)(*p)); - - q = strstr(program, "TEST"); - if (q > p && q[-1] == '_') - q--; - *q = '\0'; - - printf("No %s support\n", program); - - OPENSSL_free(program); - return (0); -} diff --git a/test/md2test.c b/test/md2test.c new file mode 120000 index 00000000..49f44f8b --- /dev/null +++ b/test/md2test.c @@ -0,0 +1 @@ +dummytest.c \ No newline at end of file diff --git a/test/newkey.pem b/test/newkey.pem deleted file mode 100644 index 178ae015..00000000 --- a/test/newkey.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC1Mb8lOEK7K94V -4GqTS05d/DYPQY24N5WgnMH7Lj6Js7NcpkMK8JENGw4oOEHd3mKe1B2lGAoOT9rq -I1A2MUaZ4K2h6Gs6j3Ez5SGu7lyJFUZcEfI4Oc+1wV6aW7Qd6lOTX0H6IH328Anc -C+sa2CSYnSpnTqcv/iSdB+DPX6NaO9o3krcxYgrnS7FE5pIKEg3yfKfWANQnceFD -yvOwZ6CVx8WjSO3qUhLB6yOzlwmcIUOyLQMuMaM9pxtMl8LlvMaXMW8LNGopCGOP -0PpY5cDUe2Xqm5ZPT2fG4lm+uJyLPJ5/NV0roo/QKEP/Atv4SmGSOHQ024fbJBgm -cCwIxSNpAgMBAAECggEACWOeiAs2SgSn6XJLk35ffTdIhdnbwiP/OOdmleF7lB8f -uDlVWAfHPGqefS8NGrYfXiOXtapdOwigS2mxCl3bTrX5yV4F0G8Gaq4A5NOtL91O -XA8CAi/ct4phoJYH61TtJ8HT5WYxoM4ndKOZdzakDtR2EgxdVXtR4mE6IQTPrik9 -fwO4F/yT/ysTuKGdDDBoklBlVxatFjqGqOjDPdb6P4ZSDPyc6Ecj1b6/JubVMkLW -Lf8cXLpRqpzoo1pRB1GV3RBnKrXt3FlUvgaH3Xi19F7wDz4Wh29/RY8u2QmWujdm -Jmb6kawqrFpoJrQcoYYnkbPYcTOMC2j2UqD+p4smAQKBgQDZ8kk7QCzXIgc9eXil -SscWqSZluQ1rX9Cppx6U+NffWtorEONc8JtjT18gUuojajHAam6ZDsBImp7BNf5d -OZMaH1b4Q8ub1i5ZGxVf/uS4YF1572uLs3h34JNTxaBHKyLGLfy9MWvQpqW40DFR -CEovk+hHUXMPgcJyGnKeP3EXWQKBgQDU1LlrYVOoe3ZJ518F8KJaSPZlu44U4sv3 -ut623pfjt7gdL+WTBN3gOpGstsOBs+Sf3OeL6A96OjUI9OgRbAqG4Oq6sLZBo2vm -UhyNr+WjDrwxeHZ3WL82rgnxJpfmIAQbbEYe33kOuinbAUR57a4YrPGiaBUnUNzY -IcCMPPr6kQKBgANwSSuAJbT3OnoD0p15Ao8e+BYex1FsX5RtqJPdITrK6ipHx+6N -dUYp2GxgIoWQhVxt0XTkwK/kkKCnw22hHOsKl4qvNyUsSerp/HpZQS6PhqoH1wCL -QllR18E4mwDEc3YA/73Ua8kM+AxkbILEyLbbdIy7gj86YuD9/dT1V0lxAoGBAJPG -9MwTcyQcPcEI7xjPwdsQqE1xEjF8XIWxcizll+9cxHE3rZ8MlQa5hCa5bDyl7Qv3 -NasWQZDr06FZc72NGC4ZA8MHKjWfRC9TOlJDHR6//3oWG6O4smREKdEQrA30kwV7 -g6CyKHtKVf+j/KjwmJ63jrvmqzF2WzGTFgAJ43aRAoGAHxvIh+Uh9Ouq953ISPVT -SY76Ab8hkgttTBlBkUCJkKcIfk1AGOl7+WRIW1nM0Vb3+Ev1NoEurL0czWCHIMYm -LhqZVeyEdq1z4MXL6KDMZqNp3o79GJ3lqap7jFHVie0RUAvSxRMbMcAN2JpupWKy -w+1b/rhHMoOABqBjB2LZwso= ------END PRIVATE KEY----- diff --git a/test/rc5test.c b/test/rc5test.c deleted file mode 100644 index 554acc22..00000000 --- a/test/rc5test.c +++ /dev/null @@ -1,57 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - -int main(int argc, char *argv[]) -{ - char *p, *q = 0, *program; - - p = strrchr(argv[0], '/'); - if (!p) - p = strrchr(argv[0], '\\'); -#ifdef OPENSSL_SYS_VMS - if (!p) - p = strrchr(argv[0], ']'); - if (p) - q = strrchr(p, '>'); - if (q) - p = q; - if (!p) - p = strrchr(argv[0], ':'); - q = 0; -#endif - if (p) - p++; - if (!p) - p = argv[0]; - if (p) - q = strchr(p, '.'); - if (p && !q) - q = p + strlen(p); - - if (!p) - program = BUF_strdup("(unknown)"); - else { - program = OPENSSL_malloc((q - p) + 1); - strncpy(program, p, q - p); - program[q - p] = '\0'; - } - - for (p = program; *p; p++) - if (islower((unsigned char)(*p))) - *p = toupper((unsigned char)(*p)); - - q = strstr(program, "TEST"); - if (q > p && q[-1] == '_') - q--; - *q = '\0'; - - printf("No %s support\n", program); - - OPENSSL_free(program); - return (0); -} diff --git a/test/rc5test.c b/test/rc5test.c new file mode 120000 index 00000000..49f44f8b --- /dev/null +++ b/test/rc5test.c @@ -0,0 +1 @@ +dummytest.c \ No newline at end of file diff --git a/test/sm9test.c b/test/sm9test.c new file mode 120000 index 00000000..2b0b543a --- /dev/null +++ b/test/sm9test.c @@ -0,0 +1 @@ +../crypto/sm9/sm9test.c \ No newline at end of file diff --git a/test/testkey.pem b/test/testkey.pem deleted file mode 100644 index d7ee8fcb..00000000 --- a/test/testkey.pem +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAN0DTVGDDYkp01ke -wBi3DmoGCzfKI4nrPJPyVu8oC4XWShhnkJ4kSc/Bwl76dCxNKhTpcR2uxSBde5bn -auOLP+VY9uHWRg3GHwOb+Pf+pKR1RtITC9rwP1on8nL3GnqOQnV2dDcKFheaBxI9 -M9S76Is02uBt1PrcOdkyKmKo4DWNAgMBAAECgYBXqDydTLYspbseiLS12LzNzlHa -scCArh0brK1QM3jGf2Rp44GXR1tDHF1EIF+9RmmfW6syk6O5n3oqMuTRFOSlDH+r -DtoJ1jbp2X9AuVwdTPBU3fZnJiDRaQvaHJvyDCpIRhnvgXNDDHUSjes4fmh63zIP -mqH7Q2dXPLyrKEXR/QJBAPAhMQbR2PfWHlSYbkNkW/AodVQBJ/tuSvomraaSXOn6 -6jjfBkxAHGsCDVcOh2VoN3kYPm0WMzAxrL76uZlBRv8CQQDrnqt1FJFNpGFrQVrB -p4gadayCQxymAb8ZfrjU46Tk7wI4XuXWa7euxvEm+QcUhj5TSOnVUOrluunNZG5r -+69zAkAaRHc5eMEUM070EAyXwKWx+qsC+nFmNqVrAcojG4WgbrsqZ3Mn6idxqTLO -YB99f036KCXEBxaoYfa0mXauBg7/AkEAyPcq0s/aJ1kfZnX1zNrx8W+Q1gIb+1Pe -BQba62nHCST6xc3bR4nUv5Qbt9wLt+vQWQUFvNYppAxKws74h83CFQJAc3HhcW8B -5esRCIN27P96A2VIKCIZz/bdZbNc/ZdEoZfdJkqcfjdTyDAT7rbPPRVmK5uhNJXX -T6pPymp3g8QJvA== ------END PRIVATE KEY----- diff --git a/test/testreq.pem b/test/testreq.pem deleted file mode 100644 index a863636c..00000000 --- a/test/testreq.pem +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIByDCCATECAQAwgYcxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApRdWVlbnNsYW5k -MREwDwYDVQQHDAhCcmlzYmFuZTEaMBgGA1UECgwRQ3J5cHRTb2Z0IFB0eSBMdGQx -EzARBgNVBAMMCkVyaWMgWW91bmcxHzAdBgkqhkiG9w0BCQEWEGVheUBtaW5jb20u -b3ouYXUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN0DTVGDDYkp01kewBi3 -DmoGCzfKI4nrPJPyVu8oC4XWShhnkJ4kSc/Bwl76dCxNKhTpcR2uxSBde5bnauOL -P+VY9uHWRg3GHwOb+Pf+pKR1RtITC9rwP1on8nL3GnqOQnV2dDcKFheaBxI9M9S7 -6Is02uBt1PrcOdkyKmKo4DWNAgMBAAGgADANBgkqhkiG9w0BAQsFAAOBgQAqKiyZ -VzABTlA18Z/L89zHR7fRYaoag/+3iJwe/uYRS5vLNG5d5fYWGygyfxw2NlV2i21/ -runiOSQ5LdHLQlfStij6pjEs0B/dsXzWSktlR89b7cob2paVOCZca0XPY26PERUL -1fZaFfsq7nix4dtAKrgoSMz/fuuHPXrZ14T6zw== ------END CERTIFICATE REQUEST----- diff --git a/test/zuctest.c b/test/zuctest.c new file mode 120000 index 00000000..0c1e2824 --- /dev/null +++ b/test/zuctest.c @@ -0,0 +1 @@ +../crypto/zuc/zuctest.c \ No newline at end of file