File 0323-Move-key-pair-expiry-params-into-key-pair-record.patch of Package erlang
From 0726749ed15271e7700026a27fb28eb48e394f0d Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Mon, 13 May 2019 10:17:34 +0200
Subject: [PATCH 1/3] Move key pair expiry params into key pair record
---
lib/ssl/test/inet_crypto_dist.erl | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/ssl/test/inet_crypto_dist.erl b/lib/ssl/test/inet_crypto_dist.erl
index 63c19d9438..67d5bf861d 100644
--- a/lib/ssl/test/inet_crypto_dist.erl
+++ b/lib/ssl/test/inet_crypto_dist.erl
@@ -78,10 +78,10 @@ params(Socket) ->
%%% params = brainpoolP384t1,
params = brainpoolP256t1,
public,
- private}).
-
--define(KEY_PAIR_LIFE_TIME, 3600000). % 1 hour
--define(KEY_PAIR_LIFE_COUNT, 256). % Number of connection setups
+ private,
+ life_time = 3600000, % 1 hour
+ life_count = 256 % Number of connection setups
+ }).
%% -------------------------------------------------------------------------
@@ -102,11 +102,11 @@ start_key_pair_server() ->
key_pair_server() ->
key_pair_server(undefined, undefined, undefined).
%%
-key_pair_server(KeyPair) ->
- key_pair_server(
- KeyPair,
- erlang:start_timer(?KEY_PAIR_LIFE_TIME, self(), discard),
- ?KEY_PAIR_LIFE_COUNT).
+key_pair_server(
+ #key_pair{life_time = LifeTime, life_count = LifeCount} = KeyPair) ->
+ %%
+ Timer = erlang:start_timer(LifeTime, self(), discard),
+ key_pair_server(KeyPair, Timer, LifeCount).
%%
key_pair_server(_KeyPair, Timer, 0) ->
cancel_timer(Timer),
--
2.16.4