From 90885d08ccfc2cad4ba87f5a85decc979de56702 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Mon, 18 Feb 2019 16:59:41 +0100
Subject: ssl: Correct merge commit thanks to dialyzer

Also make a weaker spec in ssl_internal.hrl for now as it creates
a conflict between error handling and dialyzer warnings.
---
 lib/ssl/src/ssl.erl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/ssl/src/ssl.erl')

diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index fed7aa1141..d06f61f17d 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -87,6 +87,7 @@
               private_key_type/0,
               cipher/0,
               hash/0,
+              key/0,
               key_algo/0,
               sign_algo/0
              ]).
-- 
cgit v1.2.3