[update to 2.3] fix encoding BMPString in x509 name entries (#4321)

fenrus75 · djklimes · commit 964f734345f0 · 2018-07-19T15:30:59.000-07:00
Alex Gaynor (36): Revert "don't allow GeneralNames to be an empty list (#4128)" (#4161) forward port 2.2.1 changelog (#4167) updated link to sphinx docs (#4181) Fixed links to sphinx docs (#4182) Remove version number from an error message so that it makes sense (#4188) temporarily fix tests (#4195) Update URLs for new pypi! (#4194) Remove CDN purging, the new PyPI does the right thing (#4198) Revert #4195 (#4201) Remove setup.py branch (#4203) bump openssl version in travis (#4204) Remove cffi branch for pypy that's not needed (#4209) update link to draft rfc (#4214) Use a checklist for bumping openssl version (#4221) fixed variable name to be correct (#4226) Fixed some confusing type descriptions in docs (#4231) Run no longer used debugging output from travis (#4233) Remove macOS travis stuff, we don't intend to reenable it (#4244) satisfy shellcheck (#4247) Only send coverage for tox builds, in prep for #4228 (#4248) Fixes #4228 -- move downstream builders to travis (#4250) Removes branches in bindings for various OpenSSL 1.1.0 prereleases (#4269) Test certbot with OpenSSL 1.1.0 (#4278) Correct pass bytes; refs #4289 (#4291) Correctly pass bytes; refs #4289 (#4290) Perform an OPENSSL_cleanup before checking the heap in our memleak tests (#4293) Fixes #4242 -- added an additional assert to make this test more resillient (#4308) Don't change the cwd in travis scripts (#4309) Make the docs clearer on why truncated tags are a bad idea (#4312) Make our locking setup function compy with our style guide (#4316) Convert a pair of asserts to use openssl_assert (#4318) bump to latest libressl versions (#4329) Change the exception we raise in keywrap unwrapping on invalid length (#4337) Refs #3331 -- added initial wycheproof integration, starting with x25519, rsa, and keywrap (#4310) Refs #3331 -- integrated wycheproof ECDSA tests (#4341) Refs #3331 -- integrated wycheproof ECDH tests (#4354) Amaury Forgeot d'Arc (1): Add Session functions, necessary to implement new features in Python 3.6. (#4205) David Benjamin (12): Remove unused BN bindings. (#4219) Fix some callback type signatures. (#4227) Check for CMAC_Init errors. (#4232) Remove unused BIO bindings. (#4220) Clean up unused EC bindings. (#4225) Remove some unused RAND bindings. (#4239) Fix some stuttering. (#4240) Validate the public/private halves of EC keys on import. (#4241) Remove some unused RSA bindings. (#4243) Remove ECDSA_sign_setup and *sign_ex bindings. (#4245) Cleanup unused err bindings. (#4246) Revert the const bits of #4220. (#4276) Denis Lila (1): add custom extensions functions for openssl >=1.0.2 (#4202) Eric Brown (2): Future proofing use of the six python version constants (#4238) Add testing support of Python 3.7 (#4305) Jon Dufresne (1): Document project as stable and ready for use in production (#4284) Joshua Crowgey (4): Added badtime.pem vector (#4179) Raise ve on bad gt (#4180) add X509_NAME_print_ex (#4174) adding name so that 1.3.6.1.4.1.11129.2.4.2 is no longer and 'Unknown OID' (#4218) Justin Holmes (1): Updated pip wheel option in installation script. (#4212) Marti Raudsepp (2): Add OID for RSASSA-PSS X.509 signature algorithm (RFC 4055) (#4294) Make RelativeDistinguishedName preserve attribtue order (#4306) Matt Bullock (2): simplify Jenkins test run taking advantage of aws/aws-encryption-sdk-python#46 (#4185) add downstream tests for awslabs/aws-dynamodb-encryption-python (#4280) Paul Kehrer (42): open master for 2.3 (#4151) add botan's AESKWP vectors reformatted for our NIST loader (#4159) fix bug with n % 8 length wrapping on AESKWP (#4160) Add urllib3 to downstream tests (#4165) port changelog for 2.2.2 (#4172) update the NIST keywrap vectors (#4191) add SHA3 and SHAKE vectors (#4213) Add support for extracting timestamp from a Fernet token (#4229) switch to py3 on docs job (#4230) Add SHA512/224 and SHA512/256 test vectors from NIST CAVP (#4237) remove block size as a required part of HashAlgorithm (#4249) build and test libre on travis (#4256) deprecate pythons without hmac.compare_digest (#4261) parametrize a few things in test_ec (#4268) simplify and parametrize DSA tests (#4267) LibreSSL 2.7.x support (#4270) Add py37 (#4298) 6 and 7 are right next to each other (#4302) since the generator order is 570 bits this should be 570 (#4307) set an OPENSSL_API_COMPAT level (#4313) reduce number of deprecated signer/verifier calls in test_rsa (#4314) document that an ECPublicNumbers object has some unexpected properties (#4319) fix encoding BMPString in x509 name entries (#4321) fix a memory leak when calling X25519PrivateKey.public_key() (#4326) we don't actually care about the errstack here, it's an invalid signature (#4325) don't install docs when we build openssls...and do it parallel (#4327) try compiling with asm for our custom openssl (#4328) raise valueerror for null x25519 derived keys (#4332) switch cryptography wheel builders back to pip wheel (#4334) document one shot AEAD length restrictions (#4322) add crl.get_revoked_certificate method (#4331) add DSA wycheproof tests (#4346) add aes cbc pkcs5 wycheproof tests (#4347) disallow implicit tag truncation with finalize_with_tag (#4342) add wycheproof tests for AES CMAC (#4344) add chacha20poly1305 wycheproof tests (#4345) raise ValueError on zero length GCM IV (#4348) also check iv length for GCM nonce in AEAD (#4350) min_tag_length is an int (#4351) add wycheproof gcm tests (#4349) improve skip msg when skipping an ECDH test in test_ec (#4355) bump version and changelog for 2.3 release (#4356) Quinten Stokkink (1): Exposed OpenSSL prime methods (#4292) Thierry Bastian (1): OpenSSL 1.0.2o has switched to winsock2 (#4184) Thom Dixon (1): Make AuthorityKeyIdentifier docs reflect reality (#4252) Tim D. Smith (1): Fix typo (#4178) Tux (1): Expose OpenSSL constant time bignum arithmetic (#4200) Ville Skyttä (1): Use pytest instead of py.test per upstream recommendation, #dropthedot (#4236) Vladyslav Moisieienkov (1): Add clearer message when key type is not bytes (#4289) dumol (1): Fixed build errors on HP-UX. (#4259) Коренберг Марк (1): Add serialisation output examples (#4286)
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME := cryptography
-URL = https://github.com/pyca/cryptography/archive/2.2.2.tar.gz
+URL = https://github.com/pyca/cryptography/archive/2.3.tar.gz
 ARCHIVES = 
 
 include ../common/Makefile.common
diff --git a/cryptography.spec b/cryptography.spec
@@ -3,10 +3,10 @@
 # Generated by: autospec.py
 #
 Name     : cryptography
-Version  : 2.2.2
-Release  : 96
-URL      : https://github.com/pyca/cryptography/archive/2.2.2.tar.gz
-Source0  : https://github.com/pyca/cryptography/archive/2.2.2.tar.gz
+Version  : 2.3
+Release  : 97
+URL      : https://github.com/pyca/cryptography/archive/2.3.tar.gz
+Source0  : https://github.com/pyca/cryptography/archive/2.3.tar.gz
 Summary  : No detailed summary available
 Group    : Development/Tools
 License  : Apache-2.0 BSD-3-Clause Python-2.0
@@ -22,6 +22,8 @@ BuildRequires : asn1crypto-legacypython
 BuildRequires : asn1crypto-python
 BuildRequires : attrs-legacypython
 BuildRequires : attrs-python
+BuildRequires : buildreq-distutils3
+BuildRequires : buildreq-golang
 BuildRequires : cffi
 BuildRequires : cffi-legacypython
 BuildRequires : cryptography_vectors
@@ -38,7 +40,9 @@ BuildRequires : pip
 BuildRequires : pretend
 BuildRequires : pycparser-legacypython
 BuildRequires : pyparsing
+BuildRequires : python-core
 BuildRequires : python-dev
+BuildRequires : python3-core
 BuildRequires : python3-dev
 BuildRequires : pytz
 BuildRequires : setuptools
@@ -50,7 +54,7 @@ Patch1: 0002-Don-t-try-and-install-the-vectors-dependency.patch
 pyca/cryptography
 =================
 .. image:: https://img.shields.io/pypi/v/cryptography.svg
-:target: https://pypi.python.org/pypi/cryptography/
+:target: https://pypi.org/project/cryptography/
 :alt: Latest Version
 
 %package legacypython
@@ -89,20 +93,20 @@ python3 components for the cryptography package.
 
 
 %prep
-%setup -q -n cryptography-2.2.2
+%setup -q -n cryptography-2.3
 %patch1 -p1
 
 %build
 export http_proxy=http://127.0.0.1:9/
 export https_proxy=http://127.0.0.1:9/
 export no_proxy=localhost,127.0.0.1,0.0.0.0
 export LANG=C
-export SOURCE_DATE_EPOCH=1530340222
+export SOURCE_DATE_EPOCH=1532010208
 python2 setup.py build -b py2
 python3 setup.py build -b py3
 
 %install
-export SOURCE_DATE_EPOCH=1530340222
+export SOURCE_DATE_EPOCH=1532010208
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/usr/share/doc/cryptography
 cp LICENSE.PSF %{buildroot}/usr/share/doc/cryptography/LICENSE.PSF
diff --git a/options.conf b/options.conf
@@ -1,6 +1,6 @@
 [package]
 name = cryptography
-url = https://github.com/pyca/cryptography/archive/2.2.2.tar.gz
+url = https://github.com/pyca/cryptography/archive/2.3.tar.gz
 archives = 
 giturl = https://github.com/pyca/cryptography.git
 
diff --git a/release b/release
@@ -1 +1 @@
-96
+97
diff --git a/upstream b/upstream
@@ -1 +1 @@
-73822bece0c230a541f4c66c05f3dab6047c2865/2.2.2.tar.gz
+6d735bc288064633efe01895fc8379e3673e2c84/2.3.tar.gz
diff --git a/used_libs b/used_libs
@@ -2,5 +2,4 @@ libc.so.6
 libcrypto.so.1.0.0
 libpthread.so.0
 libpython2.7.so.1.0
-libpython3.7m.so.1.0
 libssl.so.1.0.0

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-73822bece0c230a541f4c66c05f3dab6047c2865/2.2.2.tar.gz`
	`1`	`+6d735bc288064633efe01895fc8379e3673e2c84/2.3.tar.gz`