From 7a718717d8b2b5eb055ec3c307da073496f20f26 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 18 May 2018 14:41:24 +0200
Subject: ssl: Deprecate ssl:ssl_accept/[1,2,3]

---
 lib/ssl/src/ssl.erl             | 23 +++++++++++++----------
 lib/stdlib/src/otp_internal.erl |  9 +++++++++
 2 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 5b6d92ebf4..fb13a1ce7e 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -23,9 +23,17 @@
 %%% Purpose : Main API module for SSL see also tls.erl and dtls.erl
 
 -module(ssl).
--include("ssl_internal.hrl").
+
 -include_lib("public_key/include/public_key.hrl").
 
+-include("ssl_internal.hrl").
+-include("ssl_api.hrl").
+-include("ssl_internal.hrl").
+-include("ssl_record.hrl").
+-include("ssl_cipher.hrl").
+-include("ssl_handshake.hrl").
+-include("ssl_srp.hrl").
+
 %% Application handling
 -export([start/0, start/1, stop/0, clear_pem_cache/0]).
 
@@ -39,8 +47,8 @@
 	 close/1, close/2, shutdown/2, recv/2, recv/3, send/2,
 	 getopts/2, setopts/2, getstat/1, getstat/2
 	]).
-%% SSL/TLS protocol handling
 
+%% SSL/TLS protocol handling
 -export([cipher_suites/0, cipher_suites/1, cipher_suites/2, filter_cipher_suites/2,
          prepend_cipher_suites/2, append_cipher_suites/2,
          eccs/0, eccs/1, versions/0, 
@@ -49,14 +57,9 @@
 %% Misc
 -export([handle_options/2, tls_version/1, new_ssl_options/3]).
 
--include("ssl_api.hrl").
--include("ssl_internal.hrl").
--include("ssl_record.hrl").
--include("ssl_cipher.hrl").
--include("ssl_handshake.hrl").
--include("ssl_srp.hrl").
-
--include_lib("public_key/include/public_key.hrl"). 
+-deprecated({ssl_accept, 1, eventually}).
+-deprecated({ssl_accept, 2, eventually}).
+-deprecated({ssl_accept, 3, eventually}).
 
 %%--------------------------------------------------------------------
 -spec start() -> ok  | {error, reason()}.
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index a17addcc42..ceec3079a1 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -612,6 +612,15 @@ obsolete_1(erlang, get_stacktrace, 0) ->
 obsolete_1(erlang, hash, 2) ->
     {removed, {erlang, phash2, 2}, "20.0"};
 
+%% Add in OTP 21.
+
+obsolete_1(ssl, ssl_accept, 1) ->
+    {deprecated, "deprecated; use ssl:handshake/1 instead"};
+obsolete_1(ssl, ssl_accept, 2) ->
+    {deprecated, "deprecated; use ssl:handshake/2 instead"};
+obsolete_1(ssl, ssl_accept, 3) ->
+    {deprecated, "deprecated; use ssl:handshake/3 instead"};
+
 %% not obsolete
 
 obsolete_1(_, _, _) ->
-- 
cgit v1.2.3