From d879cf1bf9a44712e65a8b20dc0cff6641b0f506 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Fri, 22 Feb 2019 01:56:51 +0000
Subject: [PATCH 1/4] Deprecated NPN

---
 CHANGELOG.rst      | 4 +++-
 src/OpenSSL/SSL.py | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ee8dda437..fa04273ca 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -18,7 +18,9 @@ Backward-incompatible changes:
 Deprecations:
 ^^^^^^^^^^^^^
 
-*none*
+- Deprecated ``OpenSSL.SSL.Context.set_npn_advertise_callback``, ``OpenSSL.SSL.Context.set_npn_select_callback``, and ``OpenSSL.SSL.Connection.get_next_proto_negotiated``.
+  ALPN should be used instead.
+  `#819 </~https://github.com/pyca/pyopenssl/pull/819`_
 
 
 Changes:
diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
index de49cf97c..06a7c97e5 100644
--- a/src/OpenSSL/SSL.py
+++ b/src/OpenSSL/SSL.py
@@ -1,5 +1,6 @@
 import os
 import socket
+import warning
 from sys import platform
 from functools import wraps, partial
 from itertools import count, chain
@@ -626,6 +627,11 @@ def SSLeay_version(type):
     return _ffi.string(_lib.SSLeay_version(type))
 
 
+def _warn_npn():
+    warnings.warn("NPN is deprecated. Protocols should switch to using ALPN.",
+                  DeprecationWarning, stacklevel=3)
+
+
 def _make_requires(flag, error):
     """
     Builds a decorator that ensures that functions that rely on OpenSSL
@@ -1415,6 +1421,7 @@ def set_npn_advertise_callback(self, callback):
 
         .. versionadded:: 0.15
         """
+        _warn_npn()
         self._npn_advertise_helper = _NpnAdvertiseHelper(callback)
         self._npn_advertise_callback = self._npn_advertise_helper.callback
         _lib.SSL_CTX_set_next_protos_advertised_cb(
@@ -1433,6 +1440,7 @@ def set_npn_select_callback(self, callback):
 
         .. versionadded:: 0.15
         """
+        _warn_npn()
         self._npn_select_helper = _NpnSelectHelper(callback)
         self._npn_select_callback = self._npn_select_helper.callback
         _lib.SSL_CTX_set_next_proto_select_cb(
@@ -2437,6 +2445,7 @@ def get_next_proto_negotiated(self):
 
         .. versionadded:: 0.15
         """
+        _warn_npn()
         data = _ffi.new("unsigned char **")
         data_len = _ffi.new("unsigned int *")
 

From 112e9651f1ce5feb95f97f74cca9258ccbc36e4f Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Fri, 22 Feb 2019 01:59:10 +0000
Subject: [PATCH 2/4] arithmetic is hard

---
 CHANGELOG.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index fa04273ca..3857bd1e4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -20,7 +20,7 @@ Deprecations:
 
 - Deprecated ``OpenSSL.SSL.Context.set_npn_advertise_callback``, ``OpenSSL.SSL.Context.set_npn_select_callback``, and ``OpenSSL.SSL.Connection.get_next_proto_negotiated``.
   ALPN should be used instead.
-  `#819 </~https://github.com/pyca/pyopenssl/pull/819`_
+  `#820 </~https://github.com/pyca/pyopenssl/pull/820`_
 
 
 Changes:

From 5043365df5db60d09cb3231cadc1a17e8ff97e5d Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Fri, 22 Feb 2019 02:11:51 +0000
Subject: [PATCH 3/4] oops

---
 src/OpenSSL/SSL.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
index 06a7c97e5..232f81d3a 100644
--- a/src/OpenSSL/SSL.py
+++ b/src/OpenSSL/SSL.py
@@ -1,6 +1,6 @@
 import os
 import socket
-import warning
+import warnings
 from sys import platform
 from functools import wraps, partial
 from itertools import count, chain

From 88b2f986a6d3e2b1cfbe50ab46459091b27b3768 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Fri, 22 Feb 2019 02:26:30 +0000
Subject: [PATCH 4/4] oops

---
 CHANGELOG.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3857bd1e4..2b6d73261 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -20,7 +20,7 @@ Deprecations:
 
 - Deprecated ``OpenSSL.SSL.Context.set_npn_advertise_callback``, ``OpenSSL.SSL.Context.set_npn_select_callback``, and ``OpenSSL.SSL.Connection.get_next_proto_negotiated``.
   ALPN should be used instead.
-  `#820 </~https://github.com/pyca/pyopenssl/pull/820`_
+  `#820 </~https://github.com/pyca/pyopenssl/pull/820>`_
 
 
 Changes: