File 0788-ssl-fix-compile-warnings-in-tests.patch of Package erlang
From ddde05aa2e878c7733e20446a4406a56d6a09745 Mon Sep 17 00:00:00 2001
From: Jakub Witczak <kuba@erlang.org>
Date: Thu, 2 Dec 2021 17:49:07 +0100
Subject: [PATCH] ssl: fix compile warnings in tests
---
lib/ssl/test/inet_crypto_dist.erl | 24 ++++++++++++------------
lib/ssl/test/ssl_ECC.erl | 2 --
lib/ssl/test/ssl_api_SUITE.erl | 2 +-
lib/ssl/test/ssl_bench_test_lib.erl | 2 --
lib/ssl/test/ssl_cert_tests.erl | 8 +++-----
lib/ssl/test/ssl_dist_test_lib.erl | 2 --
lib/ssl/test/ssl_test_lib.erl | 4 +---
lib/ssl/test/tls_api_SUITE.erl | 2 +-
8 files changed, 18 insertions(+), 28 deletions(-)
diff --git a/lib/ssl/test/inet_crypto_dist.erl b/lib/ssl/test/inet_crypto_dist.erl
index b8a2443ba2..8babe8ee5b 100644
--- a/lib/ssl/test/inet_crypto_dist.erl
+++ b/lib/ssl/test/inet_crypto_dist.erl
@@ -960,7 +960,8 @@ init_msg(
MsgLen = byte_size(R1A) + TagLen + iolist_size(Plaintext),
AAD = [<<MsgLen:32>>, R1A],
{Ciphertext, Tag} =
- crypto:block_encrypt(AeadCipher, Key1A, IV1A, {AAD, Plaintext, TagLen}),
+ crypto:crypto_one_time(AeadCipher, Key1A, IV1A,
+ {AAD, Plaintext, TagLen}, true),
Msg = [R1A, Tag, Ciphertext],
{R2A, R3A, Msg}.
%%
@@ -981,8 +982,8 @@ init_msg(
MsgLen = byte_size(Msg),
AAD = [<<MsgLen:32>>, R1B],
case
- crypto:block_decrypt(
- AeadCipher, Key1B, IV1B, {AAD, Ciphertext, Tag})
+ crypto:crypto_one_time(
+ AeadCipher, Key1B, IV1B, {AAD, Ciphertext, Tag}, false)
of
<<R2B:RLen/binary, R3B:RLen/binary, PubKeyB/binary>> ->
SharedSecret = compute_shared_secret(KeyPair, PubKeyB),
@@ -999,9 +1000,8 @@ init_msg(
StartMsgLen = TagLen + iolist_size(StartCleartext),
StartAAD = <<StartMsgLen:32>>,
{StartCiphertext, StartTag} =
- crypto:block_encrypt(
- AeadCipher, Key2A, IV2A,
- {StartAAD, StartCleartext, TagLen}),
+ crypto:crypto_one_time(AeadCipher, Key2A, IV2A,
+ {StartAAD, StartCleartext, TagLen}, true),
StartMsg = [StartTag, StartCiphertext],
%%
{Key2B, IV2B} =
@@ -1032,8 +1032,8 @@ start_msg(
MsgLen = byte_size(Msg),
AAD = <<MsgLen:32>>,
case
- crypto:block_decrypt(
- AeadCipher, Key2B, IV2B, {AAD, Ciphertext, Tag})
+ crypto:crypto_one_time(
+ AeadCipher, Key2B, IV2B, {AAD, Ciphertext, Tag}, false)
of
<<R2A:RLen/binary, R3A:RLen/binary, RekeyCountB:32>>
when RekeyCountA =< (RekeyCountB bsl 2),
@@ -1044,7 +1044,7 @@ start_msg(
hmac_key_iv(HmacAlgo, MacKey, Data, KeyLen, IVLen) ->
<<Key:KeyLen/binary, IV:IVLen/binary>> =
- crypto:hmac(HmacAlgo, MacKey, Data, KeyLen + IVLen),
+ crypto:macN(HmacAlgo, MacKey, Data, KeyLen + IVLen),
{Key, IV}.
%% -------------------------------------------------------------------------
@@ -1455,7 +1455,8 @@ encrypt_chunk(
AAD = <<Seq:32, ChunkLen:32>>,
IVBin = <<IVSalt/binary, (IVNo + Seq):48>>,
{Ciphertext, CipherTag} =
- crypto:block_encrypt(AeadCipher, Key, IVBin, {AAD, Cleartext, TagLen}),
+ crypto:crypto_one_time(AeadCipher, Key, IVBin,
+ {AAD, Cleartext, TagLen}, true),
Chunk = [Ciphertext,CipherTag],
Chunk.
@@ -1488,8 +1489,7 @@ block_decrypt(
rekey_key = #key_pair{public = PubKeyA} = KeyPair,
rekey_count = RekeyCount} = Params,
Seq, AeadCipher, Key, IV, Data) ->
- %%
- case crypto:block_decrypt(AeadCipher, Key, IV, Data) of
+ case crypto:crypto_one_time(AeadCipher, Key, IV, Data, false) of
<<?REKEY_CHUNK, Rest/binary>> ->
PubKeyLen = byte_size(PubKeyA),
case Rest of
diff --git a/lib/ssl/test/ssl_ECC.erl b/lib/ssl/test/ssl_ECC.erl
index 73dafcd1fc..56b67361e1 100644
--- a/lib/ssl/test/ssl_ECC.erl
+++ b/lib/ssl/test/ssl_ECC.erl
@@ -23,8 +23,6 @@
-module(ssl_ECC).
--behaviour(ct_suite).
-
-include_lib("common_test/include/ct.hrl").
-include_lib("public_key/include/public_key.hrl").
diff --git a/lib/ssl/test/ssl_bench_test_lib.erl b/lib/ssl/test/ssl_bench_test_lib.erl
index 74ab142993..cbb9cfe47a 100644
--- a/lib/ssl/test/ssl_bench_test_lib.erl
+++ b/lib/ssl/test/ssl_bench_test_lib.erl
@@ -19,8 +19,6 @@
%%
-module(ssl_bench_test_lib).
--behaviour(ct_suite).
-
%% API
-export([setup/1]).
diff --git a/lib/ssl/test/ssl_cert_tests.erl b/lib/ssl/test/ssl_cert_tests.erl
index a6760663f8..d57efbebc4 100644
--- a/lib/ssl/test/ssl_cert_tests.erl
+++ b/lib/ssl/test/ssl_cert_tests.erl
@@ -21,8 +21,6 @@
%%
-module(ssl_cert_tests).
--behaviour(ct_suite).
-
-include_lib("public_key/include/public_key.hrl").
%% Test cases
@@ -196,9 +194,9 @@ client_auth_partial_chain_fun_fail(Config) when is_list(Config) ->
{ok, ServerCAs} = file:read_file(proplists:get_value(cacertfile, ServerOpts0)),
[{_,_,_}, {_, IntermidiateCA, _} | _] = public_key:pem_decode(ServerCAs),
- PartialChain = fun(_CertChain) ->
- true = false %% crash on purpose
- end,
+ PartialChain = fun(_CertChain) ->
+ error(crash_on_purpose)
+ end,
ServerOpts = [{cacerts, [IntermidiateCA]},
{partial_chain, PartialChain} |
proplists:delete(cacertfile, ServerOpts0)],
diff --git a/lib/ssl/test/ssl_dist_test_lib.erl b/lib/ssl/test/ssl_dist_test_lib.erl
index d0fda480b2..2dc5188195 100644
--- a/lib/ssl/test/ssl_dist_test_lib.erl
+++ b/lib/ssl/test/ssl_dist_test_lib.erl
@@ -20,8 +20,6 @@
-module(ssl_dist_test_lib).
--behaviour(ct_suite).
-
-include_lib("common_test/include/ct.hrl").
-include_lib("public_key/include/public_key.hrl").
-include("ssl_dist_test_lib.hrl").
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 569efe499b..4ae989455e 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -21,8 +21,6 @@
%%
-module(ssl_test_lib).
--behaviour(ct_suite).
-
-include_lib("common_test/include/ct.hrl").
-include_lib("public_key/include/public_key.hrl").
-include_lib("ssl/src/tls_handshake_1_3.hrl").
@@ -2865,7 +2863,7 @@ update_session_ticket_extension([Ticket|_], MaxEarlyDataSize) ->
ct:log("~p:~p~nOverwrite max_early_data_size (from ~p to ~p)!",
[?MODULE, ?LINE, Size, MaxEarlyDataSize]),
#{ticket := #new_session_ticket{
- extensions = #{early_data := Extensions0}} = NST0} = Ticket,
+ extensions = #{early_data := _Extensions0}} = NST0} = Ticket,
Extensions = #{early_data => #early_data_indication_nst{
indication = MaxEarlyDataSize}},
NST = NST0#new_session_ticket{extensions = Extensions},
diff --git a/lib/ssl/test/tls_api_SUITE.erl b/lib/ssl/test/tls_api_SUITE.erl
index a5f4fe3709..f41222a2a3 100644
--- a/lib/ssl/test/tls_api_SUITE.erl
+++ b/lib/ssl/test/tls_api_SUITE.erl
@@ -793,7 +793,7 @@ transport_close(Config) when is_list(Config) ->
transport_close_in_inital_hello() ->
[{doc, "Test what happens if server dies after calling transport_accept but before initiating handshake."}].
transport_close_in_inital_hello(Config) when is_list(Config) ->
- ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+ _ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
{_, _, Hostname} = ssl_test_lib:run_where(Config),
process_flag(trap_exit, true),
--
2.31.1
