Merge branch 'gost89-cbc'

Conflicts:
	e_gost_err.h

diff --git a/Makefile b/Makefile
index 10e41ce8ccf8ce185dac5ea5c908d82b14eeec2d..cae4b79d028b2768807dab4d3b6a28f1f15e6bba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -84,6 +84,10 @@ dclean:
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff *.so *.sl *.dll *.dylib
 
+gostsum$(EXE_EXT): gostsum.o gosthash.o gost89.o
+
+gost12sum$(EXE_EXT): gost12sum.o gosthash2012.o
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 gost89.o: gost89.c gost89.h
@@ -221,7 +225,7 @@ gost_md2012.o: ../../include/openssl/opensslv.h
 gost_md2012.o: ../../include/openssl/ossl_typ.h
 gost_md2012.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 gost_md2012.o: ../../include/openssl/symhacks.h gost_md2012.c gosthash2012.h
-gost_md2012.o: gosthash2012_const.h gosthash2012_precalc.h gosthash2012_sse2.h
+gost_md2012.o: gosthash2012_const.h gosthash2012_precalc.h gosthash2012_ref.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
@@ -253,22 +257,6 @@ 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_pmeth.c 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_sign.c gosthash.h
 gosthash.o: gost89.h gosthash.c gosthash.h
 gosthash2012.o: gosthash2012.c gosthash2012.h gosthash2012_const.h
-gosthash2012.o: gosthash2012_precalc.h gosthash2012_sse2.h
+gosthash2012.o: gosthash2012_precalc.h gosthash2012_ref.h

diff --git a/e_gost_err.c b/e_gost_err.c
index 376d18b830ba1c2c136ead2ea5e35377b240b3fb..8f3b35b5afbe8636084e9d541d54b011b51f9e03 100644 (file)
--- a/e_gost_err.c
+++ b/e_gost_err.c
@@ -72,17 +72,13 @@
 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_GOST94_PARAMS), "FILL_GOST94_PARAMS"},
     {ERR_FUNC(GOST_F_FILL_GOST_EC_PARAMS), "FILL_GOST_EC_PARAMS"},
     {ERR_FUNC(GOST_F_GET_ENCRYPTION_PARAMS), "GET_ENCRYPTION_PARAMS"},
     {ERR_FUNC(GOST_F_GOST89_GET_ASN1_PARAMETERS),
      "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_EC_COMPUTE_PUBLIC), "GOST_EC_COMPUTE_PUBLIC"},
     {ERR_FUNC(GOST_F_GOST_EC_KEYGEN), "GOST_EC_KEYGEN"},
     {ERR_FUNC(GOST_F_GOST_EC_SIGN), "GOST_EC_SIGN"},
@@ -90,13 +86,9 @@ static ERR_STRING_DATA GOST_str_functs[] = {
     {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_GOST_EC), "PARAM_COPY_GOST_EC"},
     {ERR_FUNC(GOST_F_PKEY_GOST01_PARAMGEN), "PKEY_GOST01_PARAMGEN"},
     {ERR_FUNC(GOST_F_PKEY_GOST12_PARAMGEN), "PKEY_GOST12_PARAMGEN"},
-    {ERR_FUNC(GOST_F_PKEY_GOST94_CTRL_STR), "PKEY_GOST94_CTRL_STR"},
-    {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_ECCP_DECRYPT), "PKEY_GOST_ECCP_DECRYPT"},
     {ERR_FUNC(GOST_F_PKEY_GOST_ECCP_ENCRYPT), "PKEY_GOST_ECCP_ENCRYPT"},
@@ -108,13 +100,8 @@ static ERR_STRING_DATA GOST_str_functs[] = {
     {ERR_FUNC(GOST_F_PKEY_GOST_MAC_KEYGEN), "PKEY_GOST_MAC_KEYGEN"},
     {ERR_FUNC(GOST_F_PRINT_GOST_EC_PUB), "PRINT_GOST_EC_PUB"},
     {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_DECODE_GOST_EC), "PUB_DECODE_GOST_EC"},
-    {ERR_FUNC(GOST_F_PUB_ENCODE_GOST01), "PUB_ENCODE_GOST01"},
-    {ERR_FUNC(GOST_F_PUB_ENCODE_GOST94), "PUB_ENCODE_GOST94"},
     {ERR_FUNC(GOST_F_PUB_ENCODE_GOST_EC), "PUB_ENCODE_GOST_EC"},
-    {ERR_FUNC(GOST_F_UNPACK_CC_SIGNATURE), "UNPACK_CC_SIGNATURE"},
     {ERR_FUNC(GOST_F_UNPACK_CP_SIGNATURE), "UNPACK_CP_SIGNATURE"},
     {ERR_FUNC(GOST_F_VKO_COMPUTE_KEY), "VKO_COMPUTE_KEY"},
     {0, NULL}
@@ -132,6 +119,7 @@ static ERR_STRING_DATA GOST_str_reasons[] = {
      "error computing shared key"},
     {ERR_REASON(GOST_R_ERROR_PARSING_KEY_TRANSPORT_INFO),
      "error parsing key transport info"},
+    {ERR_REASON(GOST_R_ERROR_POINT_MUL), "error point mul"},
     {ERR_REASON(GOST_R_INCOMPATIBLE_ALGORITHMS), "incompatible algorithms"},
     {ERR_REASON(GOST_R_INCOMPATIBLE_PEER_KEY), "incompatible peer key"},
     {ERR_REASON(GOST_R_INVALID_CIPHER_PARAMS), "invalid cipher params"},
