diff --git a/openssl-1.0.2j-gost-engine.patch b/openssl-1.0.2j-gost-engine.patch index 03026d3..76d1bc1 100644 --- a/openssl-1.0.2j-gost-engine.patch +++ b/openssl-1.0.2j-gost-engine.patch @@ -1,6 +1,6 @@ diff -urN openssl-1.0.2j/crypto/asn1/a_mbstr.c openssl-1.0.2j-patched/crypto/asn1/a_mbstr.c --- openssl-1.0.2j/crypto/asn1/a_mbstr.c 2016-09-26 19:49:07.000000000 +1000 -+++ openssl-1.0.2j-patched/crypto/asn1/a_mbstr.c 2016-12-09 01:28:18.693194289 +1000 ++++ openssl-1.0.2j-patched/crypto/asn1/a_mbstr.c 2016-12-09 17:41:01.051681648 +1000 @@ -173,6 +173,8 @@ str_type = V_ASN1_PRINTABLESTRING; else if (mask & B_ASN1_IA5STRING) @@ -12,7 +12,7 @@ diff -urN openssl-1.0.2j/crypto/asn1/a_mbstr.c openssl-1.0.2j-patched/crypto/asn else if (mask & B_ASN1_BMPSTRING) { diff -urN openssl-1.0.2j/crypto/asn1/a_strnid.c openssl-1.0.2j-patched/crypto/asn1/a_strnid.c --- openssl-1.0.2j/crypto/asn1/a_strnid.c 2016-09-26 19:49:07.000000000 +1000 -+++ openssl-1.0.2j-patched/crypto/asn1/a_strnid.c 2016-12-09 01:28:18.693194289 +1000 ++++ openssl-1.0.2j-patched/crypto/asn1/a_strnid.c 2016-12-09 17:41:01.051681648 +1000 @@ -192,7 +192,10 @@ {NID_name, 1, ub_name, DIRSTRING_TYPE, 0}, {NID_dnQualifier, -1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK}, @@ -27,7 +27,7 @@ diff -urN openssl-1.0.2j/crypto/asn1/a_strnid.c openssl-1.0.2j-patched/crypto/as static int sk_table_cmp(const ASN1_STRING_TABLE *const *a, diff -urN openssl-1.0.2j/crypto/cms/cms_sd.c openssl-1.0.2j-patched/crypto/cms/cms_sd.c --- openssl-1.0.2j/crypto/cms/cms_sd.c 2016-09-26 19:49:07.000000000 +1000 -+++ openssl-1.0.2j-patched/crypto/cms/cms_sd.c 2016-12-09 01:26:21.957202644 +1000 ++++ openssl-1.0.2j-patched/crypto/cms/cms_sd.c 2016-12-09 17:41:01.051681648 +1000 @@ -943,6 +943,8 @@ int CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap) { @@ -39,8 +39,8 @@ diff -urN openssl-1.0.2j/crypto/cms/cms_sd.c openssl-1.0.2j-patched/crypto/cms/c || !cms_add_cipher_smcap(smcap, NID_aes_192_cbc, -1) diff -urN openssl-1.0.2j/crypto/evp/evp.h openssl-1.0.2j-patched/crypto/evp/evp.h --- openssl-1.0.2j/crypto/evp/evp.h 2016-09-26 19:49:07.000000000 +1000 -+++ openssl-1.0.2j-patched/crypto/evp/evp.h 2016-12-09 01:39:15.093147313 +1000 -@@ -423,6 +423,14 @@ ++++ openssl-1.0.2j-patched/crypto/evp/evp.h 2016-12-09 17:43:29.024687755 +1000 +@@ -423,6 +423,35 @@ # define EVP_CTRL_TLS1_1_MULTIBLOCK_DECRYPT 0x1b # define EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE 0x1c @@ -51,13 +51,34 @@ diff -urN openssl-1.0.2j/crypto/evp/evp.h openssl-1.0.2j-patched/crypto/evp/evp. +#define EVP_CTRL_GOST_PARAMS 0x1d +#define EVP_CTRL_GOST_KEY_MESHING 0x1e +#define EVP_CTRL_GOST_PADDING 0x1f ++ ++/* EVP_CTRL_SET_SBOX takes the char * specifying S-boxes */ ++# define EVP_CTRL_SET_SBOX 0x1d ++/* ++ * EVP_CTRL_SBOX_USED takes a 'size_t' and 'char *', pointing at a ++ * pre-allocated buffer with specified size ++ */ ++# define EVP_CTRL_SBOX_USED 0x1e ++/* EVP_CTRL_KEY_MESH takes 'size_t' number of bytes to mesh the key after, ++ * 0 switches meshing off ++ */ ++# define EVP_CTRL_KEY_MESH 0x1f ++/* EVP_CTRL_BLOCK_PADDING_MODE takes the padding mode */ ++# define EVP_CTRL_BLOCK_PADDING_MODE 0x20 ++ ++/* Padding modes */ ++#define EVP_PADDING_PKCS7 1 ++#define EVP_PADDING_ISO7816_4 2 ++#define EVP_PADDING_ANSI923 3 ++#define EVP_PADDING_ISO10126 4 ++#define EVP_PADDING_ZERO 5 + /* RFC 5246 defines additional data to be 13 bytes in length */ # define EVP_AEAD_TLS1_AAD_LEN 13 diff -urN openssl-1.0.2j/crypto/evp/evp_pbe.c openssl-1.0.2j-patched/crypto/evp/evp_pbe.c --- openssl-1.0.2j/crypto/evp/evp_pbe.c 2016-09-26 19:49:07.000000000 +1000 -+++ openssl-1.0.2j-patched/crypto/evp/evp_pbe.c 2016-12-09 01:28:27.274193675 +1000 ++++ openssl-1.0.2j-patched/crypto/evp/evp_pbe.c 2016-12-09 17:41:01.052681648 +1000 @@ -121,6 +121,10 @@ {EVP_PBE_TYPE_PRF, NID_hmacWithSHA384, -1, NID_sha384, 0}, {EVP_PBE_TYPE_PRF, NID_hmacWithSHA512, -1, NID_sha512, 0}, @@ -71,7 +92,7 @@ diff -urN openssl-1.0.2j/crypto/evp/evp_pbe.c openssl-1.0.2j-patched/crypto/evp/ #ifdef TEST diff -urN openssl-1.0.2j/crypto/objects/obj_dat.h openssl-1.0.2j-patched/crypto/objects/obj_dat.h --- openssl-1.0.2j/crypto/objects/obj_dat.h 2016-09-26 19:49:34.000000000 +1000 -+++ openssl-1.0.2j-patched/crypto/objects/obj_dat.h 2016-12-09 01:27:47.434196526 +1000 ++++ openssl-1.0.2j-patched/crypto/objects/obj_dat.h 2016-12-09 17:41:01.053681648 +1000 @@ -62,12 +62,12 @@ * [including the GNU Public Licence.] */ @@ -465,7 +486,7 @@ diff -urN openssl-1.0.2j/crypto/objects/obj_dat.h openssl-1.0.2j-patched/crypto/ 782, /* OBJ_id_PasswordBasedMAC 1 2 840 113533 7 66 13 */ diff -urN openssl-1.0.2j/crypto/objects/objects.txt openssl-1.0.2j-patched/crypto/objects/objects.txt --- openssl-1.0.2j/crypto/objects/objects.txt 2016-09-26 19:49:07.000000000 +1000 -+++ openssl-1.0.2j-patched/crypto/objects/objects.txt 2016-12-09 01:27:47.434196526 +1000 ++++ openssl-1.0.2j-patched/crypto/objects/objects.txt 2016-12-09 17:41:01.053681648 +1000 @@ -1156,6 +1156,7 @@ member-body 643 2 2 : cryptopro @@ -551,7 +572,7 @@ diff -urN openssl-1.0.2j/crypto/objects/objects.txt openssl-1.0.2j-patched/crypt 1 2 392 200011 61 1 1 1 2 : CAMELLIA-128-CBC : camellia-128-cbc diff -urN openssl-1.0.2j/crypto/objects/obj_mac.h openssl-1.0.2j-patched/crypto/objects/obj_mac.h --- openssl-1.0.2j/crypto/objects/obj_mac.h 2016-09-26 19:49:33.000000000 +1000 -+++ openssl-1.0.2j-patched/crypto/objects/obj_mac.h 2016-12-09 01:27:47.434196526 +1000 ++++ openssl-1.0.2j-patched/crypto/objects/obj_mac.h 2016-12-09 17:41:01.054681648 +1000 @@ -3678,6 +3678,10 @@ #define NID_cryptocom 806 #define OBJ_cryptocom OBJ_member_body,643L,2L,9L @@ -752,7 +773,7 @@ diff -urN openssl-1.0.2j/crypto/objects/obj_mac.h openssl-1.0.2j-patched/crypto/ #define NID_camellia_128_cbc 751 diff -urN openssl-1.0.2j/crypto/objects/obj_mac.num openssl-1.0.2j-patched/crypto/objects/obj_mac.num --- openssl-1.0.2j/crypto/objects/obj_mac.num 2016-09-26 19:49:32.000000000 +1000 -+++ openssl-1.0.2j-patched/crypto/objects/obj_mac.num 2016-12-09 01:27:47.435196526 +1000 ++++ openssl-1.0.2j-patched/crypto/objects/obj_mac.num 2016-12-09 17:41:01.054681648 +1000 @@ -955,3 +955,45 @@ jurisdictionLocalityName 955 jurisdictionStateOrProvinceName 956 @@ -801,7 +822,7 @@ diff -urN openssl-1.0.2j/crypto/objects/obj_mac.num openssl-1.0.2j-patched/crypt +grasshopper_mac 999 diff -urN openssl-1.0.2j/crypto/objects/obj_xref.h openssl-1.0.2j-patched/crypto/objects/obj_xref.h --- openssl-1.0.2j/crypto/objects/obj_xref.h 2016-09-26 19:49:35.000000000 +1000 -+++ openssl-1.0.2j-patched/crypto/objects/obj_xref.h 2016-12-09 01:27:12.936198995 +1000 ++++ openssl-1.0.2j-patched/crypto/objects/obj_xref.h 2016-12-09 17:41:01.054681648 +1000 @@ -56,6 +56,10 @@ NID_dh_cofactor_kdf}, {NID_dhSinglePass_cofactorDH_sha512kdf_scheme, NID_sha512, @@ -822,7 +843,7 @@ diff -urN openssl-1.0.2j/crypto/objects/obj_xref.h openssl-1.0.2j-patched/crypto }; diff -urN openssl-1.0.2j/crypto/objects/obj_xref.txt openssl-1.0.2j-patched/crypto/objects/obj_xref.txt --- openssl-1.0.2j/crypto/objects/obj_xref.txt 2016-09-26 19:49:07.000000000 +1000 -+++ openssl-1.0.2j-patched/crypto/objects/obj_xref.txt 2016-12-09 01:27:12.936198995 +1000 ++++ openssl-1.0.2j-patched/crypto/objects/obj_xref.txt 2016-12-09 17:41:01.054681648 +1000 @@ -44,6 +44,8 @@ id_GostR3411_94_with_GostR3410_94 id_GostR3411_94 id_GostR3410_94 id_GostR3411_94_with_GostR3410_94_cc id_GostR3411_94 id_GostR3410_94_cc @@ -834,7 +855,7 @@ diff -urN openssl-1.0.2j/crypto/objects/obj_xref.txt openssl-1.0.2j-patched/cryp dhSinglePass_stdDH_sha224kdf_scheme sha224 dh_std_kdf diff -urN openssl-1.0.2j/crypto/pkcs12/p12_mutl.c openssl-1.0.2j-patched/crypto/pkcs12/p12_mutl.c --- openssl-1.0.2j/crypto/pkcs12/p12_mutl.c 2016-09-26 19:49:07.000000000 +1000 -+++ openssl-1.0.2j-patched/crypto/pkcs12/p12_mutl.c 2016-12-09 01:28:27.274193675 +1000 ++++ openssl-1.0.2j-patched/crypto/pkcs12/p12_mutl.c 2016-12-09 17:41:01.055681648 +1000 @@ -65,6 +65,28 @@ # include # include @@ -897,7 +918,7 @@ diff -urN openssl-1.0.2j/crypto/pkcs12/p12_mutl.c openssl-1.0.2j-patched/crypto/ } diff -urN openssl-1.0.2j/crypto/pkcs7/pk7_smime.c openssl-1.0.2j-patched/crypto/pkcs7/pk7_smime.c --- openssl-1.0.2j/crypto/pkcs7/pk7_smime.c 2016-09-26 19:49:07.000000000 +1000 -+++ openssl-1.0.2j-patched/crypto/pkcs7/pk7_smime.c 2016-12-09 01:26:21.958202643 +1000 ++++ openssl-1.0.2j-patched/crypto/pkcs7/pk7_smime.c 2016-12-09 17:41:01.055681648 +1000 @@ -185,6 +185,8 @@ goto err; } diff --git a/openssl.spec b/openssl.spec index c72a9aa..38ad11e 100644 --- a/openssl.spec +++ b/openssl.spec @@ -15,7 +15,7 @@ Summary: Secure Sockets Layer communications libs & utils Name: openssl Version: 1.0.2j -Release: 2 +Release: 3 License: BSD-like Group: System/Libraries Url: https://www.openssl.org