Change-Id: Ic10a0c6d9badab2b8530b347914d0778a2b8d0b5
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3327
Reviewed-by: Sharath George
Tested-by: gerrit-photon <photon-checkins@vmware.com>
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,23 @@ |
| 0 |
+From 9c6bc36be24e4c90abd3ef2033223fab97ca5341 Mon Sep 17 00:00:00 2001 |
|
| 1 |
+From: jhall150 <jhall150@bloomberg.net> |
|
| 2 |
+Date: Thu, 31 Mar 2016 10:15:47 -0400 |
|
| 3 |
+Subject: [PATCH] Don't pass IV to pycrypto when using MODE_CTR |
|
| 4 |
+ |
|
| 5 |
+* Fixes #713 |
|
| 6 |
+--- |
|
| 7 |
+ paramiko/transport.py | 2 +- |
|
| 8 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
|
| 9 |
+ |
|
| 10 |
+diff --git a/paramiko/transport.py b/paramiko/transport.py |
|
| 11 |
+index 8eaa094..b286fc5 100644 |
|
| 12 |
+--- a/paramiko/transport.py |
|
| 13 |
+@@ -1667,7 +1667,7 @@ def _get_cipher(self, name, key, iv): |
|
| 14 |
+ elif name.endswith("-ctr"):
|
|
| 15 |
+ # CTR modes, we need a counter |
|
| 16 |
+ counter = Counter.new(nbits=self._cipher_info[name]['block-size'] * 8, initial_value=util.inflate_long(iv, True)) |
|
| 17 |
+- return self._cipher_info[name]['class'].new(key, self._cipher_info[name]['mode'], iv, counter) |
|
| 18 |
++ return self._cipher_info[name]['class'].new(key, self._cipher_info[name]['mode'], '', counter) |
|
| 19 |
+ else: |
|
| 20 |
+ return self._cipher_info[name]['class'].new(key, self._cipher_info[name]['mode'], iv) |
|
| 21 |
+ |
| ... | ... |
@@ -4,16 +4,15 @@ |
| 4 | 4 |
Summary: Python SSH module |
| 5 | 5 |
Name: paramiko |
| 6 | 6 |
Version: 1.16.0 |
| 7 |
-Release: 3%{?dist}
|
|
| 7 |
+Release: 4%{?dist}
|
|
| 8 | 8 |
License: LGPL |
| 9 | 9 |
Group: System Environment/Security |
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| 12 |
-URL: http://www.paramiko.org/ |
|
| 13 |
- |
|
| 14 |
-Source0: https://github.com/paramiko/paramiko/archive/paramiko-%{version}.tar.gz
|
|
| 12 |
+URL: http://www.paramiko.org/ |
|
| 13 |
+Source0: https://github.com/paramiko/paramiko/archive/paramiko-%{version}.tar.gz
|
|
| 15 | 14 |
%define sha1 paramiko=adf3afcc9e5a3f299a20639771f587a803924443 |
| 16 |
- |
|
| 15 |
+Patch0: paramiko-dont-pass-IV-in-AES-CTR-mode.patch |
|
| 17 | 16 |
BuildArch: noarch |
| 18 | 17 |
|
| 19 | 18 |
BuildRequires: python-setuptools |
| ... | ... |
@@ -42,6 +41,7 @@ Requires: python3-ecdsa > 0.11 |
| 42 | 42 |
Python 3 version. |
| 43 | 43 |
%prep |
| 44 | 44 |
%setup -q |
| 45 |
+%patch0 -p1 |
|
| 45 | 46 |
|
| 46 | 47 |
%build |
| 47 | 48 |
python setup.py build |
| ... | ... |
@@ -71,6 +71,8 @@ python3 setup.py install -O1 --skip-build \ |
| 71 | 71 |
%{python3_sitelib}/*
|
| 72 | 72 |
|
| 73 | 73 |
%changelog |
| 74 |
+* Sun Jul 23 2017 Divya Thaluru <dthaluru@vmware.com> 1.16.0-4 |
|
| 75 |
+- Added patch to fix issues with pycrypto 2.6.1 |
|
| 74 | 76 |
* Mon Feb 27 2017 Xiaolin Li <xiaolinl@vmware.com> 1.16.0-3 |
| 75 | 77 |
- Added python3 site-packages. |
| 76 | 78 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.16.0-2 |