X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=test_tlstree.c;h=1c4ecb8b80047a58d3b8f72346cfc7a383588dab;hb=30043b3cfa3351ce001c5147352308bc9eb973cc;hp=08caf906b7d1cd215e80d5345537e1970543f4cb;hpb=b9935fbf77164cf491fb12df74f7a85e877813cd;p=openssl-gost%2Fengine.git

diff --git a/test_tlstree.c b/test_tlstree.c
index 08caf90..1c4ecb8 100644
--- a/test_tlstree.c
+++ b/test_tlstree.c
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2019-2020 Dmitry Belyavskiy <beldmit@gmail.com>
+ *
+ * Contents licensed under the terms of the OpenSSL license
+ * See https://www.openssl.org/source/license.html for details
+ */
 # include <stdio.h>
 # include <string.h>
 # include <openssl/err.h>
@@ -95,7 +101,7 @@ int main(void)
 	int i;
 
 	OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL);
-		
+
 	memset(data63, 0, 4096);
 
 	md = EVP_get_digestbynid(NID_grasshopper_mac);
@@ -120,19 +126,22 @@ int main(void)
 
 	ciph = EVP_get_cipherbynid(NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm);
 	enc = EVP_CIPHER_CTX_new();
-	EVP_EncryptInit_ex(enc, ciph, NULL, enc_key, full_iv);
+	if (EVP_EncryptInit_ex(enc, ciph, NULL, enc_key, full_iv) <= 0) {
+		fprintf(stderr, "Internal error");
+		exit(1);
+	}
 
 	for (i = 7; i >= 0; i--) {
 		++seq0[i];
 		if (seq0[i] != 0)
 			break;
 	}
-	EVP_CIPHER_CTX_ctrl(enc, EVP_CTRL_TLS1_2_TLSTREE, 0, seq0);
+	EVP_CIPHER_CTX_ctrl(enc, EVP_CTRL_TLSTREE, 0, seq0);
 	EVP_Cipher(enc, data0_processed, data0, sizeof(data0));
 	EVP_Cipher(enc, data0_processed+sizeof(data0), mac0, 16);
 
 	hexdump(stderr, "ENC0 result", data0_processed, 31);
-	if (memcmp(enc0_etl, data0_processed, 16) != 0) {
+	if (memcmp(enc0_etl, data0_processed, sizeof(data0_processed)) != 0) {
 		fprintf(stderr, "ENC0 mismatch");
 		exit(1);
 	}
@@ -161,7 +170,7 @@ int main(void)
 		if (seq63[i] != 0)
 			break;
 	}
-	EVP_CIPHER_CTX_ctrl(enc, EVP_CTRL_TLS1_2_TLSTREE, 0, seq63);
+	EVP_CIPHER_CTX_ctrl(enc, EVP_CTRL_TLSTREE, 0, seq63);
 	EVP_Cipher(enc, data63_processed, data63, sizeof(data63));
 	EVP_Cipher(enc, data63_processed+sizeof(data63), mac63, 16);