Commit ade44dcb authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Remove Gost94 signature algorithm. 



This was obsolete in 2001.  This is not the same as Gost94 digest.
Thanks to Dmitry Belyavsky <beldmit@gmail.com> for review and advice.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent f75d5171

apps/s_cb.c

+0 −1
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ static STRINT_PAIR cert_type_list[] = { 
    {"ECDSA sign", TLS_CT_ECDSA_SIGN},

    {"RSA fixed ECDH", TLS_CT_RSA_FIXED_ECDH},

    {"ECDSA fixed ECDH", TLS_CT_ECDSA_FIXED_ECDH},

    {"GOST94 Sign", TLS_CT_GOST94_SIGN},

    {"GOST01 Sign", TLS_CT_GOST01_SIGN},

    {NULL}

};

crypto/x509/x509type.c

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ int X509_certificate_type(X509 *x, EVP_PKEY *pkey) 
    case EVP_PKEY_DH:

        ret = EVP_PK_DH | EVP_PKT_EXCH;

        break;

    case NID_id_GostR3410_94:

    case NID_id_GostR3410_2001:

        ret = EVP_PKT_EXCH | EVP_PKT_SIGN;

        break;

doc/apps/ciphers.pod

+0 −5
Original line number Diff line number Diff line
@@ -310,11 +310,6 @@ cipher suites using GOST R 34.10 (either 2001 or 94) for authentication 


cipher suites using GOST R 34.10-2001 authentication.



=item B<aGOST94>



cipher suites using GOST R 34.10-94 authentication (note that R 34.10-94

standard has been expired so use GOST R 34.10-2001)



=item B<kGOST>



cipher suites, using VKO 34.10 key exchange, specified in the RFC 4357.

engines/ccgost/Makefile

+17 −46
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ AR= ar r 
CFLAGS= $(INCLUDES) $(CFLAG)

LIB=$(TOP)/libcrypto.a



LIBSRC= gost2001.c gost2001_keyx.c gost89.c gost94_keyx.c gost_ameth.c gost_asn1.c gost_crypt.c gost_ctl.c gost_eng.c gosthash.c gost_keywrap.c gost_md.c gost_params.c gost_pmeth.c gost_sign.c

LIBSRC= gost2001.c gost2001_keyx.c gost89.c gost_ameth.c gost_asn1.c gost_crypt.c gost_ctl.c gost_eng.c gosthash.c gost_keywrap.c gost_md.c gost_pmeth.c gost_params.c



LIBOBJ= e_gost_err.o gost2001_keyx.o gost2001.o gost89.o gost94_keyx.o gost_ameth.o gost_asn1.o gost_crypt.o gost_ctl.o gost_eng.o gosthash.o gost_keywrap.o gost_md.o gost_params.o gost_pmeth.o gost_sign.o

LIBOBJ= e_gost_err.o gost2001_keyx.o gost2001.o gost89.o gost_ameth.o gost_asn1.o gost_crypt.o gost_ctl.o gost_eng.o gosthash.o gost_keywrap.o gost_md.o gost_pmeth.o gost_params.o



SRC=$(LIBSRC)
@@ -100,8 +100,7 @@ gost2001.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 
gost2001.o: ../../include/openssl/safestack.h ../../include/openssl/sha.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

gost2001.o: gosthash.h

gost2001.o: e_gost_err.h gost2001.c gost89.h gost_lcl.h gosthash.h

gost2001_keyx.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost2001_keyx.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost2001_keyx.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -120,23 +119,6 @@ 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

gost89.o: gost89.c gost89.h

gost94_keyx.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost94_keyx.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

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/err.h

gost94_keyx.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

gost94_keyx.o: ../../include/openssl/obj_mac.h ../../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/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

gost_ameth.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost_ameth.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost_ameth.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
@@ -152,7 +134,7 @@ 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/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

gost_ameth.o: gost_ameth.c gost_lcl.h gosthash.h

gost_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost_asn1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -229,14 +211,21 @@ gost_md.o: ../../include/openssl/safestack.h ../../include/openssl/sha.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

gost_params.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

gost_params.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

gost_params.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost_params.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost_params.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

gost_params.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h

gost_params.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h

gost_params.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h

gost_params.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

gost_params.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

gost_params.o: ../../include/openssl/opensslconf.h