@@ -142,21 +130,15 @@ static ERR_STRING_DATA GOST_str_reasons[] = {
     {ERR_REASON(GOST_R_INVALID_MAC_KEY_SIZE) ,"invalid mac key size"},
     {ERR_REASON(GOST_R_INVALID_MAC_SIZE)     ,"invalid mac size"},
     {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"},
-    {ERR_REASON(GOST_R_MALLOC_FAILURE), "malloc failure"},
-    {ERR_REASON(GOST_R_NO_MEMORY), "no memory"},
     {ERR_REASON(GOST_R_NO_PARAMETERS_SET), "no parameters set"},
     {ERR_REASON(GOST_R_NO_PEER_KEY), "no peer key"},
     {ERR_REASON(GOST_R_NO_PRIVATE_PART_OF_NON_EPHEMERAL_KEYPAIR),
      "no private part of non ephemeral keypair"},
     {ERR_REASON(GOST_R_PUBLIC_KEY_UNDEFINED), "public key undefined"},
-    {ERR_REASON(GOST_R_RANDOM_GENERATOR_ERROR), "random generator error"},
-    {ERR_REASON(GOST_R_RANDOM_GENERATOR_FAILURE), "random generator failure"},
-    {ERR_REASON(GOST_R_RANDOM_NUMBER_GENERATOR_FAILED),
-     "random number generator failed"},
+    {ERR_REASON(GOST_R_RNG_ERROR), "rng error"},
     {ERR_REASON(GOST_R_SIGNATURE_MISMATCH), "signature mismatch"},
     {ERR_REASON(GOST_R_SIGNATURE_PARTS_GREATER_THAN_Q),
      "signature parts greater than q"},

diff --git a/e_gost_err.h b/e_gost_err.h
index b2d9a4feae285f6ca66f4d0d4aec3dd068b3a99c..1caaa9488b4676ec1293d372102a0ae7fdf60aa0 100644 (file)
--- a/e_gost_err.h
+++ b/e_gost_err.h
@@ -74,49 +74,36 @@ void ERR_GOST_error(int function, int reason, char *file, int line);
 /* Function codes. */
 # define GOST_F_DECODE_GOST_ALGOR_PARAMS                  100
 # define GOST_F_ENCODE_GOST_ALGOR_PARAMS                  101
-# define GOST_F_FILL_GOST94_PARAMS                        102
-# define GOST_F_FILL_GOST_EC_PARAMS                       103
-# define GOST_F_GET_ENCRYPTION_PARAMS                     104
-# define GOST_F_GOST89_GET_ASN1_PARAMETERS                105
-# define GOST_F_GOST89_SET_ASN1_PARAMETERS                106
-# define GOST_F_GOST94_COMPUTE_PUBLIC                     107
-# define GOST_F_GOST_CIPHER_CTL                           108
-# define GOST_F_GOST_DO_SIGN                              109
-# define GOST_F_GOST_DO_VERIFY                            110
-# define GOST_F_GOST_EC_COMPUTE_PUBLIC                    111
-# define GOST_F_GOST_EC_KEYGEN                            112
-# define GOST_F_GOST_EC_SIGN                              113
-# define GOST_F_GOST_EC_VERIFY                            114
-# define GOST_F_GOST_IMIT_CTRL                            115
-# define GOST_F_GOST_IMIT_FINAL                           116
-# define GOST_F_GOST_IMIT_UPDATE                          117
-# define GOST_F_GOST_SIGN_KEYGEN                          118
-# define GOST_F_PARAM_COPY_GOST01                         119
-# define GOST_F_PARAM_COPY_GOST_EC                        120
-# define GOST_F_PKEY_GOST01_PARAMGEN                      121
-# define GOST_F_PKEY_GOST12_PARAMGEN                      122
-# define GOST_F_PKEY_GOST94_CTRL_STR                      123
-# define GOST_F_PKEY_GOST94_PARAMGEN                      124
-# define GOST_F_PKEY_GOST_CTRL                            125
-# define GOST_F_PKEY_GOST_ECCP_DECRYPT                    126
-# define GOST_F_PKEY_GOST_ECCP_ENCRYPT                    127
-# define GOST_F_PKEY_GOST_EC_CTRL_STR_256                 128
-# define GOST_F_PKEY_GOST_EC_CTRL_STR_512                 129
-# define GOST_F_PKEY_GOST_EC_DERIVE                       130
-# define GOST_F_PKEY_GOST_MAC_CTRL                        131
-# define GOST_F_PKEY_GOST_MAC_CTRL_STR                    132
-# define GOST_F_PKEY_GOST_MAC_KEYGEN                      133
-# define GOST_F_PRINT_GOST_EC_PUB                         134
-# define GOST_F_PRIV_DECODE_GOST                          135
-# define GOST_F_PUB_DECODE_GOST01                         136
-# define GOST_F_PUB_DECODE_GOST94                         137
-# define GOST_F_PUB_DECODE_GOST_EC                        138
-# define GOST_F_PUB_ENCODE_GOST01                         139
-# define GOST_F_PUB_ENCODE_GOST94                         140
-# define GOST_F_PUB_ENCODE_GOST_EC                        141
-# define GOST_F_UNPACK_CC_SIGNATURE                       142
-# define GOST_F_UNPACK_CP_SIGNATURE                       143
-# define GOST_F_VKO_COMPUTE_KEY                           144
+# define GOST_F_FILL_GOST_EC_PARAMS                       102
+# define GOST_F_GET_ENCRYPTION_PARAMS                     103
+# define GOST_F_GOST89_GET_ASN1_PARAMETERS                104
+# define GOST_F_GOST89_SET_ASN1_PARAMETERS                105
+# define GOST_F_GOST_CIPHER_CTL                           106
+# define GOST_F_GOST_EC_COMPUTE_PUBLIC                    107
+# define GOST_F_GOST_EC_KEYGEN                            108
+# define GOST_F_GOST_EC_SIGN                              109
+# define GOST_F_GOST_EC_VERIFY                            110
+# define GOST_F_GOST_IMIT_CTRL                            111
+# define GOST_F_GOST_IMIT_FINAL                           112
+# define GOST_F_GOST_IMIT_UPDATE                          113
+# define GOST_F_PARAM_COPY_GOST_EC                        114
+# define GOST_F_PKEY_GOST01_PARAMGEN                      115
+# define GOST_F_PKEY_GOST12_PARAMGEN                      116
+# define GOST_F_PKEY_GOST_CTRL                            117
+# define GOST_F_PKEY_GOST_ECCP_DECRYPT                    118
+# define GOST_F_PKEY_GOST_ECCP_ENCRYPT                    119
+# define GOST_F_PKEY_GOST_EC_CTRL_STR_256                 120
+# define GOST_F_PKEY_GOST_EC_CTRL_STR_512                 121
+# define GOST_F_PKEY_GOST_EC_DERIVE                       122
+# define GOST_F_PKEY_GOST_MAC_CTRL                        123
+# define GOST_F_PKEY_GOST_MAC_CTRL_STR                    124
+# define GOST_F_PKEY_GOST_MAC_KEYGEN                      125
+# define GOST_F_PRINT_GOST_EC_PUB                         126
+# define GOST_F_PRIV_DECODE_GOST                          127
+# define GOST_F_PUB_DECODE_GOST_EC                        128
+# define GOST_F_PUB_ENCODE_GOST_EC                        129
+# define GOST_F_UNPACK_CP_SIGNATURE                       130
+# define GOST_F_VKO_COMPUTE_KEY                           131
 
 /* Reason codes. */
 # define GOST_R_BAD_KEY_PARAMETERS_FORMAT                 100
@@ -125,34 +112,28 @@ void ERR_GOST_error(int function, int reason, char *file, int line);
 # define GOST_R_CTRL_CALL_FAILED                          103
 # define GOST_R_ERROR_COMPUTING_SHARED_KEY                104
 # define GOST_R_ERROR_PARSING_KEY_TRANSPORT_INFO          105
-# define GOST_R_INCOMPATIBLE_ALGORITHMS                   106
-# define GOST_R_INCOMPATIBLE_PEER_KEY                     107
-# define GOST_R_INVALID_CIPHER_PARAMS                     108
-# define GOST_R_INVALID_CIPHER_PARAM_OID                  109
-# define GOST_R_INVALID_DIGEST_TYPE                       110
-# define GOST_R_INVALID_IV_LENGTH                         111
-# define GOST_R_INVALID_MAC_KEY_LENGTH                    112
-# define GOST_R_INVALID_MAC_KEY_SIZE                      145
-# define GOST_R_INVALID_MAC_SIZE                          146
-# define GOST_R_INVALID_PARAMSET                          113
-# define GOST_R_KEY_IS_NOT_INITALIZED                     114
+# define GOST_R_ERROR_POINT_MUL                           106
+# define GOST_R_INCOMPATIBLE_ALGORITHMS                   107
+# define GOST_R_INCOMPATIBLE_PEER_KEY                     108
+# define GOST_R_INVALID_CIPHER_PARAMS                     109
+# define GOST_R_INVALID_CIPHER_PARAM_OID                  110
+# define GOST_R_INVALID_DIGEST_TYPE                       111
+# define GOST_R_INVALID_IV_LENGTH                         112
+# define GOST_R_INVALID_MAC_KEY_LENGTH                    113
+# define GOST_R_INVALID_PARAMSET                          114
 # define GOST_R_KEY_IS_NOT_INITIALIZED                    115
 # define GOST_R_KEY_PARAMETERS_MISSING                    116
 # define GOST_R_MAC_KEY_NOT_SET                           117
-# define GOST_R_MALLOC_FAILURE                            118
-# define GOST_R_NO_MEMORY                                 119
-# define GOST_R_NO_PARAMETERS_SET                         120
-# define GOST_R_NO_PEER_KEY                               121
-# define GOST_R_NO_PRIVATE_PART_OF_NON_EPHEMERAL_KEYPAIR  122
-# define GOST_R_PUBLIC_KEY_UNDEFINED                      123
-# define GOST_R_RANDOM_GENERATOR_ERROR                    124
-# define GOST_R_RANDOM_GENERATOR_FAILURE                  125
-# define GOST_R_RANDOM_NUMBER_GENERATOR_FAILED            126
-# define GOST_R_SIGNATURE_MISMATCH                        127
-# define GOST_R_SIGNATURE_PARTS_GREATER_THAN_Q            128
-# define GOST_R_UKM_NOT_SET                               129
-# define GOST_R_UNSUPPORTED_CIPHER_CTL_COMMAND            130
-# define GOST_R_UNSUPPORTED_PARAMETER_SET                 131
+# define GOST_R_NO_PARAMETERS_SET                         118
+# define GOST_R_NO_PEER_KEY                               119
+# define GOST_R_NO_PRIVATE_PART_OF_NON_EPHEMERAL_KEYPAIR  120
+# define GOST_R_PUBLIC_KEY_UNDEFINED                      121
+# define GOST_R_RNG_ERROR                                 122
+# define GOST_R_SIGNATURE_MISMATCH                        123
+# define GOST_R_SIGNATURE_PARTS_GREATER_THAN_Q            124
+# define GOST_R_UKM_NOT_SET                               125
+# define GOST_R_UNSUPPORTED_CIPHER_CTL_COMMAND            126
+# define GOST_R_UNSUPPORTED_PARAMETER_SET                 127
 
 #ifdef  __cplusplus
 }

diff --git a/gost12sum.c b/gost12sum.c
new file mode 100644 (file)
index 0000000..71d73eb
--- /dev/null
+++ b/gost12sum.c
@@ -0,0 +1,265 @@
+/**********************************************************************
+ *                          gostsum12.c                               *
+ *             Copyright (c) 2005-2014 Cryptocom LTD                  *
+ *         This file is distributed under same license as OpenSSL     *
+ *                                                                    *
+ *    Implementation of GOST R 34.11-2012 hash function as            *
+ *    command line utility more or less interface                     *
+ *    compatible with md5sum and sha1sum                              *
+ *    Doesn't need OpenSSL                                            *
+ **********************************************************************/
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <limits.h>
+#include <fcntl.h>
+#ifdef _WIN32
+#include <io.h>
+#endif
+#include <string.h>
+#include "gosthash2012.h"
+
+#define BUF_SIZE 262144
+#define gost_hash_ctx gost2012_hash_ctx
+#define GOST34112012Init init_gost2012_hash_ctx
+#define GOST34112012Update gost2012_hash_block
+#define GOST34112012Final gost2012_finish_hash
+
+#define MAX_HASH_SIZE 128
+
+typedef unsigned char byte;
+
+int hashsize = 256;
+int hash_file(gost_hash_ctx * ctx, char *filename, char *sum, int mode);
+int hash_stream(gost_hash_ctx * ctx, int fd, char *sum);
+int get_line(FILE *f, char *hash, char *filename, int verbose);
+
+void help()
+{
+    fprintf(stderr, "Calculates GOST R 34.11-2012 hash function\n\n");
+    fprintf(stderr, "gostsum12 [-bvl] [-c [file]]| [files]|-x\n"
+            "\t-c check message digests (default is generate)\n"
+            "\t-v verbose, print file names when checking\n"
+            "\t-b read files in binary mode\n"
+            "\t-l use 512 bit hash (default 256 bit)\n"
+            "\t-x read filenames from stdin rather than from arguments \n"
+            "The input for -c should be the list of message digests and file names\n"
+            "that is printed on stdout by this program when it generates digests.\n");
+    exit(3);
+}
+
+#ifndef O_BINARY
+# define O_BINARY 0
+#endif
+
+int start_hash12(gost_hash_ctx * ctx)
+{
+    GOST34112012Init(ctx, hashsize);
+    return 1;
+}
+
+int hash12_block(gost_hash_ctx * ctx, const byte * block, size_t length)
+{
+    GOST34112012Update(ctx, block, length);
+    return 1;
+}
+
+int finish_hash12(gost_hash_ctx * ctx, byte * hashval)
+{
+    GOST34112012Final(ctx, hashval);
+    return 1;
+}
+
+int main(int argc, char **argv)
+{
+    int c, i;
+    int verbose = 0;
+    int errors = 0;
+    int open_mode = O_RDONLY;
+    FILE *check_file = NULL;
+    int filenames_from_stdin = 0;
+    gost_hash_ctx ctx;
+
+    while ((c = getopt(argc, argv, "bxlvc::")) != -1) {
+        switch (c) {
+               case 'b':
+                       open_mode = open_mode | O_BINARY;
+                       break;
+        case 'v':
+            verbose = 1;
+            break;
+        case 'l':
+            hashsize = 512;
+            break;
+        case 'x':
+            filenames_from_stdin = 1;
+            break;
+        case 'c':
+            if (optarg) {
+                check_file = fopen(optarg, "r");
+                if (!check_file) {
+                    perror(optarg);
+                    exit(2);
+                }
+            } else {
+                check_file = stdin;
+            }
+            break;
+        default:
+            fprintf(stderr, "invalid option %c", optopt);
+            help();
+        }
+    }
+    if (check_file) {
+        char inhash[MAX_HASH_SIZE+1], calcsum[MAX_HASH_SIZE+1], filename[PATH_MAX];
+        int failcount = 0, count = 0;;
+        if (check_file == stdin && optind < argc) {
+            check_file = fopen(argv[optind], "r");
+            if (!check_file) {
+                perror(argv[optind]);
+                exit(2);
+            }
+        }
+        while (get_line(check_file, inhash, filename, verbose)) {
+            count++;
+            if (!hash_file(&ctx, filename, calcsum, open_mode)) {
+                errors++;
+                               continue;
+            }
+            if (!strncmp(calcsum, inhash, hashsize/4+1)) {
+                if (verbose) {
+                    fprintf(stderr, "%s\tOK\n", filename);
+                }
+            } else {
+                if (verbose) {
+                    fprintf(stderr, "%s\tFAILED\n", filename);
+                } else {
+                    fprintf(stderr,
+                            "%s: GOST hash sum check failed for '%s'\n",
+                            argv[0], filename);
+                }
+                failcount++;
+            }
+        }
+        if (errors) {
+            fprintf(stderr,
+                    "%s: WARNING %d of %d file(s) cannot be processed\n",
+                    argv[0], errors, count);
+
+        }
+        if (failcount) {
+            fprintf(stderr,
+                    "%s: WARNING %d of %d file(s) failed GOST hash sum check\n",
+                    argv[0], failcount, count - errors);
+        }
+        exit((failcount || errors) ? 1 : 0);
+    } else if (filenames_from_stdin) {
+        char sum[65];
+        char filename[PATH_MAX + 1], *end;
+        while (!feof(stdin)) {
+            if (!fgets(filename, PATH_MAX, stdin))
+                break;
+            for (end = filename; *end; end++) ;
+            end--;
+            for (; *end == '\n' || *end == '\r'; end--)
+                *end = 0;
+            if (!hash_file(&ctx, filename, sum, open_mode)) {
+                errors++;
+            } else {
+                printf("%s %s\n", sum, filename);
+            }
+        }
+    } else if (optind == argc) {
+        char sum[65];
+#ifdef _WIN32
+               if (open_mode & O_BINARY) {
+                       _setmode(fileno(stdin), O_BINARY);
+               }
+#endif
+        if (!hash_stream(&ctx, fileno(stdin), sum)) {
+            perror("stdin");
+            exit(1);
+        }
+        printf("%s -\n", sum);
+        exit(0);
+    } else {
+        for (i = optind; i < argc; i++) {
+            char sum[65];
+            if (!hash_file(&ctx, argv[i], sum, open_mode)) {
+                errors++;
+            } else {
+                printf("%s %s\n", sum, argv[i]);
+            }
+        }
+    }
+    exit(errors ? 1 : 0);
+}
+
+int hash_file(gost_hash_ctx * ctx, char *filename, char *sum, int mode)
+{
+    int fd;
+    if ((fd = open(filename, mode)) < 0) {
+        perror(filename);
+        return 0;
+    }
+    if (!hash_stream(ctx, fd, sum)) {
+        perror(filename);
+        return 0;
+    }
+    close(fd);
+    return 1;
+}
+
+int hash_stream(gost_hash_ctx * ctx, int fd, char *sum)
+{
+    unsigned char buffer[BUF_SIZE];
+       unsigned char reverted_buffer[BUF_SIZE];
+    ssize_t bytes;
+    int i,j,k;
+    start_hash12(ctx);
+    while ((bytes = read(fd, buffer, BUF_SIZE)) > 0) {
+        hash12_block(ctx, reverted_buffer, bytes);
+    }
+    if (bytes < 0) {
+        return 0;
+    }
+    finish_hash12(ctx, buffer);
+    for (i = 0; i < (hashsize / 8); i++) {
+        sprintf(sum + 2 * i, "%02x", buffer[i]);
+    }
+    return 1;
+}
+
+int get_line(FILE *f, char *hash, char *filename, int verbose)
+{
+    int i, len;
+       int hashstrlen = hashsize/4;
+    while (!feof(f)) {
+        if (!fgets(filename, PATH_MAX, f))
+            return 0;
+        len = strlen(filename);
+        if (len < hashstrlen+2) {
+            goto nextline;
+        }
+        if (filename[hashstrlen] != ' ') {
+            goto nextline;
+        }
+        for (i = 0; i < hashstrlen; i++) {
+            if (filename[i] < '0' || (filename[i] > '9' && filename[i] < 'A')
+                || (filename[i] > 'F' && filename[i] < 'a')
+                || filename[i] > 'f') {
+                goto nextline;
+            }
+        }
+        memcpy(hash, filename, hashstrlen);
+        hash[hashstrlen] = 0;
+        while (filename[--len] == '\n' || filename[len] == '\r')
+            filename[len] = 0;
+        memmove(filename, filename + hashstrlen+1, len - hashstrlen +1);
+        return 1;
+    nextline:
+        if (verbose)
+            printf(filename);
+    }
+    return 0;
+}

diff --git a/gost_crypt.c b/gost_crypt.c
index d1e8113b4159fb63d37d4d4d511a5bf23b6e20e1..52aad0a2a59d08eecd2190dc2811e530779374c9 100644 (file)
--- a/gost_crypt.c
+++ b/gost_crypt.c
@@ -537,8 +537,7 @@ int gost_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
     case EVP_CTRL_RAND_KEY:
         {
             if (RAND_bytes((unsigned char *)ptr, ctx->key_len) <= 0) {
-                GOSTerr(GOST_F_GOST_CIPHER_CTL,
-                        GOST_R_RANDOM_GENERATOR_ERROR);
+                GOSTerr(GOST_F_GOST_CIPHER_CTL, GOST_R_RNG_ERROR);
                 return -1;
             }
             break;

diff --git a/gost_ec_keyx.c b/gost_ec_keyx.c
index 929c7861765e4288906159f9cdc93c9daaf545fb..c2a465b15c342f188f24eaee584abf95a80faec8 100644 (file)
--- a/gost_ec_keyx.c
+++ b/gost_ec_keyx.c
@@ -35,7 +35,7 @@ static int VKO_compute_key(unsigned char *shared_key, size_t shared_key_size,
         half_len = buf_len >> 1;
 
     if (!ctx) {
-        GOSTerr(GOST_F_VKO_COMPUTE_KEY, GOST_R_NO_MEMORY);
+        GOSTerr(GOST_F_VKO_COMPUTE_KEY, ERR_R_MALLOC_FAILURE);
         return 0;
     }
     BN_CTX_start(ctx);
@@ -43,7 +43,7 @@ static int VKO_compute_key(unsigned char *shared_key, size_t shared_key_size,
     databuf = OPENSSL_malloc(buf_len);
     hashbuf = OPENSSL_malloc(buf_len);
     if (!databuf || !hashbuf) {
-        GOSTerr(GOST_F_VKO_COMPUTE_KEY, GOST_R_MALLOC_FAILURE);
+        GOSTerr(GOST_F_VKO_COMPUTE_KEY, ERR_R_MALLOC_FAILURE);
         goto err;
     }
 
@@ -60,7 +60,10 @@ static int VKO_compute_key(unsigned char *shared_key, size_t shared_key_size,
     Y = BN_CTX_get(ctx);
     EC_GROUP_get_order(EC_KEY_get0_group(priv_key), order, ctx);
     BN_mod_mul(p, key, UKM, order, ctx);
-    EC_POINT_mul(EC_KEY_get0_group(priv_key), pnt, NULL, pub_key, p, ctx);
+    if(!EC_POINT_mul(EC_KEY_get0_group(priv_key), pnt, NULL, pub_key, p, ctx)) {
+        GOSTerr(GOST_F_VKO_COMPUTE_KEY, GOST_R_ERROR_POINT_MUL);
+        goto err;
+               }
     EC_POINT_get_affine_coordinates_GFp(EC_KEY_get0_group(priv_key),
                                         pnt, X, Y, ctx);
     /*
@@ -163,8 +166,7 @@ int pkey_GOST_ECcp_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out,
     } else if (out) {
 
         if (RAND_bytes(ukm, 8) <= 0) {
-            GOSTerr(GOST_F_PKEY_GOST_ECCP_ENCRYPT,
-                    GOST_R_RANDOM_GENERATOR_FAILURE);
+            GOSTerr(GOST_F_PKEY_GOST_ECCP_ENCRYPT, GOST_R_RNG_ERROR);
             return 0;
         }
     }

diff --git a/gost_ec_sign.c b/gost_ec_sign.c
index 8821799db6b1e439917add2d368e3cf819356b99..9d542ceac4da117e9662cf5598480b7ef03e8fc5 100644 (file)
--- a/gost_ec_sign.c
+++ b/gost_ec_sign.c
@@ -175,7 +175,7 @@ DSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey)
     md = hashsum2bn(dgst, dlen);
     newsig = DSA_SIG_new();
     if (!newsig || !md) {
-        GOSTerr(GOST_F_GOST_EC_SIGN, GOST_R_NO_MEMORY);
+        GOSTerr(GOST_F_GOST_EC_SIGN, ERR_R_MALLOC_FAILURE);
         goto err;
     }
     group = EC_KEY_get0_group(eckey);
@@ -218,8 +218,7 @@ DSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey)
     do {
         do {
             if (!BN_rand_range(k, order)) {
-                GOSTerr(GOST_F_GOST_EC_SIGN,
-                        GOST_R_RANDOM_NUMBER_GENERATOR_FAILED);
+                GOSTerr(GOST_F_GOST_EC_SIGN, GOST_R_RNG_ERROR);
                 goto err;
             }
             /*
@@ -315,7 +314,7 @@ int gost_ec_verify(const unsigned char *dgst, int dgst_len,
     OPENSSL_assert(dgst != NULL && sig != NULL && group != NULL);
 
     if (!(ctx = BN_CTX_new())) {
-        GOSTerr(GOST_F_GOST_EC_VERIFY, GOST_R_NO_MEMORY);
+        GOSTerr(GOST_F_GOST_EC_VERIFY, ERR_R_MALLOC_FAILURE);
         return 0;
     }
 
@@ -502,8 +501,7 @@ int gost_ec_keygen(EC_KEY *ec)
 
     do {
         if (!BN_rand_range(d, order)) {
-            GOSTerr(GOST_F_GOST_EC_KEYGEN,
-                    GOST_R_RANDOM_NUMBER_GENERATOR_FAILED);
+            GOSTerr(GOST_F_GOST_EC_KEYGEN, GOST_R_RNG_ERROR);
             goto end;
         }
     }

diff --git a/gostsum.c b/gostsum.c
index 252bd2cfed6a25c81efdb1f5997e9c0fe765f55e..02d56881a32b99658ca3fdd0a3dce951d1c05f0d 100644 (file)
--- a/gostsum.c
+++ b/gostsum.c
@@ -12,6 +12,9 @@
 #include <unistd.h>
 #include <limits.h>
 #include <fcntl.h>
+#ifdef _WIN32
+# include <io.h>
+#endif
 #include <string.h>
 #include "gosthash.h"
 #define BUF_SIZE 262144
@@ -74,7 +77,7 @@ int main(int argc, char **argv)
     init_gost_hash_ctx(&ctx, b);
     if (check_file) {
         char inhash[65], calcsum[65], filename[PATH_MAX];
-        int failcount = 0, count = 0;;
+        int failcount = 0, count = 0, errors = 0;
         if (check_file == stdin && optind < argc) {
             check_file = fopen(argv[optind], "r");
             if (!check_file) {
@@ -83,10 +86,11 @@ int main(int argc, char **argv)
             }
         }
         while (get_line(check_file, inhash, filename)) {
+            count++;
             if (!hash_file(&ctx, filename, calcsum, open_mode)) {
-                exit(2);
+                errors ++;
+                               continue;
             }
-            count++;
             if (strncmp(calcsum, inhash, 65) == 0) {
                 if (verbose) {
                     fprintf(stderr, "%s\tOK\n", filename);
@@ -102,15 +106,26 @@ int main(int argc, char **argv)
                 failcount++;
             }
         }
+        if (errors) {
+            fprintf(stderr,
+                    "%s: WARNING %d of %d file(s) cannot be processed\n",
+                    argv[0], errors, count);
+
+        }
         if (verbose && failcount) {
             fprintf(stderr,
                     "%s: %d of %d file(f) failed GOST hash sum check\n",
                     argv[0], failcount, count);
         }
-        exit(failcount ? 1 : 0);
+        exit((failcount || errors)? 1 : 0);
     }
     if (optind == argc) {
         char sum[65];
+#ifdef _WIN32
+               if (open_mode & O_BINARY) {
+                       _setmode(fileno(stdin),O_BINARY);
+               }
+#endif
         if (!hash_stream(&ctx, fileno(stdin), sum)) {
             perror("stdin");
             exit(1);

diff --git a/patches/1.0.2/numeric.diff b/patches/1.0.2/numeric.diff
new file mode 100644 (file)
index 0000000..8c47d9d
--- /dev/null
+++ b/patches/1.0.2/numeric.diff
@@ -0,0 +1,28 @@
+diff -Nuar openssl-1.0.2d/crypto/asn1/a_mbstr.c openssl-work/crypto/asn1/a_mbstr.c
+--- openssl-1.0.2d/crypto/asn1/a_mbstr.c       2015-07-09 15:53:21.000000000 +0400
++++ openssl-work/crypto/asn1/a_mbstr.c 2015-03-26 13:00:21.000000000 +0400
+@@ -173,6 +173,8 @@
+         str_type = V_ASN1_PRINTABLESTRING;
+     else if (mask & B_ASN1_IA5STRING)
+         str_type = V_ASN1_IA5STRING;
++    else if (mask & B_ASN1_NUMERICSTRING)
++        str_type = V_ASN1_NUMERICSTRING;
+     else if (mask & B_ASN1_T61STRING)
+         str_type = V_ASN1_T61STRING;
+     else if (mask & B_ASN1_BMPSTRING) {
+diff -Nuar openssl-1.0.2d/crypto/asn1/a_strnid.c openssl-work/crypto/asn1/a_strnid.c
+--- openssl-1.0.2d/crypto/asn1/a_strnid.c      2015-07-09 15:53:21.000000000 +0400
++++ openssl-work/crypto/asn1/a_strnid.c        2015-03-26 13:00:21.000000000 +0400
+@@ -192,7 +192,10 @@
+     {NID_name, 1, ub_name, DIRSTRING_TYPE, 0},
+     {NID_dnQualifier, -1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
+     {NID_domainComponent, 1, -1, B_ASN1_IA5STRING, STABLE_NO_MASK},
+-    {NID_ms_csp_name, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK}
++    {NID_ms_csp_name, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK},
++    {NID_INN, 1, 12, B_ASN1_NUMERICSTRING, STABLE_NO_MASK},
++    {NID_OGRN, 1, 13, B_ASN1_NUMERICSTRING, STABLE_NO_MASK},
++    {NID_SNILS, 1, 11, B_ASN1_NUMERICSTRING, STABLE_NO_MASK}
+ };
+ 
+ static int sk_table_cmp(const ASN1_STRING_TABLE *const *a,
+

diff --git a/patches/1.0.2/oids.diff b/patches/1.0.2/oids.diff
new file mode 100644 (file)
index 0000000..faa66fb
--- /dev/null
+++ b/patches/1.0.2/oids.diff
@@ -0,0 +1,688 @@
+diff -Nuar openssl-1.0.2d/crypto/objects/obj_dat.h openssl-work/crypto/objects/obj_dat.h
+--- openssl-1.0.2d/crypto/objects/obj_dat.h    2015-07-09 15:58:05.000000000 +0400
++++ openssl-work/crypto/objects/obj_dat.h      2015-02-25 12:49:45.000000000 +0400
+@@ -62,12 +62,12 @@
+  * [including the GNU Public Licence.]
+  */
+ 
+-#define NUM_NID 958
+-#define NUM_SN 951
+-#define NUM_LN 951
+-#define NUM_OBJ 890
++#define NUM_NID 991
++#define NUM_SN 984
++#define NUM_LN 984
++#define NUM_OBJ 921
+ 
+-static const unsigned char lvalues[6255]={
++static const unsigned char lvalues[6485]={
+ 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 */
+@@ -952,6 +952,37 @@
+ 0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x3C,0x02,0x01,0x01,/* [6221] OBJ_jurisdictionLocalityName */
+ 0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x3C,0x02,0x01,0x02,/* [6232] OBJ_jurisdictionStateOrProvinceName */
+ 0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x3C,0x02,0x01,0x03,/* [6243] OBJ_jurisdictionCountryName */
++0x2A,0x85,0x03,0x07,0x01,                    /* [6254] OBJ_id_tc26 */
++0x2A,0x85,0x03,0x07,0x01,0x01,               /* [6259] OBJ_id_tc26_algorithms */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x01,          /* [6265] OBJ_id_tc26_sign */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x01,0x01,     /* [6272] OBJ_id_GostR3410_2012_256 */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x01,0x02,     /* [6280] OBJ_id_GostR3410_2012_512 */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x02,          /* [6288] OBJ_id_tc26_digest */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x02,0x02,     /* [6295] OBJ_id_GostR3411_2012_256 */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x02,0x03,     /* [6303] OBJ_id_GostR3411_2012_512 */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x03,          /* [6311] OBJ_id_tc26_signwithdigest */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x03,0x02,     /* [6318] OBJ_id_tc26_signwithdigest_gost3410_2012_256 */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x03,0x03,     /* [6326] OBJ_id_tc26_signwithdigest_gost3410_2012_512 */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x04,          /* [6334] OBJ_id_tc26_mac */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x04,0x01,     /* [6341] OBJ_id_tc26_hmac_gost_3411_2012_256 */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x04,0x02,     /* [6349] OBJ_id_tc26_hmac_gost_3411_2012_512 */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x05,          /* [6357] OBJ_id_tc26_cipher */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x06,          /* [6364] OBJ_id_tc26_agreement */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x06,0x01,     /* [6371] OBJ_id_tc26_agreement_gost_3410_2012_256 */
++0x2A,0x85,0x03,0x07,0x01,0x01,0x06,0x02,     /* [6379] OBJ_id_tc26_agreement_gost_3410_2012_512 */
++0x2A,0x85,0x03,0x07,0x01,0x02,               /* [6387] OBJ_id_tc26_constants */
++0x2A,0x85,0x03,0x07,0x01,0x02,0x01,          /* [6393] OBJ_id_tc26_sign_constants */
++0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x02,     /* [6400] OBJ_id_tc26_gost_3410_2012_512_constants */
++0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x02,0x00,/* [6408] OBJ_id_tc26_gost_3410_2012_512_paramSetTest */
++0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x02,0x01,/* [6417] OBJ_id_tc26_gost_3410_2012_512_paramSetA */
++0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x02,0x02,/* [6426] OBJ_id_tc26_gost_3410_2012_512_paramSetB */
++0x2A,0x85,0x03,0x07,0x01,0x02,0x02,          /* [6435] OBJ_id_tc26_digest_constants */
++0x2A,0x85,0x03,0x07,0x01,0x02,0x05,          /* [6442] OBJ_id_tc26_cipher_constants */
++0x2A,0x85,0x03,0x07,0x01,0x02,0x05,0x01,     /* [6449] OBJ_id_tc26_gost_28147_constants */
++0x2A,0x85,0x03,0x07,0x01,0x02,0x05,0x01,0x01,/* [6457] OBJ_id_tc26_gost_28147_param_Z */
++0x2A,0x85,0x03,0x03,0x81,0x03,0x01,0x01,     /* [6466] OBJ_INN */
++0x2A,0x85,0x03,0x64,0x01,                    /* [6474] OBJ_OGRN */
++0x2A,0x85,0x03,0x64,0x03,                    /* [6479] OBJ_SNILS */
+ };
+ 
+ static const ASN1_OBJECT nid_objs[NUM_NID]={
+@@ -2514,6 +2545,72 @@
+       NID_jurisdictionStateOrProvinceName,11,&(lvalues[6232]),0},
+ {"jurisdictionC","jurisdictionCountryName",
+       NID_jurisdictionCountryName,11,&(lvalues[6243]),0},
++{"id-tc26","id-tc26",NID_id_tc26,5,&(lvalues[6254]),0},
++{"gost89-cnt-12","gost89-cnt-12",NID_gost89_cnt_12,0,NULL,0},
++{"gost-mac-12","gost-mac-12",NID_gost_mac_12,0,NULL,0},
++{"id-tc26-algorithms","id-tc26-algorithms",NID_id_tc26_algorithms,6,
++      &(lvalues[6259]),0},
++{"id-tc26-sign","id-tc26-sign",NID_id_tc26_sign,7,&(lvalues[6265]),0},
++{"gost2012_256","GOST R 34.10-2012 with 256 bit modulus",
++      NID_id_GostR3410_2012_256,8,&(lvalues[6272]),0},
++{"gost2012_512","GOST R 34.10-2012 with 512 bit modulus",
++      NID_id_GostR3410_2012_512,8,&(lvalues[6280]),0},
++{"id-tc26-digest","id-tc26-digest",NID_id_tc26_digest,7,
++      &(lvalues[6288]),0},
++{"md_gost12_256","GOST R 34.11-2012 with 256 bit hash",
++      NID_id_GostR3411_2012_256,8,&(lvalues[6295]),0},
++{"md_gost12_512","GOST R 34.11-2012 with 512 bit hash",
++      NID_id_GostR3411_2012_512,8,&(lvalues[6303]),0},
++{"id-tc26-signwithdigest","id-tc26-signwithdigest",
++      NID_id_tc26_signwithdigest,7,&(lvalues[6311]),0},
++{"id-tc26-signwithdigest-gost3410-2012-256",
++      "GOST R 34.10-2012 with GOST R 34.11-2012 (256 bit)",
++      NID_id_tc26_signwithdigest_gost3410_2012_256,8,&(lvalues[6318]),0},
++{"id-tc26-signwithdigest-gost3410-2012-512",
++      "GOST R 34.10-2012 with GOST R 34.11-2012 (512 bit)",
++      NID_id_tc26_signwithdigest_gost3410_2012_512,8,&(lvalues[6326]),0},
++{"id-tc26-mac","id-tc26-mac",NID_id_tc26_mac,7,&(lvalues[6334]),0},
++{"id-tc26-hmac-gost-3411-2012-256","HMAC GOST 34.11-2012 256 bit",
++      NID_id_tc26_hmac_gost_3411_2012_256,8,&(lvalues[6341]),0},
++{"id-tc26-hmac-gost-3411-2012-512","HMAC GOST 34.11-2012 512 bit",
++      NID_id_tc26_hmac_gost_3411_2012_512,8,&(lvalues[6349]),0},
++{"id-tc26-cipher","id-tc26-cipher",NID_id_tc26_cipher,7,
++      &(lvalues[6357]),0},
++{"id-tc26-agreement","id-tc26-agreement",NID_id_tc26_agreement,7,
++      &(lvalues[6364]),0},
++{"id-tc26-agreement-gost-3410-2012-256",
++      "id-tc26-agreement-gost-3410-2012-256",
++      NID_id_tc26_agreement_gost_3410_2012_256,8,&(lvalues[6371]),0},
++{"id-tc26-agreement-gost-3410-2012-512",
++      "id-tc26-agreement-gost-3410-2012-512",
++      NID_id_tc26_agreement_gost_3410_2012_512,8,&(lvalues[6379]),0},
++{"id-tc26-constants","id-tc26-constants",NID_id_tc26_constants,6,
++      &(lvalues[6387]),0},
++{"id-tc26-sign-constants","id-tc26-sign-constants",
++      NID_id_tc26_sign_constants,7,&(lvalues[6393]),0},
++{"id-tc26-gost-3410-2012-512-constants",
++      "id-tc26-gost-3410-2012-512-constants",
++      NID_id_tc26_gost_3410_2012_512_constants,8,&(lvalues[6400]),0},
++{"id-tc26-gost-3410-2012-512-paramSetTest",
++      "GOST R 34.10-2012 (512 bit) testing parameter set",
++      NID_id_tc26_gost_3410_2012_512_paramSetTest,9,&(lvalues[6408]),0},
++{"id-tc26-gost-3410-2012-512-paramSetA",
++      "GOST R 34.10-2012 (512 bit) ParamSet A",
++      NID_id_tc26_gost_3410_2012_512_paramSetA,9,&(lvalues[6417]),0},
++{"id-tc26-gost-3410-2012-512-paramSetB",
++      "GOST R 34.10-2012 (512 bit) ParamSet B",
++      NID_id_tc26_gost_3410_2012_512_paramSetB,9,&(lvalues[6426]),0},
++{"id-tc26-digest-constants","id-tc26-digest-constants",
++      NID_id_tc26_digest_constants,7,&(lvalues[6435]),0},
++{"id-tc26-cipher-constants","id-tc26-cipher-constants",
++      NID_id_tc26_cipher_constants,7,&(lvalues[6442]),0},
++{"id-tc26-gost-28147-constants","id-tc26-gost-28147-constants",
++      NID_id_tc26_gost_28147_constants,8,&(lvalues[6449]),0},
++{"id-tc26-gost-28147-param-Z","GOST 28147-89 TC26 parameter set",
++      NID_id_tc26_gost_28147_param_Z,9,&(lvalues[6457]),0},
++{"INN","INN",NID_INN,8,&(lvalues[6466]),0},
++{"OGRN","OGRN",NID_OGRN,5,&(lvalues[6474]),0},
++{"SNILS","SNILS",NID_SNILS,5,&(lvalues[6479]),0},
+ };
+ 
+ static const unsigned int sn_objs[NUM_SN]={
+@@ -2614,6 +2711,7 @@
+ 35,   /* "IDEA-CFB" */
+ 36,   /* "IDEA-ECB" */
+ 46,   /* "IDEA-OFB" */
++988,  /* "INN" */
+ 181,  /* "ISO" */
+ 183,  /* "ISO-US" */
+ 645,  /* "ITU-T" */
+@@ -2635,6 +2733,7 @@
+ 17,   /* "O" */
+ 178,  /* "OCSP" */
+ 180,  /* "OCSPSigning" */
++989,  /* "OGRN" */
+ 379,  /* "ORG" */
+ 18,   /* "OU" */
+ 749,  /* "Oakley-EC2N-3" */
+@@ -2700,6 +2799,7 @@
+ 188,  /* "SMIME" */
+ 167,  /* "SMIME-CAPS" */
+ 100,  /* "SN" */
++990,  /* "SNILS" */
+ 16,   /* "ST" */
+ 143,  /* "SXNetID" */
+ 458,  /* "UID" */
+@@ -2858,10 +2958,14 @@
+ 156,  /* "friendlyName" */
+ 509,  /* "generationQualifier" */
+ 815,  /* "gost-mac" */
++960,  /* "gost-mac-12" */
+ 811,  /* "gost2001" */
+ 851,  /* "gost2001cc" */
++963,  /* "gost2012_256" */
++964,  /* "gost2012_512" */
+ 813,  /* "gost89" */
+ 814,  /* "gost89-cnt" */
++959,  /* "gost89-cnt-12" */
+ 812,  /* "gost94" */
+ 850,  /* "gost94cc" */
+ 797,  /* "hmacWithMD5" */
+@@ -3115,6 +3219,30 @@
+ 194,  /* "id-smime-spq" */
+ 250,  /* "id-smime-spq-ets-sqt-unotice" */
+ 249,  /* "id-smime-spq-ets-sqt-uri" */
++958,  /* "id-tc26" */
++975,  /* "id-tc26-agreement" */
++976,  /* "id-tc26-agreement-gost-3410-2012-256" */
++977,  /* "id-tc26-agreement-gost-3410-2012-512" */
++961,  /* "id-tc26-algorithms" */
++974,  /* "id-tc26-cipher" */
++985,  /* "id-tc26-cipher-constants" */
++978,  /* "id-tc26-constants" */
++965,  /* "id-tc26-digest" */
++984,  /* "id-tc26-digest-constants" */
++986,  /* "id-tc26-gost-28147-constants" */
++987,  /* "id-tc26-gost-28147-param-Z" */
++980,  /* "id-tc26-gost-3410-2012-512-constants" */
++982,  /* "id-tc26-gost-3410-2012-512-paramSetA" */
++983,  /* "id-tc26-gost-3410-2012-512-paramSetB" */
++981,  /* "id-tc26-gost-3410-2012-512-paramSetTest" */
++972,  /* "id-tc26-hmac-gost-3411-2012-256" */
++973,  /* "id-tc26-hmac-gost-3411-2012-512" */
++971,  /* "id-tc26-mac" */
++962,  /* "id-tc26-sign" */
++979,  /* "id-tc26-sign-constants" */
++968,  /* "id-tc26-signwithdigest" */
++969,  /* "id-tc26-signwithdigest-gost3410-2012-256" */
++970,  /* "id-tc26-signwithdigest-gost3410-2012-512" */
+ 676,  /* "identified-organization" */
+ 461,  /* "info" */
+ 748,  /* "inhibitAnyPolicy" */
+@@ -3140,6 +3268,8 @@
+ 460,  /* "mail" */
+ 493,  /* "mailPreferenceOption" */
+ 467,  /* "manager" */
++966,  /* "md_gost12_256" */
++967,  /* "md_gost12_512" */
+ 809,  /* "md_gost94" */
+ 875,  /* "member" */
+ 182,  /* "member-body" */
+@@ -3497,12 +3627,22 @@
+ 813,  /* "GOST 28147-89" */
+ 849,  /* "GOST 28147-89 Cryptocom ParamSet" */
+ 815,  /* "GOST 28147-89 MAC" */
++987,  /* "GOST 28147-89 TC26 parameter set" */
+ 851,  /* "GOST 34.10-2001 Cryptocom" */
+ 850,  /* "GOST 34.10-94 Cryptocom" */
+ 811,  /* "GOST R 34.10-2001" */
+ 817,  /* "GOST R 34.10-2001 DH" */
++982,  /* "GOST R 34.10-2012 (512 bit) ParamSet A" */
++983,  /* "GOST R 34.10-2012 (512 bit) ParamSet B" */
++981,  /* "GOST R 34.10-2012 (512 bit) testing parameter set" */
++963,  /* "GOST R 34.10-2012 with 256 bit modulus" */
++964,  /* "GOST R 34.10-2012 with 512 bit modulus" */
++969,  /* "GOST R 34.10-2012 with GOST R 34.11-2012 (256 bit)" */
++970,  /* "GOST R 34.10-2012 with GOST R 34.11-2012 (512 bit)" */
+ 812,  /* "GOST R 34.10-94" */
+ 818,  /* "GOST R 34.10-94 DH" */
++966,  /* "GOST R 34.11-2012 with 256 bit hash" */
++967,  /* "GOST R 34.11-2012 with 512 bit hash" */
+ 809,  /* "GOST R 34.11-94" */
+ 816,  /* "GOST R 34.11-94 PRF" */
+ 807,  /* "GOST R 34.11-94 with GOST R 34.10-2001" */
+@@ -3510,12 +3650,15 @@
+ 808,  /* "GOST R 34.11-94 with GOST R 34.10-94" */
+ 852,  /* "GOST R 34.11-94 with GOST R 34.10-94 Cryptocom" */
+ 854,  /* "GOST R 3410-2001 Parameter Set Cryptocom" */
++972,  /* "HMAC GOST 34.11-2012 256 bit" */
++973,  /* "HMAC GOST 34.11-2012 512 bit" */
+ 810,  /* "HMAC GOST 34.11-94" */
+ 432,  /* "Hold Instruction Call Issuer" */
+ 430,  /* "Hold Instruction Code" */
+ 431,  /* "Hold Instruction None" */
+ 433,  /* "Hold Instruction Reject" */
+ 634,  /* "ICC or token signature" */
++988,  /* "INN" */
+ 294,  /* "IPSec End System" */
+ 295,  /* "IPSec Tunnel" */
+ 296,  /* "IPSec User" */
+@@ -3560,6 +3703,7 @@
+ 366,  /* "OCSP Nonce" */
+ 371,  /* "OCSP Service Locator" */
+ 180,  /* "OCSP Signing" */
++989,  /* "OGRN" */
+ 161,  /* "PBES2" */
+ 69,   /* "PBKDF2" */
+ 162,  /* "PBMAC1" */
+@@ -3573,6 +3717,7 @@
+  2,   /* "RSA Data Security, Inc. PKCS" */
+ 188,  /* "S/MIME" */
+ 167,  /* "S/MIME Capabilities" */
++990,  /* "SNILS" */
+ 387,  /* "SNMPv2" */
+ 512,  /* "Secure Electronic Transactions" */
+ 386,  /* "Security" */
+@@ -3825,7 +3970,9 @@
+ 509,  /* "generationQualifier" */
+ 601,  /* "generic cryptogram" */
+ 99,   /* "givenName" */
++960,  /* "gost-mac-12" */
+ 814,  /* "gost89-cnt" */
++959,  /* "gost89-cnt-12" */
+ 855,  /* "hmac" */
+ 780,  /* "hmac-md5" */
+ 781,  /* "hmac-sha1" */
+@@ -4053,6 +4200,22 @@
+ 194,  /* "id-smime-spq" */
+ 250,  /* "id-smime-spq-ets-sqt-unotice" */
+ 249,  /* "id-smime-spq-ets-sqt-uri" */
++958,  /* "id-tc26" */
++975,  /* "id-tc26-agreement" */
++976,  /* "id-tc26-agreement-gost-3410-2012-256" */
++977,  /* "id-tc26-agreement-gost-3410-2012-512" */
++961,  /* "id-tc26-algorithms" */
++974,  /* "id-tc26-cipher" */
++985,  /* "id-tc26-cipher-constants" */
++978,  /* "id-tc26-constants" */
++965,  /* "id-tc26-digest" */
++984,  /* "id-tc26-digest-constants" */
++986,  /* "id-tc26-gost-28147-constants" */
++980,  /* "id-tc26-gost-3410-2012-512-constants" */
++971,  /* "id-tc26-mac" */
++962,  /* "id-tc26-sign" */
++979,  /* "id-tc26-sign-constants" */
++968,  /* "id-tc26-signwithdigest" */
+ 34,   /* "idea-cbc" */
+ 35,   /* "idea-cfb" */
+ 36,   /* "idea-ecb" */
+@@ -4661,6 +4824,9 @@
+ 639,  /* OBJ_set_brand_JCB                2 23 42 8 35 */
+ 805,  /* OBJ_cryptopro                    1 2 643 2 2 */
+ 806,  /* OBJ_cryptocom                    1 2 643 2 9 */
++958,  /* OBJ_id_tc26                      1 2 643 7 1 */
++989,  /* OBJ_OGRN                         1 2 643 100 1 */
++990,  /* OBJ_SNILS                        1 2 643 100 3 */
+ 184,  /* OBJ_X9_57                        1 2 840 10040 */
+ 405,  /* OBJ_ansi_X9_62                   1 2 840 10045 */
+ 389,  /* OBJ_Enterprises                  1 3 6 1 4 1 */
+@@ -4745,6 +4911,8 @@
+ 816,  /* OBJ_id_GostR3411_94_prf          1 2 643 2 2 23 */
+ 817,  /* OBJ_id_GostR3410_2001DH          1 2 643 2 2 98 */
+ 818,  /* OBJ_id_GostR3410_94DH            1 2 643 2 2 99 */
++961,  /* OBJ_id_tc26_algorithms           1 2 643 7 1 1 */
++978,  /* OBJ_id_tc26_constants            1 2 643 7 1 2 */
+  1,   /* OBJ_rsadsi                       1 2 840 113549 */
+ 185,  /* OBJ_X9cm                         1 2 840 10040 4 */
+ 127,  /* OBJ_id_pkix                      1 3 6 1 5 5 7 */
+@@ -4795,6 +4963,15 @@
+ 842,  /* OBJ_id_GostR3410_2001_CryptoPro_C_ParamSet 1 2 643 2 2 35 3 */
+ 843,  /* OBJ_id_GostR3410_2001_CryptoPro_XchA_ParamSet 1 2 643 2 2 36 0 */
+ 844,  /* OBJ_id_GostR3410_2001_CryptoPro_XchB_ParamSet 1 2 643 2 2 36 1 */
++962,  /* OBJ_id_tc26_sign                 1 2 643 7 1 1 1 */
++965,  /* OBJ_id_tc26_digest               1 2 643 7 1 1 2 */
++968,  /* OBJ_id_tc26_signwithdigest       1 2 643 7 1 1 3 */
++971,  /* OBJ_id_tc26_mac                  1 2 643 7 1 1 4 */
++974,  /* OBJ_id_tc26_cipher               1 2 643 7 1 1 5 */
++975,  /* OBJ_id_tc26_agreement            1 2 643 7 1 1 6 */
++979,  /* OBJ_id_tc26_sign_constants       1 2 643 7 1 2 1 */
++984,  /* OBJ_id_tc26_digest_constants     1 2 643 7 1 2 2 */
++985,  /* OBJ_id_tc26_cipher_constants     1 2 643 7 1 2 5 */
+  2,   /* OBJ_pkcs                         1 2 840 113549 1 */
+ 431,  /* OBJ_hold_instruction_none        1 2 840 10040 2 1 */
+ 432,  /* OBJ_hold_instruction_call_issuer 1 2 840 10040 2 2 */
+@@ -4846,6 +5023,19 @@
+ 851,  /* OBJ_id_GostR3410_2001_cc         1 2 643 2 9 1 5 4 */
+ 849,  /* OBJ_id_Gost28147_89_cc           1 2 643 2 9 1 6 1 */
+ 854,  /* OBJ_id_GostR3410_2001_ParamSet_cc 1 2 643 2 9 1 8 1 */
++988,  /* OBJ_INN                          1 2 643 3 131 1 1 */
++963,  /* OBJ_id_GostR3410_2012_256        1 2 643 7 1 1 1 1 */
++964,  /* OBJ_id_GostR3410_2012_512        1 2 643 7 1 1 1 2 */
++966,  /* OBJ_id_GostR3411_2012_256        1 2 643 7 1 1 2 2 */
++967,  /* OBJ_id_GostR3411_2012_512        1 2 643 7 1 1 2 3 */
++969,  /* OBJ_id_tc26_signwithdigest_gost3410_2012_256 1 2 643 7 1 1 3 2 */
++970,  /* OBJ_id_tc26_signwithdigest_gost3410_2012_512 1 2 643 7 1 1 3 3 */
++972,  /* OBJ_id_tc26_hmac_gost_3411_2012_256 1 2 643 7 1 1 4 1 */
++973,  /* OBJ_id_tc26_hmac_gost_3411_2012_512 1 2 643 7 1 1 4 2 */
++976,  /* OBJ_id_tc26_agreement_gost_3410_2012_256 1 2 643 7 1 1 6 1 */
++977,  /* OBJ_id_tc26_agreement_gost_3410_2012_512 1 2 643 7 1 1 6 2 */
++980,  /* OBJ_id_tc26_gost_3410_2012_512_constants 1 2 643 7 1 2 1 2 */
++986,  /* OBJ_id_tc26_gost_28147_constants 1 2 643 7 1 2 5 1 */
+ 186,  /* OBJ_pkcs1                        1 2 840 113549 1 1 */
+ 27,   /* OBJ_pkcs3                        1 2 840 113549 1 3 */
+ 187,  /* OBJ_pkcs5                        1 2 840 113549 1 5 */
+@@ -5013,6 +5203,10 @@
+ 439,  /* OBJ_pilotAttributeSyntax         0 9 2342 19200300 100 3 */
+ 440,  /* OBJ_pilotObjectClass             0 9 2342 19200300 100 4 */
+ 441,  /* OBJ_pilotGroups                  0 9 2342 19200300 100 10 */
++981,  /* OBJ_id_tc26_gost_3410_2012_512_paramSetTest 1 2 643 7 1 2 1 2 0 */
++982,  /* OBJ_id_tc26_gost_3410_2012_512_paramSetA 1 2 643 7 1 2 1 2 1 */
++983,  /* OBJ_id_tc26_gost_3410_2012_512_paramSetB 1 2 643 7 1 2 1 2 2 */
++987,  /* OBJ_id_tc26_gost_28147_param_Z   1 2 643 7 1 2 5 1 1 */
+ 108,  /* OBJ_cast5_cbc                    1 2 840 113533 7 66 10 */
+ 112,  /* OBJ_pbeWithMD5AndCast5_CBC       1 2 840 113533 7 66 12 */
+ 782,  /* OBJ_id_PasswordBasedMAC          1 2 840 113533 7 66 13 */
+diff -Nuar openssl-1.0.2d/crypto/objects/objects.txt openssl-work/crypto/objects/objects.txt
+--- openssl-1.0.2d/crypto/objects/objects.txt  2015-07-09 15:57:15.000000000 +0400
++++ openssl-work/crypto/objects/objects.txt    2015-02-25 12:45:41.000000000 +0400
+@@ -1156,6 +1156,7 @@
+ 
+ member-body 643 2 2   : cryptopro
+ member-body 643 2 9   : cryptocom
++member-body 643 7 1   : id-tc26
+ 
+ cryptopro 3           : id-GostR3411-94-with-GostR3410-2001 : GOST R 34.11-94 with GOST R 34.10-2001
+ cryptopro 4           : id-GostR3411-94-with-GostR3410-94 : GOST R 34.11-94 with GOST R 34.10-94
+@@ -1169,8 +1170,10 @@
+ !Cname id-Gost28147-89
+ cryptopro 21          : gost89                : GOST 28147-89
+                       : gost89-cnt
++                      : gost89-cnt-12
+ !Cname id-Gost28147-89-MAC
+ cryptopro 22          : gost-mac      : GOST 28147-89 MAC
++                      : gost-mac-12
+ !Cname id-GostR3411-94-prf
+ cryptopro 23          : prf-gostr3411-94      : GOST R 34.11-94 PRF
+ cryptopro 98          : id-GostR3410-2001DH   : GOST R 34.10-2001 DH
+@@ -1229,6 +1232,52 @@
+ 
+ cryptocom 1 8 1               : id-GostR3410-2001-ParamSet-cc : GOST R 3410-2001 Parameter Set Cryptocom
+ 
++# TC26 GOST OIDs
++
++id-tc26 1             : id-tc26-algorithms
++id-tc26-algorithms 1  : id-tc26-sign
++!Cname id-GostR3410-2012-256
++id-tc26-sign 1                : gost2012_256: GOST R 34.10-2012 with 256 bit modulus
++!Cname id-GostR3410-2012-512
++id-tc26-sign 2                : gost2012_512: GOST R 34.10-2012 with 512 bit modulus
++
++id-tc26-algorithms 2  : id-tc26-digest
++!Cname id-GostR3411-2012-256
++id-tc26-digest 2      : md_gost12_256: GOST R 34.11-2012 with 256 bit hash
++!Cname id-GostR3411-2012-512
++id-tc26-digest 3      : md_gost12_512: GOST R 34.11-2012 with 512 bit hash
++
++id-tc26-algorithms 3  : id-tc26-signwithdigest
++id-tc26-signwithdigest 2: id-tc26-signwithdigest-gost3410-2012-256: GOST R 34.10-2012 with GOST R 34.11-2012 (256 bit)
++id-tc26-signwithdigest 3: id-tc26-signwithdigest-gost3410-2012-512: GOST R 34.10-2012 with GOST R 34.11-2012 (512 bit)
++
++id-tc26-algorithms 4  : id-tc26-mac
++id-tc26-mac 1         : id-tc26-hmac-gost-3411-2012-256 : HMAC GOST 34.11-2012 256 bit
++id-tc26-mac 2         : id-tc26-hmac-gost-3411-2012-512 : HMAC GOST 34.11-2012 512 bit
++
++id-tc26-algorithms 5  : id-tc26-cipher
++
++id-tc26-algorithms 6  : id-tc26-agreement
++id-tc26-agreement 1   : id-tc26-agreement-gost-3410-2012-256
++id-tc26-agreement 2   : id-tc26-agreement-gost-3410-2012-512
++
++id-tc26 2             : id-tc26-constants
++
++id-tc26-constants 1   : id-tc26-sign-constants
++id-tc26-sign-constants 2: id-tc26-gost-3410-2012-512-constants
++id-tc26-gost-3410-2012-512-constants 0        : id-tc26-gost-3410-2012-512-paramSetTest: GOST R 34.10-2012 (512 bit) testing parameter set
++id-tc26-gost-3410-2012-512-constants 1        : id-tc26-gost-3410-2012-512-paramSetA: GOST R 34.10-2012 (512 bit) ParamSet A
++id-tc26-gost-3410-2012-512-constants 2        : id-tc26-gost-3410-2012-512-paramSetB: GOST R 34.10-2012 (512 bit) ParamSet B
++
++id-tc26-constants 2     : id-tc26-digest-constants
++id-tc26-constants 5     : id-tc26-cipher-constants
++id-tc26-cipher-constants 1    : id-tc26-gost-28147-constants
++id-tc26-gost-28147-constants 1        : id-tc26-gost-28147-param-Z : GOST 28147-89 TC26 parameter set
++
++member-body 643 3 131 1 1     : INN   : INN
++member-body 643 100 1         : OGRN  : OGRN
++member-body 643 100 3         : SNILS : SNILS
++
+ # Definitions for Camellia cipher - CBC MODE
+ 
+ 1 2 392 200011 61 1 1 1 2 : CAMELLIA-128-CBC          : camellia-128-cbc
+diff -Nuar openssl-1.0.2d/crypto/objects/obj_mac.h openssl-work/crypto/objects/obj_mac.h
+--- openssl-1.0.2d/crypto/objects/obj_mac.h    2015-07-09 15:58:04.000000000 +0400
++++ openssl-work/crypto/objects/obj_mac.h      2015-03-26 13:00:22.000000000 +0400
+@@ -3678,6 +3678,10 @@
+ #define NID_cryptocom           806
+ #define OBJ_cryptocom           OBJ_member_body,643L,2L,9L
+ 
++#define SN_id_tc26              "id-tc26"
++#define NID_id_tc26             958
++#define OBJ_id_tc26             OBJ_member_body,643L,7L,1L
++
+ #define SN_id_GostR3411_94_with_GostR3410_2001          "id-GostR3411-94-with-GostR3410-2001"
+ #define LN_id_GostR3411_94_with_GostR3410_2001          "GOST R 34.11-94 with GOST R 34.10-2001"
+ #define NID_id_GostR3411_94_with_GostR3410_2001         807
+@@ -3716,11 +3720,17 @@
+ #define SN_gost89_cnt           "gost89-cnt"
+ #define NID_gost89_cnt          814
+ 
++#define SN_gost89_cnt_12                "gost89-cnt-12"
++#define NID_gost89_cnt_12               959
++
+ #define SN_id_Gost28147_89_MAC          "gost-mac"
+ #define LN_id_Gost28147_89_MAC          "GOST 28147-89 MAC"
+ #define NID_id_Gost28147_89_MAC         815
+ #define OBJ_id_Gost28147_89_MAC         OBJ_cryptopro,22L
+ 
++#define SN_gost_mac_12          "gost-mac-12"
++#define NID_gost_mac_12         960
++
+ #define SN_id_GostR3411_94_prf          "prf-gostr3411-94"
+ #define LN_id_GostR3411_94_prf          "GOST R 34.11-94 PRF"
+ #define NID_id_GostR3411_94_prf         816
+@@ -3886,6 +3896,141 @@
+ #define NID_id_GostR3410_2001_ParamSet_cc               854
+ #define OBJ_id_GostR3410_2001_ParamSet_cc               OBJ_cryptocom,1L,8L,1L
+ 
++#define SN_id_tc26_algorithms           "id-tc26-algorithms"
++#define NID_id_tc26_algorithms          961
++#define OBJ_id_tc26_algorithms          OBJ_id_tc26,1L
++
++#define SN_id_tc26_sign         "id-tc26-sign"
++#define NID_id_tc26_sign                962
++#define OBJ_id_tc26_sign                OBJ_id_tc26_algorithms,1L
++
++#define SN_id_GostR3410_2012_256                "gost2012_256"
++#define LN_id_GostR3410_2012_256                "GOST R 34.10-2012 with 256 bit modulus"
++#define NID_id_GostR3410_2012_256               963
++#define OBJ_id_GostR3410_2012_256               OBJ_id_tc26_sign,1L
++
++#define SN_id_GostR3410_2012_512                "gost2012_512"
++#define LN_id_GostR3410_2012_512                "GOST R 34.10-2012 with 512 bit modulus"
++#define NID_id_GostR3410_2012_512               964
++#define OBJ_id_GostR3410_2012_512               OBJ_id_tc26_sign,2L
++
++#define SN_id_tc26_digest               "id-tc26-digest"
++#define NID_id_tc26_digest              965
++#define OBJ_id_tc26_digest              OBJ_id_tc26_algorithms,2L
++
++#define SN_id_GostR3411_2012_256                "md_gost12_256"
++#define LN_id_GostR3411_2012_256                "GOST R 34.11-2012 with 256 bit hash"
++#define NID_id_GostR3411_2012_256               966
++#define OBJ_id_GostR3411_2012_256               OBJ_id_tc26_digest,2L
++
++#define SN_id_GostR3411_2012_512                "md_gost12_512"
++#define LN_id_GostR3411_2012_512                "GOST R 34.11-2012 with 512 bit hash"
++#define NID_id_GostR3411_2012_512               967
++#define OBJ_id_GostR3411_2012_512               OBJ_id_tc26_digest,3L
++
++#define SN_id_tc26_signwithdigest               "id-tc26-signwithdigest"
++#define NID_id_tc26_signwithdigest              968
++#define OBJ_id_tc26_signwithdigest              OBJ_id_tc26_algorithms,3L
++
++#define SN_id_tc26_signwithdigest_gost3410_2012_256             "id-tc26-signwithdigest-gost3410-2012-256"
++#define LN_id_tc26_signwithdigest_gost3410_2012_256             "GOST R 34.10-2012 with GOST R 34.11-2012 (256 bit)"
++#define NID_id_tc26_signwithdigest_gost3410_2012_256            969
++#define OBJ_id_tc26_signwithdigest_gost3410_2012_256            OBJ_id_tc26_signwithdigest,2L
++
++#define SN_id_tc26_signwithdigest_gost3410_2012_512             "id-tc26-signwithdigest-gost3410-2012-512"
++#define LN_id_tc26_signwithdigest_gost3410_2012_512             "GOST R 34.10-2012 with GOST R 34.11-2012 (512 bit)"
++#define NID_id_tc26_signwithdigest_gost3410_2012_512            970
++#define OBJ_id_tc26_signwithdigest_gost3410_2012_512            OBJ_id_tc26_signwithdigest,3L
++
++#define SN_id_tc26_mac          "id-tc26-mac"
++#define NID_id_tc26_mac         971
++#define OBJ_id_tc26_mac         OBJ_id_tc26_algorithms,4L
++
++#define SN_id_tc26_hmac_gost_3411_2012_256              "id-tc26-hmac-gost-3411-2012-256"
++#define LN_id_tc26_hmac_gost_3411_2012_256              "HMAC GOST 34.11-2012 256 bit"
++#define NID_id_tc26_hmac_gost_3411_2012_256             972
++#define OBJ_id_tc26_hmac_gost_3411_2012_256             OBJ_id_tc26_mac,1L
++
++#define SN_id_tc26_hmac_gost_3411_2012_512              "id-tc26-hmac-gost-3411-2012-512"
++#define LN_id_tc26_hmac_gost_3411_2012_512              "HMAC GOST 34.11-2012 512 bit"
++#define NID_id_tc26_hmac_gost_3411_2012_512             973
++#define OBJ_id_tc26_hmac_gost_3411_2012_512             OBJ_id_tc26_mac,2L
++
++#define SN_id_tc26_cipher               "id-tc26-cipher"
++#define NID_id_tc26_cipher              974
++#define OBJ_id_tc26_cipher              OBJ_id_tc26_algorithms,5L
++
++#define SN_id_tc26_agreement            "id-tc26-agreement"
++#define NID_id_tc26_agreement           975
++#define OBJ_id_tc26_agreement           OBJ_id_tc26_algorithms,6L
++
++#define SN_id_tc26_agreement_gost_3410_2012_256         "id-tc26-agreement-gost-3410-2012-256"
++#define NID_id_tc26_agreement_gost_3410_2012_256                976
++#define OBJ_id_tc26_agreement_gost_3410_2012_256                OBJ_id_tc26_agreement,1L
++
++#define SN_id_tc26_agreement_gost_3410_2012_512         "id-tc26-agreement-gost-3410-2012-512"
++#define NID_id_tc26_agreement_gost_3410_2012_512                977
++#define OBJ_id_tc26_agreement_gost_3410_2012_512                OBJ_id_tc26_agreement,2L
++
++#define SN_id_tc26_constants            "id-tc26-constants"
++#define NID_id_tc26_constants           978
++#define OBJ_id_tc26_constants           OBJ_id_tc26,2L
++
++#define SN_id_tc26_sign_constants               "id-tc26-sign-constants"
++#define NID_id_tc26_sign_constants              979
++#define OBJ_id_tc26_sign_constants              OBJ_id_tc26_constants,1L
++
++#define SN_id_tc26_gost_3410_2012_512_constants         "id-tc26-gost-3410-2012-512-constants"
++#define NID_id_tc26_gost_3410_2012_512_constants                980
++#define OBJ_id_tc26_gost_3410_2012_512_constants                OBJ_id_tc26_sign_constants,2L
++
++#define SN_id_tc26_gost_3410_2012_512_paramSetTest              "id-tc26-gost-3410-2012-512-paramSetTest"
++#define LN_id_tc26_gost_3410_2012_512_paramSetTest              "GOST R 34.10-2012 (512 bit) testing parameter set"
++#define NID_id_tc26_gost_3410_2012_512_paramSetTest             981
++#define OBJ_id_tc26_gost_3410_2012_512_paramSetTest             OBJ_id_tc26_gost_3410_2012_512_constants,0L
++
++#define SN_id_tc26_gost_3410_2012_512_paramSetA         "id-tc26-gost-3410-2012-512-paramSetA"
++#define LN_id_tc26_gost_3410_2012_512_paramSetA         "GOST R 34.10-2012 (512 bit) ParamSet A"
++#define NID_id_tc26_gost_3410_2012_512_paramSetA                982
++#define OBJ_id_tc26_gost_3410_2012_512_paramSetA                OBJ_id_tc26_gost_3410_2012_512_constants,1L
++
++#define SN_id_tc26_gost_3410_2012_512_paramSetB         "id-tc26-gost-3410-2012-512-paramSetB"
++#define LN_id_tc26_gost_3410_2012_512_paramSetB         "GOST R 34.10-2012 (512 bit) ParamSet B"
++#define NID_id_tc26_gost_3410_2012_512_paramSetB                983
++#define OBJ_id_tc26_gost_3410_2012_512_paramSetB                OBJ_id_tc26_gost_3410_2012_512_constants,2L
++
++#define SN_id_tc26_digest_constants             "id-tc26-digest-constants"
++#define NID_id_tc26_digest_constants            984
++#define OBJ_id_tc26_digest_constants            OBJ_id_tc26_constants,2L
++
++#define SN_id_tc26_cipher_constants             "id-tc26-cipher-constants"
++#define NID_id_tc26_cipher_constants            985
++#define OBJ_id_tc26_cipher_constants            OBJ_id_tc26_constants,5L
++
++#define SN_id_tc26_gost_28147_constants         "id-tc26-gost-28147-constants"
++#define NID_id_tc26_gost_28147_constants                986
++#define OBJ_id_tc26_gost_28147_constants                OBJ_id_tc26_cipher_constants,1L
++
++#define SN_id_tc26_gost_28147_param_Z           "id-tc26-gost-28147-param-Z"
++#define LN_id_tc26_gost_28147_param_Z           "GOST 28147-89 TC26 parameter set"
++#define NID_id_tc26_gost_28147_param_Z          987
++#define OBJ_id_tc26_gost_28147_param_Z          OBJ_id_tc26_gost_28147_constants,1L
++
++#define SN_INN          "INN"
++#define LN_INN          "INN"
++#define NID_INN         988
++#define OBJ_INN         OBJ_member_body,643L,3L,131L,1L,1L
++
++#define SN_OGRN         "OGRN"
++#define LN_OGRN         "OGRN"
++#define NID_OGRN                989
++#define OBJ_OGRN                OBJ_member_body,643L,100L,1L
++
++#define SN_SNILS                "SNILS"
++#define LN_SNILS                "SNILS"
++#define NID_SNILS               990
++#define OBJ_SNILS               OBJ_member_body,643L,100L,3L
++
+ #define SN_camellia_128_cbc             "CAMELLIA-128-CBC"
+ #define LN_camellia_128_cbc             "camellia-128-cbc"
+ #define NID_camellia_128_cbc            751
+diff -Nuar openssl-1.0.2d/crypto/objects/obj_mac.num openssl-work/crypto/objects/obj_mac.num
+--- openssl-1.0.2d/crypto/objects/obj_mac.num  2015-07-09 15:58:03.000000000 +0400
++++ openssl-work/crypto/objects/obj_mac.num    2015-02-25 12:49:43.000000000 +0400
+@@ -955,3 +955,36 @@
+ jurisdictionLocalityName              955
+ jurisdictionStateOrProvinceName               956
+ jurisdictionCountryName               957
++id_tc26               958
++gost89_cnt_12         959
++gost_mac_12           960
++id_tc26_algorithms            961
++id_tc26_sign          962
++id_GostR3410_2012_256         963
++id_GostR3410_2012_512         964
++id_tc26_digest                965
++id_GostR3411_2012_256         966
++id_GostR3411_2012_512         967
++id_tc26_signwithdigest                968
++id_tc26_signwithdigest_gost3410_2012_256              969
++id_tc26_signwithdigest_gost3410_2012_512              970
++id_tc26_mac           971
++id_tc26_hmac_gost_3411_2012_256               972
++id_tc26_hmac_gost_3411_2012_512               973
++id_tc26_cipher                974
++id_tc26_agreement             975
++id_tc26_agreement_gost_3410_2012_256          976
++id_tc26_agreement_gost_3410_2012_512          977
++id_tc26_constants             978
++id_tc26_sign_constants                979
++id_tc26_gost_3410_2012_512_constants          980
++id_tc26_gost_3410_2012_512_paramSetTest               981
++id_tc26_gost_3410_2012_512_paramSetA          982
++id_tc26_gost_3410_2012_512_paramSetB          983
++id_tc26_digest_constants              984
++id_tc26_cipher_constants              985
++id_tc26_gost_28147_constants          986
++id_tc26_gost_28147_param_Z            987
++INN           988
++OGRN          989
++SNILS         990
+diff -Nuar openssl-1.0.2d/crypto/objects/obj_xref.h openssl-work/crypto/objects/obj_xref.h
+--- openssl-1.0.2d/crypto/objects/obj_xref.h   2015-07-09 16:02:55.000000000 +0400
++++ openssl-work/crypto/objects/obj_xref.h     2015-03-26 13:00:21.000000000 +0400
+@@ -56,6 +56,10 @@
+      NID_dh_cofactor_kdf},
+     {NID_dhSinglePass_cofactorDH_sha512kdf_scheme, NID_sha512,
+      NID_dh_cofactor_kdf},
++    {NID_id_tc26_signwithdigest_gost3410_2012_256, NID_id_GostR3411_2012_256,
++     NID_id_GostR3410_2012_256},
++    {NID_id_tc26_signwithdigest_gost3410_2012_512, NID_id_GostR3411_2012_512,
++     NID_id_GostR3410_2012_512},
+ };
+ 
+ static const nid_triple *const sigoid_srt_xref[] = {
+@@ -96,4 +100,6 @@
+     &sigoid_srt[26],
+     &sigoid_srt[27],
+     &sigoid_srt[28],
++    &sigoid_srt[40],
++    &sigoid_srt[41],
+ };
+diff -Nuar openssl-1.0.2d/crypto/objects/obj_xref.txt openssl-work/crypto/objects/obj_xref.txt
+--- openssl-1.0.2d/crypto/objects/obj_xref.txt 2015-07-09 15:57:15.000000000 +0400
++++ openssl-work/crypto/objects/obj_xref.txt   2015-02-24 15:22:17.000000000 +0400
+@@ -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
+ id_GostR3411_94_with_GostR3410_2001_cc        id_GostR3411_94 id_GostR3410_2001_cc
++id_tc26_signwithdigest_gost3410_2012_256 id_GostR3411_2012_256 id_GostR3410_2012_256
++id_tc26_signwithdigest_gost3410_2012_512 id_GostR3411_2012_512 id_GostR3410_2012_512
+ # ECDH KDFs and their corresponding message digests and schemes
+ dhSinglePass_stdDH_sha1kdf_scheme             sha1    dh_std_kdf
+ dhSinglePass_stdDH_sha224kdf_scheme           sha224  dh_std_kdf
+

diff --git a/patches/1.0.2/pkcs12.diff b/patches/1.0.2/pkcs12.diff
new file mode 100644 (file)
index 0000000..f6267ba
--- /dev/null
+++ b/patches/1.0.2/pkcs12.diff
@@ -0,0 +1,78 @@
+diff -Nuar openssl-1.0.2d/crypto/evp/evp_pbe.c openssl-work/crypto/evp/evp_pbe.c
+--- openssl-1.0.2d/crypto/evp/evp_pbe.c        2015-07-09 15:53:21.000000000 +0400
++++ openssl-work/crypto/evp/evp_pbe.c  2015-03-26 13:00:21.000000000 +0400
+@@ -121,6 +121,10 @@
+     {EVP_PBE_TYPE_PRF, NID_hmacWithSHA384, -1, NID_sha384, 0},
+     {EVP_PBE_TYPE_PRF, NID_hmacWithSHA512, -1, NID_sha512, 0},
+     {EVP_PBE_TYPE_PRF, NID_id_HMACGostR3411_94, -1, NID_id_GostR3411_94, 0},
++    {EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_2012_256, -1,
++     NID_id_GostR3411_2012_256, 0},
++    {EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_2012_512, -1,
++     NID_id_GostR3411_2012_512, 0},
+ };
+ 
+ #ifdef TEST
+diff -Nuar openssl-1.0.2d/crypto/pkcs12/p12_mutl.c openssl-work/crypto/pkcs12/p12_mutl.c
+--- openssl-1.0.2d/crypto/pkcs12/p12_mutl.c    2015-07-09 15:53:21.000000000 +0400
++++ openssl-work/crypto/pkcs12/p12_mutl.c      2015-06-17 14:48:18.000000000 +0400
+@@ -65,6 +65,28 @@
+ # include <openssl/rand.h>
+ # include <openssl/pkcs12.h>
+ 
++# define TK26_MAC_KEY_LEN 32
++
++static int PKCS12_gen_gost_mac_key(const char *pass, int passlen,
++                                   const unsigned char *salt, int saltlen,
++                                   int iter, const EVP_MD *digest, int keylen,
++                                   unsigned char *key)
++{
++    unsigned char out[96];
++
++    if (keylen != TK26_MAC_KEY_LEN) {
++        return 0;
++    }
++
++    if (!PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, iter,
++                           digest, 96, out)) {
++        return 0;
++    }
++    memcpy(key, out + 64, TK26_MAC_KEY_LEN);
++    OPENSSL_cleanse(out, 96);
++    return 1;
++}
++
+ /* Generate a MAC */
+ int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
+                    unsigned char *mac, unsigned int *maclen)
+@@ -73,7 +95,7 @@
+     HMAC_CTX hmac;
+     unsigned char key[EVP_MAX_MD_SIZE], *salt;
+     int saltlen, iter;
+-    int md_size;
++    int md_size = 0;
+ 
+     if (!PKCS7_type_is_data(p12->authsafes)) {
+         PKCS12err(PKCS12_F_PKCS12_GEN_MAC, PKCS12_R_CONTENT_TYPE_NOT_DATA);
+@@ -93,8 +115,19 @@
+     md_size = EVP_MD_size(md_type);
+     if (md_size < 0)
+         return 0;
+-    if (!PKCS12_key_gen(pass, passlen, salt, saltlen, PKCS12_MAC_ID, iter,
+-                        md_size, key, md_type)) {
++    if ((md_type->type == NID_id_GostR3411_94
++         || md_type->type == NID_id_GostR3411_2012_256
++         || md_type->type == NID_id_GostR3411_2012_512)
++        && !getenv("LEGACY_GOST_PKCS12")) {
++        md_size = TK26_MAC_KEY_LEN;
++        if (!PKCS12_gen_gost_mac_key(pass, passlen, salt, saltlen, iter,
++                                     md_type, md_size, key)) {
++            PKCS12err(PKCS12_F_PKCS12_GEN_MAC, PKCS12_R_KEY_GEN_ERROR);
++            return 0;
++        }
++    } else
++        if (!PKCS12_key_gen(pass, passlen, salt, saltlen, PKCS12_MAC_ID, iter,
++                            md_size, key, md_type)) {
+         PKCS12err(PKCS12_F_PKCS12_GEN_MAC, PKCS12_R_KEY_GEN_ERROR);
+         return 0;
+     }
+

diff --git a/patches/1.0.2/smimecap.diff b/patches/1.0.2/smimecap.diff
new file mode 100644 (file)
index 0000000..2451b51
--- /dev/null
+++ b/patches/1.0.2/smimecap.diff
@@ -0,0 +1,25 @@
+diff -Nuar openssl-1.0.2d/crypto/cms/cms_sd.c openssl-work/crypto/cms/cms_sd.c
+--- openssl-1.0.2d/crypto/cms/cms_sd.c 2015-07-09 15:57:15.000000000 +0400
++++ openssl-work/crypto/cms/cms_sd.c   2015-03-26 13:00:20.000000000 +0400
+@@ -941,6 +941,8 @@
+ int CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap)
+ {
+     if (!cms_add_cipher_smcap(smcap, NID_aes_256_cbc, -1)
++        || !cms_add_digest_smcap(smcap, NID_id_GostR3411_2012_256, -1)
++        || !cms_add_digest_smcap(smcap, NID_id_GostR3411_2012_512, -1)
+         || !cms_add_digest_smcap(smcap, NID_id_GostR3411_94, -1)
+         || !cms_add_cipher_smcap(smcap, NID_id_Gost28147_89, -1)
+         || !cms_add_cipher_smcap(smcap, NID_aes_192_cbc, -1)
+diff -Nuar openssl-1.0.2d/crypto/pkcs7/pk7_smime.c openssl-work/crypto/pkcs7/pk7_smime.c
+--- openssl-1.0.2d/crypto/pkcs7/pk7_smime.c    2015-07-09 15:53:21.000000000 +0400
++++ openssl-work/crypto/pkcs7/pk7_smime.c      2015-03-26 13:00:21.000000000 +0400
+@@ -185,6 +185,8 @@
+                 goto err;
+             }
+             if (!add_cipher_smcap(smcap, NID_aes_256_cbc, -1)
++                || !add_digest_smcap(smcap, NID_id_GostR3411_2012_256, -1)
++                || !add_digest_smcap(smcap, NID_id_GostR3411_2012_512, -1)
+                 || !add_digest_smcap(smcap, NID_id_GostR3411_94, -1)
+                 || !add_cipher_smcap(smcap, NID_id_Gost28147_89, -1)
+                 || !add_cipher_smcap(smcap, NID_aes_192_cbc, -1)
+

diff --git a/patches/1.1.0/gost_ctrl.diff b/patches/1.1.0/gost_ctrl.diff
new file mode 100644 (file)
index 0000000..997280f
--- /dev/null
+++ b/patches/1.1.0/gost_ctrl.diff
@@ -0,0 +1,19 @@
+diff --git a/include/openssl/evp.h b/include/openssl/evp.h
+index f92f109..8b03407 100644
+--- a/include/openssl/evp.h
++++ b/include/openssl/evp.h
+@@ -427,6 +427,14 @@ struct evp_cipher_st {
+ # define         EVP_CTRL_TLS1_1_MULTIBLOCK_DECRYPT      0x1b
+ # define         EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE  0x1c
+ 
++/*
++ * Russian GOST has some parameters defining its usage:
++ * S-blocks, key meshing, padding modes
++ */
++#define          EVP_CTRL_GOST_PARAMS       0x1d
++#define          EVP_CTRL_GOST_KEY_MESHING  0x1e
++#define          EVP_CTRL_GOST_PADDING      0x1f
++
+ /* RFC 5246 defines additional data to be 13 bytes in length */
+ # define         EVP_AEAD_TLS1_AAD_LEN           13
+