gost_params.o: ../../include/openssl/opensslv.h

gost_params.o: ../../include/openssl/ossl_typ.h

gost_params.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

gost_params.o: ../../include/openssl/symhacks.h gost_params.c gost_params.h

gost_params.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h

gost_params.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

gost_params.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

gost_params.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

gost_params.o: gost89.h gost_lcl.h gost_params.c gosthash.h

gost_pmeth.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost_pmeth.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost_pmeth.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
@@ -252,23 +241,5 @@ 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/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

gost_pmeth.o: gosthash.h

gost_sign.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost_sign.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

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/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/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

gost_sign.o: gosthash.h

gost_pmeth.o: e_gost_err.h gost89.h gost_lcl.h gost_pmeth.c gosthash.h

gosthash.o: gost89.h gosthash.c gosthash.h

engines/ccgost/e_gost_err.c

+0 −18
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ static ERR_STRING_DATA GOST_str_functs[] = { 
    {ERR_FUNC(GOST_F_DECODE_GOST_ALGOR_PARAMS), "DECODE_GOST_ALGOR_PARAMS"},

    {ERR_FUNC(GOST_F_ENCODE_GOST_ALGOR_PARAMS), "ENCODE_GOST_ALGOR_PARAMS"},

    {ERR_FUNC(GOST_F_FILL_GOST2001_PARAMS), "FILL_GOST2001_PARAMS"},

    {ERR_FUNC(GOST_F_FILL_GOST94_PARAMS), "FILL_GOST94_PARAMS"},

    {ERR_FUNC(GOST_F_GET_ENCRYPTION_PARAMS), "GET_ENCRYPTION_PARAMS"},

    {ERR_FUNC(GOST_F_GOST2001_COMPUTE_PUBLIC), "GOST2001_COMPUTE_PUBLIC"},

    {ERR_FUNC(GOST_F_GOST2001_DO_SIGN), "GOST2001_DO_SIGN"},
@@ -83,37 +82,24 @@ static ERR_STRING_DATA GOST_str_functs[] = { 
     "GOST89_GET_ASN1_PARAMETERS"},

    {ERR_FUNC(GOST_F_GOST89_SET_ASN1_PARAMETERS),

     "GOST89_SET_ASN1_PARAMETERS"},

    {ERR_FUNC(GOST_F_GOST94_COMPUTE_PUBLIC), "GOST94_COMPUTE_PUBLIC"},

    {ERR_FUNC(GOST_F_GOST_CIPHER_CTL), "GOST_CIPHER_CTL"},

    {ERR_FUNC(GOST_F_GOST_DO_SIGN), "GOST_DO_SIGN"},

    {ERR_FUNC(GOST_F_GOST_DO_VERIFY), "GOST_DO_VERIFY"},

    {ERR_FUNC(GOST_F_GOST_IMIT_CTRL), "GOST_IMIT_CTRL"},

    {ERR_FUNC(GOST_F_GOST_IMIT_FINAL), "GOST_IMIT_FINAL"},

    {ERR_FUNC(GOST_F_GOST_IMIT_UPDATE), "GOST_IMIT_UPDATE"},

    {ERR_FUNC(GOST_F_GOST_SIGN_KEYGEN), "GOST_SIGN_KEYGEN"},

    {ERR_FUNC(GOST_F_PARAM_COPY_GOST01), "PARAM_COPY_GOST01"},

    {ERR_FUNC(GOST_F_PARAM_COPY_GOST94), "PARAM_COPY_GOST94"},

    {ERR_FUNC(GOST_F_PKEY_GOST01CP_DECRYPT), "PKEY_GOST01CP_DECRYPT"},

    {ERR_FUNC(GOST_F_PKEY_GOST01CP_ENCRYPT), "PKEY_GOST01CP_ENCRYPT"},

    {ERR_FUNC(GOST_F_PKEY_GOST01CP_KEYGEN), "PKEY_GOST01CP_KEYGEN"},

    {ERR_FUNC(GOST_F_PKEY_GOST01_PARAMGEN), "PKEY_GOST01_PARAMGEN"},

    {ERR_FUNC(GOST_F_PKEY_GOST2001_DERIVE), "PKEY_GOST2001_DERIVE"},

    {ERR_FUNC(GOST_F_PKEY_GOST94CP_DECRYPT), "PKEY_GOST94CP_DECRYPT"},

    {ERR_FUNC(GOST_F_PKEY_GOST94CP_ENCRYPT), "PKEY_GOST94CP_ENCRYPT"},

    {ERR_FUNC(GOST_F_PKEY_GOST94CP_KEYGEN), "PKEY_GOST94CP_KEYGEN"},

    {ERR_FUNC(GOST_F_PKEY_GOST94_PARAMGEN), "PKEY_GOST94_PARAMGEN"},

    {ERR_FUNC(GOST_F_PKEY_GOST_CTRL), "PKEY_GOST_CTRL"},

    {ERR_FUNC(GOST_F_PKEY_GOST_CTRL01_STR), "PKEY_GOST_CTRL01_STR"},

    {ERR_FUNC(GOST_F_PKEY_GOST_CTRL94_STR), "PKEY_GOST_CTRL94_STR"},

    {ERR_FUNC(GOST_F_PKEY_GOST_MAC_CTRL), "PKEY_GOST_MAC_CTRL"},

    {ERR_FUNC(GOST_F_PKEY_GOST_MAC_CTRL_STR), "PKEY_GOST_MAC_CTRL_STR"},

    {ERR_FUNC(GOST_F_PKEY_GOST_MAC_KEYGEN), "PKEY_GOST_MAC_KEYGEN"},

    {ERR_FUNC(GOST_F_PRINT_GOST_01), "PRINT_GOST_01"},

    {ERR_FUNC(GOST_F_PRIV_DECODE_GOST), "PRIV_DECODE_GOST"},

    {ERR_FUNC(GOST_F_PUB_DECODE_GOST01), "PUB_DECODE_GOST01"},

    {ERR_FUNC(GOST_F_PUB_DECODE_GOST94), "PUB_DECODE_GOST94"},

    {ERR_FUNC(GOST_F_PUB_ENCODE_GOST01), "PUB_ENCODE_GOST01"},

    {ERR_FUNC(GOST_F_UNPACK_CC_SIGNATURE), "UNPACK_CC_SIGNATURE"},

    {ERR_FUNC(GOST_F_UNPACK_CP_SIGNATURE), "UNPACK_CP_SIGNATURE"},

    {0, NULL}

};
@@ -128,8 +114,6 @@ static ERR_STRING_DATA GOST_str_reasons[] = { 
    {ERR_REASON(GOST_R_CTRL_CALL_FAILED), "ctrl call failed"},

    {ERR_REASON(GOST_R_ERROR_COMPUTING_SHARED_KEY),

     "error computing shared key"},

    {ERR_REASON(GOST_R_ERROR_PACKING_KEY_TRANSPORT_INFO),

     "error packing key transport info"},

    {ERR_REASON(GOST_R_ERROR_PARSING_KEY_TRANSPORT_INFO),

     "error parsing key transport info"},

    {ERR_REASON(GOST_R_INCOMPATIBLE_ALGORITHMS), "incompatible algorithms"},
@@ -137,11 +121,9 @@ static ERR_STRING_DATA GOST_str_reasons[] = { 
    {ERR_REASON(GOST_R_INVALID_CIPHER_PARAMS), "invalid cipher params"},

    {ERR_REASON(GOST_R_INVALID_CIPHER_PARAM_OID), "invalid cipher param oid"},

    {ERR_REASON(GOST_R_INVALID_DIGEST_TYPE), "invalid digest type"},

    {ERR_REASON(GOST_R_INVALID_GOST94_PARMSET), "invalid gost94 parmset"},

    {ERR_REASON(GOST_R_INVALID_IV_LENGTH), "invalid iv length"},

    {ERR_REASON(GOST_R_INVALID_MAC_KEY_LENGTH), "invalid mac key length"},

    {ERR_REASON(GOST_R_INVALID_PARAMSET), "invalid paramset"},

    {ERR_REASON(GOST_R_KEY_IS_NOT_INITALIZED), "key is not initalized"},

    {ERR_REASON(GOST_R_KEY_IS_NOT_INITIALIZED), "key is not initialized"},

    {ERR_REASON(GOST_R_KEY_PARAMETERS_MISSING), "key parameters missing"},

    {ERR_REASON(GOST_R_MAC_KEY_NOT_SET), "mac key not set"},