debian/0000775000000000000000000000000012300521144007160 5ustar debian/python-m2crypto.doc-base.ca-howto0000664000000000000000000000042112073026275015406 0ustar Document: m2crypto.ca-howto Title: M2Crypto CA howto Author: Ng Pheng Siong Abstract: HOWTO: Creating your own CA with OpenSSL Section: Programming/Python Format: HTML Index: /usr/share/doc/python-m2crypto/howto.ca.html Files: /usr/share/doc/python-m2crypto/howto.ca.html debian/source/0000775000000000000000000000000012226372255010476 5ustar debian/source/include-binaries0000664000000000000000000000001712073027236013630 0ustar tests/x509.der debian/source/format0000664000000000000000000000001412073027236011700 0ustar 3.0 (quilt) debian/copyright0000664000000000000000000002203212073026275011126 0ustar This package was debianized by Dima Barsky on Sun, 28 Mar 2004 19:42:33 +0100. It was downloaded from Upstream Author: Ng Pheng Siong Current upstream maintainer: Heikki Toivonen (heikki@osafoundation.org) Copyright (c) 1999-2003 Ng Pheng Siong. All rights reserved. Portions copyright (c) 2004-2006 Open Source Applications Foundation. All rights reserved. Portions copyright (c) 2005-2006 Vrije Universiteit Amsterdam. All rights reserved. Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. THE AUTHOR PROVIDES THIS SOFTWARE ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: demo/tinderbox/build_lib.py Copyright: © 2006-2007 Open Source Applications Foundation License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. Files: demo/tinderbox/killableprocess.py Copyright: ©2003-2004 by Peter Astrand © 2006 by the Mozilla Foundation License: killableprocess By obtaining, using, and/or copying this software and/or its associated documentation, you agree that you have read, understood, and will comply with the following terms and conditions: . Permission to use, copy, modify, and distribute this software and its associated documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appears in all copies, and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of the author not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. . THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. Files: demo/tinderbox/winprocess.py Copyright: © 2006 the Mozilla Foundation License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Some files under demo/Zope*: Copyright: © 2001 Zope Corporation and Contributors. All Rights Reserved. License: ZPL-2.0 Comment: This software is subject to the provisions of the Zope Public License, Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE License: ZPL-2.0 Zope Public License (ZPL) Version 2.0 ----------------------------------------------- . This software is Copyright (c) Zope Corporation (tm) and Contributors. All rights reserved. . This license has been certified as open source. It has also been designated as GPL compatible by the Free Software Foundation (FSF). . Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . 1. Redistributions in source code must retain the above copyright notice, this list of conditions, and the following disclaimer. . 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions, and the following disclaimer in the documentation and/or other materials provided with the distribution. . 3. The name Zope Corporation (tm) must not be used to endorse or promote products derived from this software without prior written permission from Zope Corporation. . 4. The right to distribute this software or to use it for any purpose does not give you the right to use Servicemarks (sm) or Trademarks (tm) of Zope Corporation. Use of them is covered in a separate agreement (see http://www.zope.com/Marks). . 5. If any files are modified, you must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. . Disclaimer . THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ZOPE CORPORATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. . . This software consists of contributions made by Zope Corporation and many individuals on behalf of Zope Corporation. Specific attributions are listed in the accompanying credits file. Some files in demo/medusa: Copyright: © 1996 by Sam Rushing License: medusa All Rights Reserved . Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Sam Rushing not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. . SAM RUSHING DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SAM RUSHING BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. Some files in demo/x509/proxylib.py are copyrighted by The Regents of the University of California through Lawrence Berkeley National Laboratory, but distributed under the same terms as m2crypto. This was confirmed directly by MR to me in august 2011 -- Charles Plessy Files: contrib/m2crypto.spec Copyright tummy.com, ltd. License: probably same as m2crypto (In my understanding from the discussion about demo/x509/proxylib.py, where the upstream autor expected contributions to be done under the same terms as m2crypto itself -- Charles Plessy) debian/python-m2crypto.doc-base.smime-howto0000664000000000000000000000044712073026275016145 0ustar Document: m2crypto.smime-howto Title: M2Crypto S/MIME howto Author: Ng Pheng Siong Abstract: HOWTO: Programming S/MIME in Python with M2Crypto Section: Programming/Python Format: HTML Index: /usr/share/doc/python-m2crypto/howto.smime.html Files: /usr/share/doc/python-m2crypto/howto.smime.html debian/compat0000664000000000000000000000000212073026275010372 0ustar 8 debian/docs0000664000000000000000000000003112073026275010041 0ustar README doc/[A-HK-Za-z]* debian/python-m2crypto.doc-base.zserverssl-howto0000664000000000000000000000045512073026275017254 0ustar Document: m2crypto.zserverssl-howto Title: M2Crypto ZServerSSL howto Author: Ng Pheng Siong and Heikki Toivonen Abstract: ZServerSSL HOWTO Section: Programming/Python Format: HTML Index: /usr/share/doc/python-m2crypto/ZServerSSL-HOWTO.html Files: /usr/share/doc/python-m2crypto/ZServerSSL-HOWTO.html debian/gbp.conf0000664000000000000000000000015112073026275010610 0ustar # This source packages is managed with git-buildpackage and pristine-tar. [DEFAULT] pristine-tar = True debian/changelog0000664000000000000000000002501312300521140011027 0ustar m2crypto (0.21.1-3ubuntu5) trusty; urgency=medium * debian/patches/fix_testsuite_sha256.patch: Fix test_write_pkcs7_der to cope with SHA-256 defaults in OpenSSL. -- William Grant Tue, 18 Feb 2014 10:58:57 +1100 m2crypto (0.21.1-3ubuntu4) trusty; urgency=medium * debian/patches/fix_testsuite_tls1.2.patch: Fix SSLv3 test to also disable TLS 1.2, as otherwise new OpenSSLs negotiate up to 1.2 instead. -- William Grant Thu, 19 Dec 2013 02:11:48 +1100 m2crypto (0.21.1-3ubuntu3) saucy; urgency=low * Reupload with the new x509.der. -- William Grant Sun, 13 Oct 2013 23:40:04 +1100 m2crypto (0.21.1-3ubuntu2) saucy; urgency=low * debian/patches/fix_testsuite_ftbfs.patch: Replace expired test certificates with a new set valid until 2023. -- William Grant Sun, 13 Oct 2013 17:08:13 +1100 m2crypto (0.21.1-3ubuntu1) raring; urgency=low * Merge from Debian unstable. Remaining Ubuntu changes: - Switch to 3.0 (quilt). - debian/control: Add Pre-Depends for xz compression. - Re-enable test suite: * debian/control: Re-enable test suite. * debian/patches/skip_sslv2_test.patch: Skip tests which cannot pass on Debian/Ubuntu due to SSLv2 being disabled. * debian/patches/fix_testsuite_ftbfs.patch: Regenerate all the expired test certificates, modify test scripts with new certificate hashes, fingerprints, and lengths. Fix test_sslv23_no_v2() by disabling tls v1.1, and disable test_use_weak_cipher() as weak cipher doesn't work with recent openssl changes. * debian/source/include-binaries: include binary certificate file tests/x509.der in debian tarball, since it unfortunately can't go in the above patch. -- Marc Deslauriers Tue, 08 Jan 2013 09:36:18 -0500 m2crypto (0.21.1-3) unstable; urgency=low b435179 Look for OpenSSL headers in multiarch path. Thanks to Colin Watson (Closes: #696327) -- Charles Plessy Sat, 05 Jan 2013 18:01:43 +0900 m2crypto (0.21.1-2ubuntu3) quantal-proposed; urgency=low * Fix FTBFS in test suite: - debian/patches/fix_testsuite_ftbfs.patch: Regenerate all the expired test certificates, modify test scripts with new certificate hashes, fingerprints, and lengths. Fix test_sslv23_no_v2() by disabling tls v1.1, and disable test_use_weak_cipher() as weak cipher doesn't work with recent openssl changes. - debian/source/include-binaries: include binary certificate file tests/x509.der in debian tarball, since it unfortunately can't go in the above patch. -- Marc Deslauriers Tue, 25 Sep 2012 14:39:17 -0400 m2crypto (0.21.1-2ubuntu2) precise; urgency=low * Add Pre-Depends for xz compression. -- Barry Warsaw Tue, 25 Oct 2011 15:43:58 -0400 m2crypto (0.21.1-2ubuntu1) precise; urgency=low * Merge from Debian testing. Remaining Ubuntu changes: - debian/control: Re-enable test suite. - Switch to 3.0 (quilt). - d/p/skip_sslv2_test.patch: Skip tests which cannot pass on Debian/Ubuntu due to SSLv2 being disabled. -- Barry Warsaw Tue, 25 Oct 2011 14:23:44 -0400 m2crypto (0.21.1-2) unstable; urgency=low [939cdded] Disable SSLv2_method when disabled in OpenSSL iself (Closes: #637904). [10433e12] Documented applied patches in debian/patches. [69b60a5d] Added debian/gbp.conf to show that the package is managed with git-buildpackage. -- Charles Plessy Tue, 16 Aug 2011 08:41:24 +0900 m2crypto (0.21.1-1) unstable; urgency=low * New upstream releases supporting OpenSSL 1.0 (see #622001). Closes: #634015. * [0d774d2b] Transition to dh_python2. * [b6719dce] Switched to Debhelper 8. * [966a9d1b] Register the documentation with doc-base. * [ff50d3c0] Switch to CDBS. * [3592aa95] Complies with Policy 3.9.2 (no changes needed). * [955a5309] Use debhelper's ${misc:Depends}. * [8eef3145] Package in collab-maint on Alioth. Added myself as Uploader. * [66745855] Removed Pre-Etch Replaces and Conflicts statements. * [f5a50460] Documented upstream project's homepage. * [0cc12cb3] Compress binary package with xz. * [bc6599b4] Updated the list of files to remove at clean time. -- Charles Plessy Sun, 14 Aug 2011 14:23:11 +0900 m2crypto (0.20.1+dfsg1-1.1ubuntu1) oneiric; urgency=low * repackage upstream - remove non-free demo/x509/proxylib.py * switch to dh_python2 (LP: #788514) * switch to 3.0 (quilt) - converted all upstream changes to patches - fix_sslv2_test.patch: testsuite patch for sslv2 deactivation - fix_build_with_new_openssl.patch: build fix from debian 0.20.1-1.1 * Merge from debian testing, remaining changes: - disable_sslv2_test.patch: disable sslv23_weak_crypto test as it is expected to fail with SSLv2 having been disabled in openssl 0.9.8o-1ubuntu3. (LP: #600549) - fix_sslv2_test2.patch: fix testsuite with newer openssl. (LP: #600549) - Backported from http://svn.osafoundation.org/viewvc/m2crypto/trunk/tests/test_smime.py?r1=698&r2=721 - debian/control: Add openssl for FTBFS. - debian/rules; enable testsuite, add more files to "clean" rule. - fix_kill_signal.patch: use signal 9 to kill old s_server processes to work around build HUP signal-ignore-mask (LP: #451998). -- Julian Taylor Wed, 10 Aug 2011 17:01:24 +0200 m2crypto (0.20.1-1.1) unstable; urgency=low * Non-maintainer upload. * Backport revision 721 from upstream SVN repository to fix build errors with libssl-dev >= 1.0.0. (Closes: #622001) * Do not provide sslv2_method if SSLv2 is not available. -- Sebastian Ramacher Fri, 24 Jun 2011 17:27:46 +0200 m2crypto (0.20.1-1ubuntu5) natty; urgency=low * Rebuild to add support for python 2.7. -- Matthias Klose Fri, 03 Dec 2010 00:04:32 +0000 m2crypto (0.20.1-1ubuntu4) maverick; urgency=low * tests/test_ssl.py: disable sslv23_weak_crypto test as it is expected to fail with SSLv2 having been disabled in openssl 0.9.8o-1ubuntu3. (LP: #600549) -- Marc Deslauriers Fri, 01 Oct 2010 11:58:15 -0400 m2crypto (0.20.1-1ubuntu3) maverick; urgency=low * tests/test_smime.py: fix testsuite with newer openssl. (LP: #600549) - Backported from http://svn.osafoundation.org/viewvc/m2crypto/trunk/tests/test_smime.py?r1=698&r2=721 -- Marc Deslauriers Fri, 09 Jul 2010 11:17:57 -0400 m2crypto (0.20.1-1ubuntu2) lucid; urgency=low * debian/control: Add openssl for FTBFS. -- Chuck Short Fri, 23 Apr 2010 12:55:10 -0400 m2crypto (0.20.1-1ubuntu1) lucid; urgency=low * Merge from debian testing, remaining changes: - debian/rules; enable testsuite, add more files to "clean" rule. - tests/test_ssl.py: use signal 9 to kill old s_server processes to work around build HUP signal-ignore-mask (LP: #451998). -- Chuck Short Fri, 06 Nov 2009 01:28:39 +0000 m2crypto (0.20.1-1) unstable; urgency=low * New upstream release -- Dima Barsky Sat, 12 Sep 2009 12:50:09 +0100 m2crypto (0.19.1-2) unstable; urgency=low * Fixed the URL in the watch file (Closes: #450167) -- Dima Barsky Mon, 15 Jun 2009 22:11:39 +0100 m2crypto (0.19.1-1) unstable; urgency=low * New upstream release -- Dima Barsky Mon, 15 Jun 2009 21:54:41 +0100 m2crypto (0.19.1-0ubuntu7) karmic; urgency=low * debian/rules: enable testsuite, add more files to "clean" rule. * tests/test_ssl.py: use signal 9 to kill old s_server processes to work around buildd HUP signal-ignore-mask (LP: #451998). -- Kees Cook Fri, 16 Oct 2009 12:51:15 -0700 m2crypto (0.19.1-0ubuntu6) karmic; urgency=low * debian/rules: Disable testsuite, it will timeout the builds. -- Chuck Short Wed, 14 Oct 2009 13:38:09 -0400 m2crypto (0.19.1-0ubuntu5) karmic; urgency=low * debian/rules: Enable testsuite but dont let it prevent it from building the debs, since the testsuites require a network connection. -- Chuck Short Tue, 13 Oct 2009 08:31:18 -0400 m2crypto (0.19.1-0ubuntu4) karmic; urgency=low * debian/rules: Disable the testsuite again it does not run correctly on the builds. -- Chuck Short Fri, 09 Oct 2009 18:18:31 -0400 m2crypto (0.19.1-0ubuntu3) karmic; urgency=low * tests/test_ssl.py: Fix testsuite failure. * debian/rules: Enable testsuite -- Chuck Short Tue, 06 Oct 2009 13:31:54 -0400 m2crypto (0.19.1-0ubuntu2) karmic; urgency=low * debian/rules: Enable testsuite but leave it disabled now until it acutally works properly. -- Chuck Short Fri, 25 Sep 2009 13:49:33 -0400 m2crypto (0.19.1-0ubuntu1) karmic; urgency=low * New upstream release -- Soren Hansen Tue, 26 May 2009 11:07:11 +0200 m2crypto (0.18.2-2build1) jaunty; urgency=low * No-change upload for Python2.6 transition. -- Kees Cook Tue, 10 Mar 2009 15:49:08 -0700 m2crypto (0.18.2-2) unstable; urgency=low * Added "import inspect" to M2Crypto/m2urllib2.py (Closes: #493314, #484364, 477799) -- Dima Barsky Fri, 15 Aug 2008 22:04:14 +0100 m2crypto (0.18.2-1) unstable; urgency=low * New upstream release (Closes: #440837) -- Dima Barsky Sat, 13 Oct 2007 02:21:26 +0100 m2crypto (0.17-2) unstable; urgency=low * Added "Build-Depends: python-setuptools" to avoid build inconsistencies. -- Dima Barsky Thu, 19 Jul 2007 09:51:13 +0100 m2crypto (0.17-1) unstable; urgency=low * New upstream release * Acknowledge NMU (Closes: #380861) * Changed section to python (Closes: #425875) -- Dima Barsky Thu, 24 May 2007 21:14:36 +0100 m2crypto (0.16-1.1) unstable; urgency=low * Non-maintainer upload. * Update package to the last python policy (Closes: #380861), this includes renaming from m2crypto to python-m2crypto. * Bumped compat to 5. -- Ana Beatriz Guerrero Lopez Sat, 12 Aug 2006 16:07:49 +0200 m2crypto (0.16-1) unstable; urgency=low * New upstream release -- Dima Barsky Sat, 22 Jul 2006 11:11:40 +0100 m2crypto (0.13-1) unstable; urgency=low * Initial Release. -- Dima Barsky Tue, 30 Mar 2004 21:54:28 +0100 debian/control0000664000000000000000000000232512073027236010577 0ustar Source: m2crypto Section: python Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Dima Barsky Uploaders: Charles Plessy Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 8), python-all-dev (>= 2.6.6-3~), libssl-dev (>= 0.9.7), swig (>= 1.3.24), python-setuptools (>=0.6c5-3) Standards-Version: 3.9.2 VCS-Browser: http://git.debian.org/?p=collab-maint/m2crypto.git VCS-Git: git://git.debian.org/collab-maint/m2crypto.git Homepage: http://chandlerproject.org/Projects/MeTooCrypto Package: python-m2crypto Architecture: any Pre-Depends: dpkg (>= 1.15.6) Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} Provides: ${python:Provides}, m2crypto Description: a crypto and SSL toolkit for Python m2crypto features the following: * RSA, DSA, DH, HMACs, message digests, symmetric ciphers (including AES). * SSL functionality to implement clients and servers. * HTTPS extensions to Python's httplib, urllib, and xmlrpclib. * Unforgeable HMAC'ing AuthCookies for web session management. * FTP/TLS client and server. * S/MIME. * ZServerSSL: A HTTPS server for Zope. * ZSmime: An S/MIME messenger for Zope. debian/watch0000664000000000000000000000012112073026275010217 0ustar version=3 http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-(.*).tar.gz debian/patches/0000775000000000000000000000000012300521001010577 5ustar debian/patches/fix_testsuite_tls1.2.patch0000664000000000000000000000115712254335463015655 0ustar Index: m2crypto-0.21.1/tests/test_ssl.py =================================================================== --- m2crypto-0.21.1.orig/tests/test_ssl.py 2013-12-19 02:10:23.901720417 +1100 +++ m2crypto-0.21.1/tests/test_ssl.py 2013-12-19 02:11:43.434420385 +1100 @@ -376,7 +376,7 @@ def test_sslv23_no_v2(self): if fips_mode: # TLS is required in FIPS mode return - self.args = self.args + ['-no_tls1', '-no_tls1_1'] + self.args = self.args + ['-no_tls1', '-no_tls1_1', '-no_tls1_2'] pid = self.start_server(self.args) try: ctx = SSL.Context('sslv23') debian/patches/series0000664000000000000000000000041512300520010012013 0ustar 0001-Import-inspect-in-urllib-2.patch 0002-Disable-SSLv2_method-when-disabled-in-OpenSSL-iself-.patch 0003-Look-for-OpenSSL-headers-in-usr-include-DEB_HOST_MUL.patch skip_sslv2_tests.patch fix_testsuite_ftbfs.patch fix_testsuite_tls1.2.patch fix_testsuite_sha256.patch debian/patches/0001-Import-inspect-in-urllib-2.patch0000664000000000000000000000136712073031167017174 0ustar From 540886b95efd601082ebe11977fd9601ac042815 Mon Sep 17 00:00:00 2001 From: Dima Barsky Date: Fri, 15 Aug 2008 22:04:14 +0100 Subject: [PATCH] Import inspect in urllib 2 Added "import inspect" to M2Crypto/m2urllib2.py (Closes: #493314, #484364, 477799) --- M2Crypto/m2urllib2.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Index: m2crypto-0.21.1/M2Crypto/m2urllib2.py =================================================================== --- m2crypto-0.21.1.orig/M2Crypto/m2urllib2.py 2013-01-08 09:51:27.913130255 -0500 +++ m2crypto-0.21.1/M2Crypto/m2urllib2.py 2013-01-08 09:51:31.341130343 -0500 @@ -14,6 +14,7 @@ import socket from urllib2 import * import urlparse +import inspect import SSL import httpslib debian/patches/0003-Look-for-OpenSSL-headers-in-usr-include-DEB_HOST_MUL.patch0000664000000000000000000000225512073026275023410 0ustar From b435179d3255fce21458ad9ed67848d45832a76b Mon Sep 17 00:00:00 2001 From: Charles Plessy Date: Sat, 5 Jan 2013 17:56:19 +0900 Subject: [PATCH] Look for OpenSSL headers in /usr/include/$(DEB_HOST_MULTIARCH) as well as /usr/include. Thanks: Colin Watson Closes: #696327 --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py index e7c49eb..7e82224 100644 --- a/setup.py +++ b/setup.py @@ -54,6 +54,10 @@ class _M2CryptoBuildExt(build_ext.build_ext): self.swig_opts = ['-I%s' % i for i in self.include_dirs + \ [opensslIncludeDir]] + if 'DEB_HOST_MULTIARCH' in os.environ: + opensslMultiarchIncludeDir = os.path.join( + opensslIncludeDir, os.environ['DEB_HOST_MULTIARCH']) + self.swig_opts.append('-I%s' % opensslMultiarchIncludeDir) self.swig_opts.append('-includeall') #self.swig_opts.append('-D__i386__') # Uncomment for early OpenSSL 0.9.7 versions, or on Fedora Core if build fails #self.swig_opts.append('-DOPENSSL_NO_EC') # Try uncommenting if you can't build with EC disabled -- 1.7.10.4 debian/patches/fix_testsuite_sha256.patch0000664000000000000000000000161712300521000015613 0ustar Description: Fix test_write_pkcs7_der to cope with SHA-256 defaults OpenSSL now defaults to SHA-256 rather than SHA-1 when writing out PKCS7 as DER, and SHA-256's longer OID increases the size of the output. Author: William Grant Index: m2crypto-0.21.1/tests/test_smime.py =================================================================== --- m2crypto-0.21.1.orig/tests/test_smime.py 2014-02-18 10:49:19.080215460 +1100 +++ m2crypto-0.21.1/tests/test_smime.py 2014-02-18 10:49:34.080406466 +1100 @@ -219,7 +219,7 @@ buf = BIO.MemoryBuffer() assert SMIME.load_pkcs7(self.filename).write_der(buf) == 1 s = buf.read() - assert len(s) in (1204, 1243, 1525, 1635), len(s) + assert len(s) in (1204, 1243, 1525, 1545, 1635), len(s) def test_load_pkcs7(self): assert SMIME.load_pkcs7(self.filename).type() == SMIME.PKCS7_SIGNED debian/patches/fix_testsuite_ftbfs.patch0000664000000000000000000015072412226434270015736 0ustar Description: Fix FTBFS in test suite. Regenerate all the expired test certificates, modify test scripts with new certificate hashes, fingerprints, and lengths. Fix test_sslv23_no_v2() by disabling tls v1.1, and disable test_use_weak_cipher() as weak cipher doesn't work with recent openssl changes. This also needs binary tests/x509.der file (see debian/source/include-binaries) Author: Marc Deslauriers Author: William Grant Index: m2crypto-0.21.1/tests/ca.pem =================================================================== --- m2crypto-0.21.1.orig/tests/ca.pem 2011-01-16 06:10:05.000000000 +1100 +++ m2crypto-0.21.1/tests/ca.pem 2013-10-13 16:56:35.395010823 +1100 @@ -1,62 +1,83 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: - d1:b6:bf:af:06:17:8c:bd - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen + Serial Number: 16780704043987706665 (0xe8e1096b86d92329) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C=US, ST=CA, O=M2Crypto, CN=M2Crypto CA/emailAddress=signer@example.com Validity - Not Before: Jul 28 04:30:50 2009 GMT - Not After : Jul 27 04:30:50 2012 GMT - Subject: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen + Not Before: Oct 13 05:54:50 2013 GMT + Not After : Oct 11 05:54:50 2023 GMT + Subject: C=US, ST=CA, O=M2Crypto, CN=M2Crypto CA/emailAddress=signer@example.com Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:c8:9b:59:18:c2:bf:21:68:dc:d4:62:30:1f:43: - 29:52:85:8d:36:fc:20:7f:11:1b:c6:f3:e6:c2:7a: - d0:17:0e:6e:78:43:21:e9:e2:df:9f:31:87:e8:7a: - 37:88:1f:a4:56:a1:e9:cb:13:7b:1b:c0:28:cf:5a: - db:a3:e7:50:6c:c6:55:76:e3:61:e8:73:4b:c2:8c: - ee:1c:29:c1:ee:2d:fd:e2:30:34:69:06:ea:d0:af: - bd:c5:db:86:70:92:26:0a:33:1b:70:a9:e7:6e:a4: - 2e:ee:4a:8a:f3:b2:6c:c9:97:28:39:28:28:3f:c5: - 90:4d:4e:83:0a:0e:cd:98:93 + Public-Key: (2048 bit) + Modulus: + 00:c1:ad:14:b7:ae:3d:1e:79:19:4b:c6:3c:4f:fd: + c6:7b:56:af:f5:24:e1:61:82:22:7f:5a:fe:1d:df: + ef:8c:8c:17:53:64:c9:0f:9b:e6:ae:b3:e3:bc:f5: + d8:10:75:98:f4:75:7e:d7:14:c3:e1:68:8f:d1:5d: + 83:31:d0:30:b3:48:27:7c:32:da:fb:24:25:e0:0e: + e1:77:77:47:bb:a8:8e:51:d3:0c:91:4a:e9:e7:7f: + 4a:28:b3:22:18:3d:94:67:06:4f:9d:09:4f:9c:4f: + db:2c:16:5b:d0:0c:86:2f:92:99:c1:b2:d3:b4:43: + db:39:1b:1a:86:22:b8:ad:f1:1d:a4:4c:c2:d7:f3: + 7e:1e:61:e7:1f:83:ec:02:d0:df:9d:a7:f5:ef:80: + 65:6d:ec:68:63:a3:d5:b5:5c:37:93:eb:df:92:e8: + e2:b9:d1:dd:bb:d9:9e:0a:6d:d3:fb:8d:41:c1:d9: + fd:b6:fa:fa:55:b8:4c:5c:df:a2:d4:99:ea:1e:c8: + 75:c2:47:67:b9:d9:0a:59:09:79:33:74:38:c2:16: + b6:fd:c2:9f:cf:c8:03:a3:98:83:37:cf:30:32:d4: + 38:a7:1d:09:2b:1f:0e:32:2a:bb:f1:84:6b:ed:6c: + 9f:86:b6:54:97:b7:2d:8f:99:59:8b:3f:76:79:93: + 8b:4f Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Subject Key Identifier: - AD:64:45:74:8F:83:C7:2C:D5:D7:A0:85:91:10:40:9A:9C:96:CF:EE + 6C:CC:12:F3:A1:C3:CB:12:16:E0:7E:0F:DB:ED:F5:43:D3:6E:97:97 X509v3 Authority Key Identifier: - keyid:AD:64:45:74:8F:83:C7:2C:D5:D7:A0:85:91:10:40:9A:9C:96:CF:EE - DirName:/C=US/ST=California/O=M2Crypto/CN=Heikki Toivonen - serial:D1:B6:BF:AF:06:17:8C:BD + keyid:6C:CC:12:F3:A1:C3:CB:12:16:E0:7E:0F:DB:ED:F5:43:D3:6E:97:97 + DirName:/C=US/ST=CA/O=M2Crypto/CN=M2Crypto CA/emailAddress=signer@example.com + serial:E8:E1:09:6B:86:D9:23:29 X509v3 Basic Constraints: CA:TRUE Signature Algorithm: sha1WithRSAEncryption - c8:11:af:7d:6d:fb:1c:82:0d:c0:e7:41:f4:b2:a5:b0:69:6d: - 18:e3:04:aa:49:e6:4a:69:6d:c3:e3:8b:ab:d1:18:ac:72:ef: - 48:9e:49:c7:57:75:2d:00:1e:08:9f:c3:dc:ca:5f:91:38:0d: - ac:f8:1f:cc:fc:f7:c2:5b:ce:d7:0c:cf:b2:fe:c9:a9:ce:b8: - 07:45:17:1c:cf:b3:07:f9:1f:69:6a:94:03:be:62:62:9c:af: - a2:24:25:2d:1f:63:0a:91:6b:bb:e3:6c:ec:20:de:80:d3:04: - b4:5e:42:1f:27:bc:1f:79:98:18:ba:fb:8a:34:24:a9:40:1e: - b9:7b + 3e:15:66:a9:05:4d:40:20:b1:fe:ac:7a:c8:09:01:21:79:9b: + 3d:2a:9d:53:fd:04:34:39:80:c6:c1:61:4c:43:42:d5:de:fa: + 58:62:ec:31:51:1d:fe:eb:64:26:ea:8d:30:8f:46:a6:a3:62: + db:a8:f6:26:8b:1f:2c:62:43:22:f9:5c:99:be:ad:6b:50:25: + 93:38:24:b7:3b:25:4a:3c:de:ea:fd:11:a9:cf:b7:c5:35:79: + 3d:87:b9:43:ad:32:5a:3a:f8:e3:45:9e:4f:23:74:ba:03:ba: + d9:71:ee:61:a6:6c:7c:9e:c9:59:52:62:2c:cb:fa:eb:c5:f7: + bf:6e:39:88:69:0c:47:2e:53:3f:e3:f8:8d:c7:73:14:88:b9: + 79:ef:78:e8:ff:14:3a:d4:6f:42:d8:76:1c:81:03:56:06:5a: + 23:4b:a7:47:9c:5e:d5:c2:69:53:6d:83:2e:ea:39:5c:f9:02: + 3f:b1:44:4c:36:1f:c8:c1:d0:14:cd:5a:97:15:ae:75:1e:3e: + 00:41:4f:79:cd:08:34:87:76:f0:1f:71:78:d4:cf:f9:e2:bd: + ac:97:2b:de:bb:73:1b:8c:0c:56:ca:ca:e2:b0:81:e3:80:f0: + 34:14:f9:f9:c3:6d:0e:ca:20:0c:54:c1:87:61:f2:9c:0d:dd: + 4c:ab:bc:6c -----BEGIN CERTIFICATE----- -MIICzjCCAjegAwIBAgIJANG2v68GF4y9MA0GCSqGSIb3DQEBBQUAME8xCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhNMkNyeXB0bzEY -MBYGA1UEAxMPSGVpa2tpIFRvaXZvbmVuMB4XDTA5MDcyODA0MzA1MFoXDTEyMDcy -NzA0MzA1MFowTzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAP -BgNVBAoTCE0yQ3J5cHRvMRgwFgYDVQQDEw9IZWlra2kgVG9pdm9uZW4wgZ8wDQYJ -KoZIhvcNAQEBBQADgY0AMIGJAoGBAMibWRjCvyFo3NRiMB9DKVKFjTb8IH8RG8bz -5sJ60BcObnhDIeni358xh+h6N4gfpFah6csTexvAKM9a26PnUGzGVXbjYehzS8KM -7hwpwe4t/eIwNGkG6tCvvcXbhnCSJgozG3Cp526kLu5KivOybMmXKDkoKD/FkE1O -gwoOzZiTAgMBAAGjgbEwga4wHQYDVR0OBBYEFK1kRXSPg8cs1deghZEQQJqcls/u -MH8GA1UdIwR4MHaAFK1kRXSPg8cs1deghZEQQJqcls/uoVOkUTBPMQswCQYDVQQG -EwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEChMITTJDcnlwdG8xGDAW -BgNVBAMTD0hlaWtraSBUb2l2b25lboIJANG2v68GF4y9MAwGA1UdEwQFMAMBAf8w -DQYJKoZIhvcNAQEFBQADgYEAyBGvfW37HIINwOdB9LKlsGltGOMEqknmSmltw+OL -q9EYrHLvSJ5Jx1d1LQAeCJ/D3MpfkTgNrPgfzPz3wlvO1wzPsv7Jqc64B0UXHM+z -B/kfaWqUA75iYpyvoiQlLR9jCpFru+Ns7CDegNMEtF5CHye8H3mYGLr7ijQkqUAe -uXs= +MIIEGzCCAwOgAwIBAgIJAOjhCWuG2SMpMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNV +BAYTAlVTMQswCQYDVQQIEwJDQTERMA8GA1UEChMITTJDcnlwdG8xFDASBgNVBAMT +C00yQ3J5cHRvIENBMSEwHwYJKoZIhvcNAQkBFhJzaWduZXJAZXhhbXBsZS5jb20w +HhcNMTMxMDEzMDU1NDUwWhcNMjMxMDExMDU1NDUwWjBmMQswCQYDVQQGEwJVUzEL +MAkGA1UECBMCQ0ExETAPBgNVBAoTCE0yQ3J5cHRvMRQwEgYDVQQDEwtNMkNyeXB0 +byBDQTEhMB8GCSqGSIb3DQEJARYSc2lnbmVyQGV4YW1wbGUuY29tMIIBIjANBgkq +hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwa0Ut649HnkZS8Y8T/3Ge1av9SThYYIi +f1r+Hd/vjIwXU2TJD5vmrrPjvPXYEHWY9HV+1xTD4WiP0V2DMdAws0gnfDLa+yQl +4A7hd3dHu6iOUdMMkUrp539KKLMiGD2UZwZPnQlPnE/bLBZb0AyGL5KZwbLTtEPb +ORsahiK4rfEdpEzC1/N+HmHnH4PsAtDfnaf174BlbexoY6PVtVw3k+vfkujiudHd +u9meCm3T+41Bwdn9tvr6VbhMXN+i1JnqHsh1wkdnudkKWQl5M3Q4wha2/cKfz8gD +o5iDN88wMtQ4px0JKx8OMiq78YRr7WyfhrZUl7ctj5lZiz92eZOLTwIDAQABo4HL +MIHIMB0GA1UdDgQWBBRszBLzocPLEhbgfg/b7fVD026XlzCBmAYDVR0jBIGQMIGN +gBRszBLzocPLEhbgfg/b7fVD026Xl6FqpGgwZjELMAkGA1UEBhMCVVMxCzAJBgNV +BAgTAkNBMREwDwYDVQQKEwhNMkNyeXB0bzEUMBIGA1UEAxMLTTJDcnlwdG8gQ0Ex +ITAfBgkqhkiG9w0BCQEWEnNpZ25lckBleGFtcGxlLmNvbYIJAOjhCWuG2SMpMAwG +A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAD4VZqkFTUAgsf6sesgJASF5 +mz0qnVP9BDQ5gMbBYUxDQtXe+lhi7DFRHf7rZCbqjTCPRqajYtuo9iaLHyxiQyL5 +XJm+rWtQJZM4JLc7JUo83ur9EanPt8U1eT2HuUOtMlo6+ONFnk8jdLoDutlx7mGm +bHyeyVlSYizL+uvF979uOYhpDEcuUz/j+I3HcxSIuXnveOj/FDrUb0LYdhyBA1YG +WiNLp0ecXtXCaVNtgy7qOVz5Aj+xREw2H8jB0BTNWpcVrnUePgBBT3nNCDSHdvAf +cXjUz/nivayXK967cxuMDFbKyuKwgeOA8DQU+fnDbQ7KIAxUwYdh8pwN3UyrvGw= -----END CERTIFICATE----- Index: m2crypto-0.21.1/tests/recipient_key.pem =================================================================== --- m2crypto-0.21.1.orig/tests/recipient_key.pem 2011-01-16 06:10:05.000000000 +1100 +++ m2crypto-0.21.1/tests/recipient_key.pem 2013-10-13 16:53:51.262862304 +1100 @@ -1,15 +1,28 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQDCIaNPZFmcITkh0jznCmByyDmzwydKbVaPoF0bxuQ+JmEJqa4E -g2k/nSsSftT3jtBuqYyb0b8XDL3Qc5kCbn7LeoAtz7EpwDA2P2gSPk6/+Ys9HVav -JJSu1Vm0AFAMwCtZw5mzihnxhhS97unE8ddqDOlnipSaLS1gJSLGcmjCDQIDAQAB -AoGAZlrJ+kAUpyc1Mkng5ogoFhzPn6ITg0Bm1U9eCBkzmjkuDKQ0JhkLUwkQ/q10 -qBnad55ZjoZmVEbZhaCNWiTcIIy0nKAMWNKRcg3vTgrnbmbjco1HECDStfJKogZl -7egoIImHnU1f/IeKQDUYUfs/INonmnnZ1d2jrU7QsdTz84ECQQDzhT0UwP8S1oma -0IBgeUOt5ptZs7nFdZnbIKCd+ADra6NiQznokCHe5K0WZHqPKvN9asKx1u0h+97H -Wmk6Fw7RAkEAzBR1+mTRSrlJT8/NTCsIDPtCK/+OhmGbNy1pfsOWq1lN58Za5HV7 -fmtaH2No+MP+DlfNigsg557GzAYl2ZumfQJAHQj33W+dehuGUKUniVksDqH+R9W8 -AqUg8RWU0QDu6yLsWhz13JrCzxao5JCaZFOUsJF4IUglAfZL+6z1+u0g4QJAH5aL -LFaujoJfdpsTi9adSGUbuPO1e9dfzwqYaaaci6knBdkN+I62rrqvGGyqstajXFT6 -24MddLx+yNWqxiPxgQJBAKF8YiR4eLqLSnq4ftqCqVCC1XbA2H9b7G5RBWi00WFq -3Nx+B/wjLzbqsMamTCIDUCEW+MzFx6otCxduDZRMKH8= ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDUm/S73YlJ1gtP +2IFysZYaG4Ockl66jiCrpM/ETeSsTNQJGBmD4Se9eDNvRc7Qknq9GvVO8ETRe8yn +/Lqd2rqA/BAttnWkSNmWXJDJDsUP3CuzXEeeHG0Gn521/g2T41mVjZH2CjYCnHKD +Wucj1CdB0Zv0I3eEvSm8pZ92B+9DjwId5CO6cgcsVXpsWGVFpS9EL8yn/n98NY1k +yf4/Y4wSQONB1X9cuxKDTNNZzrUslQfEncazz0UarVJs1I8LPkRoA2xOznZGBGV7 +8pwYm8GP+lOiEV9GO6QBNGgezpjqjdANO6kJw6ZPpuX+MTWpMkfvBRv+zNQAgdGk +iGs4yiQFAgMBAAECggEBAJZLCN4k5QAFB0oSSq/BSdJ60LbF4aEPB5lOkHC8f4It +bVZgaukHKQiPCA0I1AItCgbUH8UFpCBR24KE7YbZMC4uAWHPMapItUfNd6wpfLSR +d3L7MMVcYtXjz6DvTrnUZWeLBDthTHzcCzc/81Uoi/fDLPOQftSew/pPOkI9qa2f +B6xnS842rk0ZKGafV8S8moHa7NI6jWelJumYii3rq8NoglKinkECaGysqEdVAjnU +VKFuswIyY/Jywht4syieU6v+hJXYddUPhQePJPhkdJ5D9RPiVvUfNR0AdMwLGGT5 +wS7CJIC3VSwwAOHfPYdBn8qO2Lc9q7O6KXS7/btXMqECgYEA+xj9MqVZreHP5IT5 +5Qrx956zcX1F6f3gbGGjgkCCxgb4l6SUqALvUIx+m3DPRQjDZUX16Cl7O41oX9+I +VTlofNb6vyQ0tqu2g7XkynWVLHDmzT03hWxoPPkrZtKOsF2bjhvUjcsQC9DYCFYW +g1hmnnflYvUF11SbuUmKSer3yXcCgYEA2MKZF8bhSWZrS+c86a77uGJk+mod3Paa +t87ExF7GG5a6+smQrFyqawPRgas2SixFMvlayvOv0gBvOlpmiUu0SqBF5jaCKoIB +WVAtIuQW/+jJl9s9QXlVRNYjsiSvdg4mbnTEJKUmr0wTF7vR2PXeDqGGh3L0Gwic +mGI2ZDExXWMCgYEAnb7xMmQWltqKFHJF29KoeHvHF8EvrvTDjNM6OZX1khrHCd1n +VrWhSuU4lMamMCR1PKZa+mM0/BC2RaTUrVXHgsY7+ODyDOCLZOtctKRx9t1m4gFX +ZAba5ZNT5ODaq4njM7/gJMQxbHrjfTk4I4Ph1CRWg3iTFtgcjKbard1jlbkCgYBJ +XaQ/nfsGwvmyGTROzAE7KWKQN3agIX/AkuWaqZFYKS5kT/D9xeeQjRxOTUr01AMf ++7I1W0G5TJhZIdvuwIbnc1P1VaG9DX+zYSXF13nJaFtDYNtc29p2kBxI4Y3Z4XQ0 +kqUI2jU7w/36XIHsc1uTjCxikA/7TnDiSuuqAdR5jQKBgQCOH6YhOdkDimPDeDQz +2XQl2M5LjP1gxvlNKIAa4folC6WArMKLn3BoC6OJt9d0ufqDhQq7HAZX3mw1tVK9 +sAs7d65VSMAl5OkpwglUA8ydAuM3ORG4/NFRbMxHw90yhqIzlku9F2xwV6Qfl4Vm +TPuYv3Uj2jy7SqtWnqmx64XMdw== +-----END PRIVATE KEY----- Index: m2crypto-0.21.1/tests/recipient.pem =================================================================== --- m2crypto-0.21.1.orig/tests/recipient.pem 2011-01-16 06:10:05.000000000 +1100 +++ m2crypto-0.21.1/tests/recipient.pem 2013-10-13 16:53:51.262862304 +1100 @@ -1,61 +1,89 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: - d1:b6:bf:af:06:17:8c:c1 - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen + Serial Number: 6 (0x6) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C=US, ST=CA, O=M2Crypto, CN=M2Crypto CA Validity - Not Before: Jul 28 04:39:19 2009 GMT - Not After : Jul 26 04:39:19 2019 GMT - Subject: C=US, ST=California, O=M2Crypto, CN=Recipient/emailAddress=recipient@example.com + Not Before: Oct 13 05:37:22 2013 GMT + Not After : Oct 11 05:37:22 2023 GMT + Subject: C=US, ST=CA, O=M2Crypto, CN=Recipient/emailAddress=recipient@example.com Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:c2:21:a3:4f:64:59:9c:21:39:21:d2:3c:e7:0a: - 60:72:c8:39:b3:c3:27:4a:6d:56:8f:a0:5d:1b:c6: - e4:3e:26:61:09:a9:ae:04:83:69:3f:9d:2b:12:7e: - d4:f7:8e:d0:6e:a9:8c:9b:d1:bf:17:0c:bd:d0:73: - 99:02:6e:7e:cb:7a:80:2d:cf:b1:29:c0:30:36:3f: - 68:12:3e:4e:bf:f9:8b:3d:1d:56:af:24:94:ae:d5: - 59:b4:00:50:0c:c0:2b:59:c3:99:b3:8a:19:f1:86: - 14:bd:ee:e9:c4:f1:d7:6a:0c:e9:67:8a:94:9a:2d: - 2d:60:25:22:c6:72:68:c2:0d + Public-Key: (2048 bit) + Modulus: + 00:d4:9b:f4:bb:dd:89:49:d6:0b:4f:d8:81:72:b1: + 96:1a:1b:83:9c:92:5e:ba:8e:20:ab:a4:cf:c4:4d: + e4:ac:4c:d4:09:18:19:83:e1:27:bd:78:33:6f:45: + ce:d0:92:7a:bd:1a:f5:4e:f0:44:d1:7b:cc:a7:fc: + ba:9d:da:ba:80:fc:10:2d:b6:75:a4:48:d9:96:5c: + 90:c9:0e:c5:0f:dc:2b:b3:5c:47:9e:1c:6d:06:9f: + 9d:b5:fe:0d:93:e3:59:95:8d:91:f6:0a:36:02:9c: + 72:83:5a:e7:23:d4:27:41:d1:9b:f4:23:77:84:bd: + 29:bc:a5:9f:76:07:ef:43:8f:02:1d:e4:23:ba:72: + 07:2c:55:7a:6c:58:65:45:a5:2f:44:2f:cc:a7:fe: + 7f:7c:35:8d:64:c9:fe:3f:63:8c:12:40:e3:41:d5: + 7f:5c:bb:12:83:4c:d3:59:ce:b5:2c:95:07:c4:9d: + c6:b3:cf:45:1a:ad:52:6c:d4:8f:0b:3e:44:68:03: + 6c:4e:ce:76:46:04:65:7b:f2:9c:18:9b:c1:8f:fa: + 53:a2:11:5f:46:3b:a4:01:34:68:1e:ce:98:ea:8d: + d0:0d:3b:a9:09:c3:a6:4f:a6:e5:fe:31:35:a9:32: + 47:ef:05:1b:fe:cc:d4:00:81:d1:a4:88:6b:38:ca: + 24:05 Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: CA:FALSE Netscape Comment: - OpenSSL Generated Certificate + Easy-RSA Generated Certificate X509v3 Subject Key Identifier: - 11:CB:60:AC:55:85:52:84:C5:C8:20:5A:50:13:D0:89:C7:7A:B7:81 + 17:82:18:31:12:68:3A:0D:65:13:16:68:9B:45:63:00:3A:B4:CB:7C X509v3 Authority Key Identifier: - keyid:AD:64:45:74:8F:83:C7:2C:D5:D7:A0:85:91:10:40:9A:9C:96:CF:EE + keyid:C5:89:9E:0F:C9:74:DB:4D:D1:B7:8D:0C:26:66:1E:1A:9E:4D:68:82 + DirName:/C=US/ST=CA/O=M2Crypto/CN=M2Crypto CA + serial:B1:86:AB:ED:61:94:D0:25 + X509v3 Extended Key Usage: + TLS Web Client Authentication + X509v3 Key Usage: + Digital Signature Signature Algorithm: sha1WithRSAEncryption - 87:56:17:6d:ba:3b:a6:c4:22:af:20:f1:a0:e5:9d:27:c4:50: - bd:79:eb:d2:84:e5:9a:00:5f:5d:5a:c3:34:58:77:f5:a9:00: - f9:76:e9:2d:89:b4:3f:9d:e3:cf:15:0c:64:1b:0a:03:db:e4: - 6f:2b:ff:1c:82:89:1a:0f:7e:83:58:0f:e6:da:af:26:97:49: - 4a:59:d7:61:3f:4b:ed:1d:5b:51:00:3b:83:96:c7:1e:3d:84: - f4:91:1f:70:69:12:b9:a7:2c:5b:1b:05:cd:74:90:2b:a0:ba: - e7:70:cd:6b:7d:ac:be:d7:92:50:e9:f5:c0:42:29:04:ef:8f: - a1:68 + 0f:fc:d1:7f:d8:9a:b3:3e:79:9a:55:ab:35:64:6f:2e:d1:01: + bc:b9:04:5f:62:32:7c:2a:ee:83:e6:0f:2c:d4:9c:95:c8:bf: + 64:db:a1:e2:9b:b1:e3:7a:21:38:62:07:05:29:96:2c:a8:4c: + 8f:8a:11:a5:1c:53:35:bd:02:e9:0c:c4:20:14:de:f0:a8:7a: + 76:70:a2:db:e8:d6:c5:d9:35:54:dd:b9:93:bf:db:51:86:14: + de:aa:36:a2:08:21:e6:19:9e:20:10:69:c0:8e:ad:3f:b3:4b: + a3:2d:5a:a2:2b:2b:a2:8c:ad:db:37:77:73:a7:8c:77:0b:ed: + 65:9d:a9:e2:fc:69:59:88:96:ce:3e:7c:bd:0a:1a:a3:db:0c: + ce:c4:60:d7:d7:3b:84:4f:13:0a:5b:19:73:c5:fd:31:5d:ba: + bc:e0:67:11:7f:bc:87:8c:db:e5:9f:60:33:56:43:71:5d:8d: + 45:74:0f:62:46:7c:9c:d4:ad:ef:d9:75:6e:27:24:11:2f:8f: + 59:2a:90:54:f7:84:a3:1c:06:35:d5:8d:b5:33:49:0d:6c:27: + f6:0b:2b:1a:b8:a3:1d:b0:5a:c5:68:1a:9c:46:e8:4f:49:64: + e9:30:7a:b2:47:2f:36:52:ad:ab:be:b7:5a:d8:c6:ce:64:4f: + e9:e2:7d:99 -----BEGIN CERTIFICATE----- -MIICtzCCAiCgAwIBAgIJANG2v68GF4zBMA0GCSqGSIb3DQEBBQUAME8xCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhNMkNyeXB0bzEY -MBYGA1UEAxMPSGVpa2tpIFRvaXZvbmVuMB4XDTA5MDcyODA0MzkxOVoXDTE5MDcy -NjA0MzkxOVowbzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAP -BgNVBAoTCE0yQ3J5cHRvMRIwEAYDVQQDEwlSZWNpcGllbnQxJDAiBgkqhkiG9w0B -CQEWFXJlY2lwaWVudEBleGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw -gYkCgYEAwiGjT2RZnCE5IdI85wpgcsg5s8MnSm1Wj6BdG8bkPiZhCamuBINpP50r -En7U947QbqmMm9G/Fwy90HOZAm5+y3qALc+xKcAwNj9oEj5Ov/mLPR1WrySUrtVZ -tABQDMArWcOZs4oZ8YYUve7pxPHXagzpZ4qUmi0tYCUixnJowg0CAwEAAaN7MHkw -CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy -dGlmaWNhdGUwHQYDVR0OBBYEFBHLYKxVhVKExcggWlAT0InHereBMB8GA1UdIwQY -MBaAFK1kRXSPg8cs1deghZEQQJqcls/uMA0GCSqGSIb3DQEBBQUAA4GBAIdWF226 -O6bEIq8g8aDlnSfEUL1569KE5ZoAX11awzRYd/WpAPl26S2JtD+d488VDGQbCgPb -5G8r/xyCiRoPfoNYD+baryaXSUpZ12E/S+0dW1EAO4OWxx49hPSRH3BpErmnLFsb -Bc10kCuguudwzWt9rL7XklDp9cBCKQTvj6Fo +MIIEGTCCAwGgAwIBAgIBBjANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJVUzEL +MAkGA1UECBMCQ0ExETAPBgNVBAoTCE0yQ3J5cHRvMRQwEgYDVQQDEwtNMkNyeXB0 +byBDQTAeFw0xMzEwMTMwNTM3MjJaFw0yMzEwMTEwNTM3MjJaMGcxCzAJBgNVBAYT +AlVTMQswCQYDVQQIEwJDQTERMA8GA1UEChMITTJDcnlwdG8xEjAQBgNVBAMTCVJl +Y2lwaWVudDEkMCIGCSqGSIb3DQEJARYVcmVjaXBpZW50QGV4YW1wbGUuY29tMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Jv0u92JSdYLT9iBcrGWGhuD +nJJeuo4gq6TPxE3krEzUCRgZg+EnvXgzb0XO0JJ6vRr1TvBE0XvMp/y6ndq6gPwQ +LbZ1pEjZllyQyQ7FD9wrs1xHnhxtBp+dtf4Nk+NZlY2R9go2Apxyg1rnI9QnQdGb +9CN3hL0pvKWfdgfvQ48CHeQjunIHLFV6bFhlRaUvRC/Mp/5/fDWNZMn+P2OMEkDj +QdV/XLsSg0zTWc61LJUHxJ3Gs89FGq1SbNSPCz5EaANsTs52RgRle/KcGJvBj/pT +ohFfRjukATRoHs6Y6o3QDTupCcOmT6bl/jE1qTJH7wUb/szUAIHRpIhrOMokBQID +AQABo4HzMIHwMAkGA1UdEwQCMAAwLQYJYIZIAYb4QgENBCAWHkVhc3ktUlNBIEdl +bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUF4IYMRJoOg1lExZom0VjADq0 +y3wwcwYDVR0jBGwwaoAUxYmeD8l0203Rt40MJmYeGp5NaIKhR6RFMEMxCzAJBgNV +BAYTAlVTMQswCQYDVQQIEwJDQTERMA8GA1UEChMITTJDcnlwdG8xFDASBgNVBAMT +C00yQ3J5cHRvIENBggkAsYar7WGU0CUwEwYDVR0lBAwwCgYIKwYBBQUHAwIwCwYD +VR0PBAQDAgeAMA0GCSqGSIb3DQEBBQUAA4IBAQAP/NF/2JqzPnmaVas1ZG8u0QG8 +uQRfYjJ8Ku6D5g8s1JyVyL9k26Him7HjeiE4YgcFKZYsqEyPihGlHFM1vQLpDMQg +FN7wqHp2cKLb6NbF2TVU3bmTv9tRhhTeqjaiCCHmGZ4gEGnAjq0/s0ujLVqiKyui +jK3bN3dzp4x3C+1lnani/GlZiJbOPny9Chqj2wzOxGDX1zuETxMKWxlzxf0xXbq8 +4GcRf7yHjNvln2AzVkNxXY1FdA9iRnyc1K3v2XVuJyQRL49ZKpBU94SjHAY11Y21 +M0kNbCf2CysauKMdsFrFaBqcRuhPSWTpMHqyRy82Uq2rvrda2MbOZE/p4n2Z -----END CERTIFICATE----- Index: m2crypto-0.21.1/tests/server.pem =================================================================== --- m2crypto-0.21.1.orig/tests/server.pem 2011-01-16 06:10:05.000000000 +1100 +++ m2crypto-0.21.1/tests/server.pem 2013-10-13 16:56:35.395010823 +1100 @@ -1,75 +1,121 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: - d1:b6:bf:af:06:17:8c:be - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen + Serial Number: 4 (0x4) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C=US, ST=CA, O=M2Crypto, CN=M2Crypto CA/emailAddress=signer@example.com Validity - Not Before: Jul 28 04:31:41 2009 GMT - Not After : Jul 26 04:31:41 2019 GMT - Subject: C=US, ST=California, O=M2Crypto, CN=localhost + Not Before: Oct 13 05:55:43 2013 GMT + Not After : Oct 11 05:55:43 2023 GMT + Subject: C=US, ST=CA, O=M2Crypto, CN=localhost Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:d4:99:6f:33:3f:e6:ac:0a:34:d8:0e:45:97:f3: - 2b:6a:50:2a:84:30:0a:52:9c:15:30:9f:05:29:3a: - 21:f4:c1:c3:01:9e:2f:55:56:4e:35:ac:f1:16:1e: - 26:8d:b5:26:b7:99:78:92:ea:1c:74:46:ab:41:12: - ef:cc:53:62:cc:59:5c:9e:c4:86:df:d9:25:35:55: - 05:4b:16:ff:d9:90:e3:f4:51:b4:b4:fa:c5:98:4b: - 60:f0:60:7f:14:4e:1e:dd:61:9b:22:a2:9c:21:17: - 43:a3:cb:07:80:f5:75:59:9c:55:1c:fe:e0:66:d4: - 70:77:5e:13:06:0c:05:c7:1f + Public-Key: (2048 bit) + Modulus: + 00:d4:70:c1:7a:ff:9f:56:a2:cf:cb:0a:46:52:9e: + e9:76:20:71:e8:df:46:bd:08:af:41:4f:d8:49:c8: + 40:de:a5:6f:b0:4a:92:0f:8b:ec:0c:d4:d7:db:b9: + 1a:67:40:de:12:98:63:5b:af:30:f4:f8:a9:f3:49: + cc:23:5f:96:b5:01:03:74:22:ca:f1:14:ad:bd:ad: + 40:ca:ac:e8:36:92:eb:73:57:0a:57:df:ac:7e:b7: + 67:73:92:68:5a:f2:a1:df:c7:0a:ca:e5:80:f9:43: + ec:61:20:66:5d:4b:67:11:63:13:b6:2a:2f:22:06: + 48:8d:f0:f4:2d:b8:76:7a:44:62:c9:fd:a5:e4:6c: + b9:fc:55:12:a2:7e:8d:35:96:1b:4b:f6:59:b4:c4: + fb:25:d9:c3:f6:9d:bf:12:db:54:06:f2:22:e2:1a: + 46:85:c7:91:33:82:b6:d7:14:e5:5a:c1:d2:72:b4: + 41:13:45:cf:c5:de:e0:b6:36:c5:46:5b:61:f6:c0: + 49:8b:17:a7:55:74:5c:8d:51:ad:ad:8d:14:98:e5: + f2:59:59:ad:e6:27:1a:27:72:c1:9a:b1:70:6f:9b: + 87:7e:87:a0:d1:1a:1c:e0:bd:5b:77:0b:76:ab:0b: + a0:6e:9c:37:e4:0d:26:58:5e:cb:fc:95:7a:eb:a7: + 06:5b Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: CA:FALSE + Netscape Cert Type: + SSL Server Netscape Comment: - OpenSSL Generated Certificate + Easy-RSA Generated Server Certificate X509v3 Subject Key Identifier: - 04:05:3D:6A:A7:E8:D7:52:BD:2F:C4:52:30:7C:2C:BD:D3:81:46:C6 + E6:37:CA:B1:D8:68:5C:E5:B2:17:96:AF:DE:49:1C:41:60:B0:C4:A9 X509v3 Authority Key Identifier: - keyid:AD:64:45:74:8F:83:C7:2C:D5:D7:A0:85:91:10:40:9A:9C:96:CF:EE + keyid:6C:CC:12:F3:A1:C3:CB:12:16:E0:7E:0F:DB:ED:F5:43:D3:6E:97:97 + DirName:/C=US/ST=CA/O=M2Crypto/CN=M2Crypto CA/emailAddress=signer@example.com + serial:E8:E1:09:6B:86:D9:23:29 + X509v3 Extended Key Usage: + TLS Web Server Authentication + X509v3 Key Usage: + Digital Signature, Key Encipherment Signature Algorithm: sha1WithRSAEncryption - ac:2b:ad:86:36:96:5c:fb:34:2c:02:ca:d9:5f:a7:8e:b6:58: - 24:1d:27:b6:8e:81:aa:69:0e:60:26:64:2e:72:a1:ff:d8:ba: - bb:7e:5d:46:c7:07:2d:a8:c8:4c:df:1e:ba:c8:bc:21:5b:f2: - b3:01:4c:d6:3b:10:fd:49:70:e6:83:01:f3:24:e2:a9:97:d7: - c3:9c:5b:2d:d7:64:2b:e5:e2:0e:3e:d9:8c:e6:93:86:39:32: - 50:43:5f:36:4a:3b:b0:05:e7:65:a3:b3:ef:50:56:7f:7e:dc: - f0:65:83:ac:42:7e:97:a0:c0:7e:63:c6:c8:c6:35:d3:60:d1: - 4f:51 + 96:08:cc:2f:11:84:ac:d8:1d:eb:ca:20:0c:e7:4c:42:e6:5f: + 15:7e:ed:5c:6a:1f:db:71:6c:86:61:4d:bb:47:3b:70:54:99: + b2:0a:bc:bf:c3:3e:8b:ef:3b:67:59:33:81:95:a6:79:60:f2: + b0:5e:6d:3b:b8:84:48:05:70:47:89:91:88:30:1a:b6:fc:05: + 67:c2:9d:d4:a9:1e:0b:d6:28:ce:68:aa:bf:40:6c:97:2c:6f: + c5:26:16:8b:cd:e9:22:c5:56:c8:2c:5a:a9:c1:20:5e:91:1d: + 6f:8e:0d:6e:09:1e:2e:8e:45:b8:2b:1d:7e:98:55:cb:2b:5d: + 3c:c8:f1:d8:10:0b:e5:30:5a:5c:7a:0e:85:cd:c6:30:d1:01: + 38:ac:53:9c:3e:52:46:ef:0a:83:0f:b6:5e:b2:71:6e:ab:2a: + 8e:73:e0:73:c7:2e:68:e1:8e:63:20:92:6a:cf:c2:8e:85:e7: + 64:53:ff:b7:5b:33:e9:22:4a:92:a3:49:7c:50:4b:5a:54:9d: + bd:5b:78:a2:3b:97:f3:a3:38:07:3a:19:1b:17:37:9d:b0:2d: + 8b:10:ed:d4:41:0d:c1:fc:8f:79:e7:53:62:02:18:f7:52:5a: + 6a:8e:5f:c0:e7:88:e8:37:96:72:55:35:3e:51:8b:95:f9:f7: + 65:f3:bd:92 -----BEGIN CERTIFICATE----- -MIICkTCCAfqgAwIBAgIJANG2v68GF4y+MA0GCSqGSIb3DQEBBQUAME8xCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhNMkNyeXB0bzEY -MBYGA1UEAxMPSGVpa2tpIFRvaXZvbmVuMB4XDTA5MDcyODA0MzE0MVoXDTE5MDcy -NjA0MzE0MVowSTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAP -BgNVBAoTCE0yQ3J5cHRvMRIwEAYDVQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcN -AQEBBQADgY0AMIGJAoGBANSZbzM/5qwKNNgORZfzK2pQKoQwClKcFTCfBSk6IfTB -wwGeL1VWTjWs8RYeJo21JreZeJLqHHRGq0ES78xTYsxZXJ7Eht/ZJTVVBUsW/9mQ -4/RRtLT6xZhLYPBgfxROHt1hmyKinCEXQ6PLB4D1dVmcVRz+4GbUcHdeEwYMBccf -AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2Vu -ZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQEBT1qp+jXUr0vxFIwfCy904FG -xjAfBgNVHSMEGDAWgBStZEV0j4PHLNXXoIWREECanJbP7jANBgkqhkiG9w0BAQUF -AAOBgQCsK62GNpZc+zQsAsrZX6eOtlgkHSe2joGqaQ5gJmQucqH/2Lq7fl1Gxwct -qMhM3x66yLwhW/KzAUzWOxD9SXDmgwHzJOKpl9fDnFst12Qr5eIOPtmM5pOGOTJQ -Q182SjuwBedlo7PvUFZ/ftzwZYOsQn6XoMB+Y8bIxjXTYNFPUQ== +MIIEWDCCA0CgAwIBAgIBBDANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJVUzEL +MAkGA1UECBMCQ0ExETAPBgNVBAoTCE0yQ3J5cHRvMRQwEgYDVQQDEwtNMkNyeXB0 +byBDQTEhMB8GCSqGSIb3DQEJARYSc2lnbmVyQGV4YW1wbGUuY29tMB4XDTEzMTAx +MzA1NTU0M1oXDTIzMTAxMTA1NTU0M1owQTELMAkGA1UEBhMCVVMxCzAJBgNVBAgT +AkNBMREwDwYDVQQKEwhNMkNyeXB0bzESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1HDBev+fVqLPywpGUp7pdiBx6N9G +vQivQU/YSchA3qVvsEqSD4vsDNTX27kaZ0DeEphjW68w9Pip80nMI1+WtQEDdCLK +8RStva1AyqzoNpLrc1cKV9+sfrdnc5JoWvKh38cKyuWA+UPsYSBmXUtnEWMTtiov +IgZIjfD0Lbh2ekRiyf2l5Gy5/FUSon6NNZYbS/ZZtMT7JdnD9p2/EttUBvIi4hpG +hceRM4K21xTlWsHScrRBE0XPxd7gtjbFRlth9sBJixenVXRcjVGtrY0UmOXyWVmt +5icaJ3LBmrFwb5uHfoeg0Roc4L1bdwt2qwugbpw35A0mWF7L/JV666cGWwIDAQAB +o4IBNDCCATAwCQYDVR0TBAIwADARBglghkgBhvhCAQEEBAMCBkAwNAYJYIZIAYb4 +QgENBCcWJUVhc3ktUlNBIEdlbmVyYXRlZCBTZXJ2ZXIgQ2VydGlmaWNhdGUwHQYD +VR0OBBYEFOY3yrHYaFzlsheWr95JHEFgsMSpMIGYBgNVHSMEgZAwgY2AFGzMEvOh +w8sSFuB+D9vt9UPTbpeXoWqkaDBmMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0Ex +ETAPBgNVBAoTCE0yQ3J5cHRvMRQwEgYDVQQDEwtNMkNyeXB0byBDQTEhMB8GCSqG +SIb3DQEJARYSc2lnbmVyQGV4YW1wbGUuY29tggkA6OEJa4bZIykwEwYDVR0lBAww +CgYIKwYBBQUHAwEwCwYDVR0PBAQDAgWgMA0GCSqGSIb3DQEBBQUAA4IBAQCWCMwv +EYSs2B3ryiAM50xC5l8Vfu1cah/bcWyGYU27RztwVJmyCry/wz6L7ztnWTOBlaZ5 +YPKwXm07uIRIBXBHiZGIMBq2/AVnwp3UqR4L1ijOaKq/QGyXLG/FJhaLzekixVbI +LFqpwSBekR1vjg1uCR4ujkW4Kx1+mFXLK108yPHYEAvlMFpceg6FzcYw0QE4rFOc +PlJG7wqDD7ZesnFuqyqOc+Bzxy5o4Y5jIJJqz8KOhedkU/+3WzPpIkqSo0l8UEta +VJ29W3iiO5fzozgHOhkbFzedsC2LEO3UQQ3B/I9551NiAhj3Ulpqjl/A54joN5Zy +VTU+UYuV+fdl872S -----END CERTIFICATE----- ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQDUmW8zP+asCjTYDkWX8ytqUCqEMApSnBUwnwUpOiH0wcMBni9V -Vk41rPEWHiaNtSa3mXiS6hx0RqtBEu/MU2LMWVyexIbf2SU1VQVLFv/ZkOP0UbS0 -+sWYS2DwYH8UTh7dYZsiopwhF0OjyweA9XVZnFUc/uBm1HB3XhMGDAXHHwIDAQAB -AoGBALBHrSm8kYMTT2/anZ/5tIUJhcdnohePbg6LvJbLqf4tb4l25V6IGn9tL9Yc -F/GmRD02VwDSd9d+BWAG2Kj+d0rfdCLfKY9O8PVVm0DF6grLZ7ugItYqUHRDYOdV -MOVOQrx+mCIzHtoEtQ6HLqmqt2rIX731L1TA7OLNm3XHyISJAkEA/mgNNNg0e23G -64z83yxxwPEnBrnKd1+xjH9QJ0Z9SJJuF4sNXRIFA4YUNvv2MNe3gMS4Hg9w78HL -PwcEzLnO9QJBANXuWAZGV58CdkM2w7H9+ukxMbQeLSnmgjpdddo31qqbfgFAYZMK -LppRqyosj+a2qQ6vua0ndstTImSi7KPmCUMCQQDbwr5Fu836ISYIK830aswIw0fX -A37mB3+zwfZXNwjaO8NmCvQMRZiXJqcnqBdOsckOLuBs9yGzuk/7rfBzeL5RAkA2 -uBcly7o/vsZ3HLvjfB5ApUecVZehvwcSXLN3VI8A5nLNaSVMEe+nozoPuIQ6NAB7 -9DCe/JgjG6mRaibzKTS3AkEAjTl5MTKkYR78+2u3NRU/ypa1iKCicSvI/Ryw7p/z -Q8XmVA0CmNRvltf9gA1gJ04ZijBPtl+s09uppaCw9L3vuA== ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDUcMF6/59Wos/L +CkZSnul2IHHo30a9CK9BT9hJyEDepW+wSpIPi+wM1NfbuRpnQN4SmGNbrzD0+Knz +ScwjX5a1AQN0IsrxFK29rUDKrOg2kutzVwpX36x+t2dzkmha8qHfxwrK5YD5Q+xh +IGZdS2cRYxO2Ki8iBkiN8PQtuHZ6RGLJ/aXkbLn8VRKifo01lhtL9lm0xPsl2cP2 +nb8S21QG8iLiGkaFx5EzgrbXFOVawdJytEETRc/F3uC2NsVGW2H2wEmLF6dVdFyN +Ua2tjRSY5fJZWa3mJxoncsGasXBvm4d+h6DRGhzgvVt3C3arC6BunDfkDSZYXsv8 +lXrrpwZbAgMBAAECggEANffjHyUbTH4V/cXBcbHPK2Q4q+k05kbzhssK7kuCN02d +3xJCotJwCB52K+qNS5fOErlF3H/YFxOo0RZ5Vq8s8RSt1O4V0kLnlF0ULajZYSvX +xrhg90vqXVKoZFLYUep7twawtjSxnCFmRpJdjuvd5iveURPMX39rJSwGTCslZg/M +h5NKORgizGEDydvo1unpoelNtEvl8jzoUWLP9pRDN4Dl/sSEdhB29LqHpGw4jz+o +/yVSZyc3uJf65YR76R3cXjJ5teLhHlzRs83AuEb/M23HmM0MHrw/Xj70AGB7+a4v +JUcmr93opLxiQIZknN5TfaMrZ6KHoejA7Afjio7YmQKBgQD9XJomtUft20avmVJ2 +pJbUFz/2PQQ8/fNqnPpz/raAnImEekkN1M/SzLEeQN5GJzpIXlC64QYX3TOqasl+ +xXt4BZueoE99Qa/DFg9oBf4nUeHMAWOMkyvSHZwTVUg8ZSlZOyUh24//r9HWbUIj +SaChRufIxmTDfykL2HpJaSENNQKBgQDWpxFj9lKiwkuBTF8MwlASe7ifv8A3XXkb +dL6I4qjRsnXRwIvHUBkkCTc6SN9oZJeC9qF3hR4blLgDVHZXQRzXuFxofGbZAnh4 +bZCXRX4c+8fAVAvEDgtBewTCfGOdxAUmaglEj0coY/gJQqs3f9Fd18i2+OjPB4R2 +5ERJEymHTwKBgQCkXjAvjon0mL4565khGVQ0kkTPpfQa8ZG6h86/8+5Ib8WTaZX9 +YCPXmS4K94B8OLTKAE4Vfyjp0HrVQ2QnV0zrp4+3ED+hfjzdrnEeRk0FC00WgYwo +xc23CbiYnko3zFVP61wCpCO+eD0FBGrU485O8uYqTfNPFS723WEwQQDNRQKBgBM9 +Mi/Veh6gb4gNQk+wcuDVOf0HgMD1nc86LYGzXxI8fpboPR8GLNqwAMU2lt+SdIoG +dP5zbflm4P9baKf1bBJhsdajn8w/jnCs0VLdpaoPXx376noOEDA0SH7uCzeuxA9n +XaFJfkU+gJLD6Pi2ehuBJbpQoP09XUASwZQTJZu9AoGAHNCxo5Px7XpTPUXkbaR/ +OWVGzNJ+x1qFZ+aF2uAo3G1Xd4jk/eTz0MRLucXjcfQY90NoNzm4BzEO8V7/ISeQ +OU8uRo6QUA3nbtOavatK3/kQvU0XPz77KIFn+vKBNyUJh5jubqUk/OjfiwXpMyOc +lA7mGTm3XlvhKS+Kaic6Ia4= +-----END PRIVATE KEY----- Index: m2crypto-0.21.1/tests/signer_key.pem =================================================================== --- m2crypto-0.21.1.orig/tests/signer_key.pem 2011-01-16 06:10:05.000000000 +1100 +++ m2crypto-0.21.1/tests/signer_key.pem 2013-10-13 16:56:35.395010823 +1100 @@ -1,15 +1,28 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQDDnHbzIaoQGZ9344IdncNK2rzDg3HRiXiLgqS5xXC74wC/SbiZ -lmcLv/5yy9m2Y4X0+4ZVMiIebs79iFx1nXc8khfFsnAEWQIz774zJvHkckFFcvG/ -xCGx/t6SufMlPhoVSyZHKcw4f1g7rrfFaedIgbZVYUXDP7adBuUXQfby6QIDAQAB -AoGAZL24JQ85XoFTt5Lb+BS/91Uf0jFn9Nov0um9nE8q+Bi40ctN3wuulkaS7Nw/ -i8dFvh2r2USwfavjvn7z3z7xoMG8V2c1ZFJCI2CKjocuWVkGwNnIsbO7/BOG03nu -vir/i7TXN0YbN8zMhfuFC9APmR8bdmMa2KgHXzQcLuAmI4ECQQDhDIkC97l6rMKG -QWbYrbc7GoMZNwCsPb/fasUknGmtPmq+s818i335u1yyhAk5pwKV7HF+WyZ76S2A -P1bZf9+FAkEA3oN98qoklVmWSK0qV+CKHjZHSqtt32q2eu6+eAO5fVZOWHwXhS/B -MkTtfKJbIDTLyUnwhKyht/hXOniVqHE5FQJAf99VgoArvc6oAQzsWTXrpQOddhhQ -o426lkHenrzZNvz+PjmACsJf5CRXuX9Ylo+U4ockvb0hEssddX+H47HK2QJBAIYr -aV1SJH79pvWpnLeiSAYRmok2tyiZMvELVkQNkuI1kUYfhRslAWxrTXvyddoEm8CC -2glWAqlokEhMf4kyxEUCQCIQbV+XFoEqkECchik34PPmcPi2ends32dv/sW+AKjQ -pxKpWbxVB4sEOPZzpmujP0LLxvCY4HOUJDlhENGQ8MM= ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC3YkwKsvKIP074 +NfnoSICY3M3wZT98AxjvPzbjNIkssTrQd/Lhl27GXT1auUgZLpF+nIY2udLeDVFC +2ThajQgrfYKQ8cn0zHETeCxLffgU3Dpmq8dFsb5PA4s9FsqHTMzQhXbbrUlFDLkz +rAKsPmbWYfawxcH16Alro+HcC+cKo7EVPpb+2mgUFd5Nn+KNodWhuPlIVz54IGnE +eUBdXvdrNWfsZYT+zqwow7qC8GyDGembmCSPWb5JjWEBRIKOds2GyVd/yc+a7qCW +aSOMzPgiwhHwd3iijiLbM1dzaJoDcT1Du3LEA6LRM4wWlZXeqhkaDYWW+NC4km4V +XowLn4fJAgMBAAECggEARXv5VBR50SYrxeCt0FWoZENFxNCYPWTvDbfmFDDTyRte +LZ9FaDT4xDCQDtAlgWUju9WTBSljvL9PCwVDVQwbDF+CGWmEHD1amwXtwqz4Uu8f +McfkuYOfmFC/cWYxVxLCiEAJyTLfkEpB4lJKsPjz/kcgMdq8o3BIIYD3E2lvIZg/ +L9U2nsAvFHZTgB6Nn0L8gAeBUBvkW7/gxAlZrSelrP7AICuemQyA6IB+WR7pGthh +8LTs4r2afLuC8LgmodI55XlJ3rvkdY2AkVEMwVtfyqV9FSc58uqWCwwRbUkCjQcq +fyKVbaiPW58EFosWSWNwCjcJ+0+sH46/6tKqXiiUAQKBgQDzgOQ52ZBLWR9E81mx +Jf5Mqd6ExYeO6UTjAIP3RGnRPI1YWKCBEqFkCFq9G5I+K5+XnmWWc7+N1C5czmT/ +W4VzT7uqtJROamlzPKFAtftii3+oG0cNTIqtfQrbDkopa6fUkjZAzSaz4O+YxHYD +HJDLU5dtCCaAZOngYVLtOlHQBwKBgQDAy5C69eEP+zzI9M9J1vkFo1vCyHLGE8Mm +ZSxm4tdDqQCq+EReRCUYvBtkujNFf7W8H0ViUURx1iJRmTEWELUGgb4C+qedtfF8 +NU9+XFfXLaNSy5Pkd/I2ImzPmPhWoj5Ho4efUphYdmKiRhcxjrMagB7LgLOOhTIg +PmkXt2BVrwKBgEdJKodNDBMi6iaTX2SfDM2AxWX1NfQ+ki4qjnerDZd1tKNyfrqK +q7jPQVEvaybMOpJ2iqL7C88HmPMOcT7Ymj7hzrzw1KIIQQq9ay+4lvmIgTzDj49z +Iv4bJzxt+IQbwixXCY77ACOU7E+65BmRGUqNFD2VL0BTSqynkVFly2GtAoGAbIrv +G+NMZ7P53+W8QoUuRBdZlQtHWu9LYnV5jx9NNIGUp60IyM2y2P8mqQoPzaP+DEDK +znSUhUaaobgOo66aTGSFNqYp8ie6IkTdUXXp2nKOThHhXLKPAh1Vh3dG8Xd8eta9 +h1x3+u4Dz/qIGlWNznCtZcM61BV3SCH7Bugt628CgYBz8MGvLoOGrwuLAQRap4c1 +XK5uCt4aOl8cVGKSk5iwST7GD5NZlAEfTLdpByl/8GjnP5w6ctX7AsVC1ti6G3Tq +DLuIKFkCa3e2Oru67sANCHexKIkkno6yYctsRtwKtjSYjQRMq8jwXxcEKOj9kyMu +jd2fwLGw4LJ22wcu0dYuLA== +-----END PRIVATE KEY----- Index: m2crypto-0.21.1/tests/signer.pem =================================================================== --- m2crypto-0.21.1.orig/tests/signer.pem 2011-01-16 06:10:05.000000000 +1100 +++ m2crypto-0.21.1/tests/signer.pem 2013-10-13 16:56:35.395010823 +1100 @@ -1,61 +1,69 @@ Certificate: Data: - Version: 3 (0x2) - Serial Number: - d1:b6:bf:af:06:17:8c:c0 - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen + Version: 1 (0x0) + Serial Number: 1 (0x1) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C=US, ST=CA, O=M2Crypto, CN=M2Crypto CA/emailAddress=signer@example.com Validity - Not Before: Jul 28 04:37:25 2009 GMT - Not After : Jul 26 04:37:25 2019 GMT - Subject: C=US, ST=California, O=M2Crypto, CN=Signer/emailAddress=signer@example.com + Not Before: Oct 13 05:54:56 2013 GMT + Not After : Oct 11 05:54:56 2023 GMT + Subject: C=US, ST=CA, O=M2Crypto, CN=Signer/emailAddress=signer@example.com Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:c3:9c:76:f3:21:aa:10:19:9f:77:e3:82:1d:9d: - c3:4a:da:bc:c3:83:71:d1:89:78:8b:82:a4:b9:c5: - 70:bb:e3:00:bf:49:b8:99:96:67:0b:bf:fe:72:cb: - d9:b6:63:85:f4:fb:86:55:32:22:1e:6e:ce:fd:88: - 5c:75:9d:77:3c:92:17:c5:b2:70:04:59:02:33:ef: - be:33:26:f1:e4:72:41:45:72:f1:bf:c4:21:b1:fe: - de:92:b9:f3:25:3e:1a:15:4b:26:47:29:cc:38:7f: - 58:3b:ae:b7:c5:69:e7:48:81:b6:55:61:45:c3:3f: - b6:9d:06:e5:17:41:f6:f2:e9 + Public-Key: (2048 bit) + Modulus: + 00:b7:62:4c:0a:b2:f2:88:3f:4e:f8:35:f9:e8:48: + 80:98:dc:cd:f0:65:3f:7c:03:18:ef:3f:36:e3:34: + 89:2c:b1:3a:d0:77:f2:e1:97:6e:c6:5d:3d:5a:b9: + 48:19:2e:91:7e:9c:86:36:b9:d2:de:0d:51:42:d9: + 38:5a:8d:08:2b:7d:82:90:f1:c9:f4:cc:71:13:78: + 2c:4b:7d:f8:14:dc:3a:66:ab:c7:45:b1:be:4f:03: + 8b:3d:16:ca:87:4c:cc:d0:85:76:db:ad:49:45:0c: + b9:33:ac:02:ac:3e:66:d6:61:f6:b0:c5:c1:f5:e8: + 09:6b:a3:e1:dc:0b:e7:0a:a3:b1:15:3e:96:fe:da: + 68:14:15:de:4d:9f:e2:8d:a1:d5:a1:b8:f9:48:57: + 3e:78:20:69:c4:79:40:5d:5e:f7:6b:35:67:ec:65: + 84:fe:ce:ac:28:c3:ba:82:f0:6c:83:19:e9:9b:98: + 24:8f:59:be:49:8d:61:01:44:82:8e:76:cd:86:c9: + 57:7f:c9:cf:9a:ee:a0:96:69:23:8c:cc:f8:22:c2: + 11:f0:77:78:a2:8e:22:db:33:57:73:68:9a:03:71: + 3d:43:bb:72:c4:03:a2:d1:33:8c:16:95:95:de:aa: + 19:1a:0d:85:96:f8:d0:b8:92:6e:15:5e:8c:0b:9f: + 87:c9 Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - OpenSSL Generated Certificate - X509v3 Subject Key Identifier: - 22:CA:29:B7:D7:39:B4:BF:35:F9:36:5E:EE:2B:E4:17:4E:F9:6E:EE - X509v3 Authority Key Identifier: - keyid:AD:64:45:74:8F:83:C7:2C:D5:D7:A0:85:91:10:40:9A:9C:96:CF:EE - Signature Algorithm: sha1WithRSAEncryption - 5f:a0:da:6b:37:b4:bb:25:34:a7:ed:f3:f7:2e:f2:85:aa:91: - 01:8f:c3:80:e5:44:87:df:9e:64:5e:5f:3e:5c:7f:c1:07:12: - 2a:46:cc:bb:9f:a4:a5:c8:3f:84:9a:a4:9e:d5:26:33:af:b4: - 5f:eb:8e:7d:81:65:f6:44:18:78:89:17:74:fb:07:dc:04:65: - fa:15:0c:b2:f3:e7:e7:af:1f:d9:02:c4:c4:44:b7:95:91:47: - fe:c0:2a:e1:7a:ae:dd:5f:f8:a9:fa:bb:dd:89:2d:0b:05:b6: - ce:ba:12:37:7f:97:4c:48:a9:fb:d4:b7:a5:d1:61:f6:85:ea: - 30:8c + 4e:8e:41:b0:0f:5c:24:e2:59:20:4b:30:39:07:e8:6f:5b:24: + 1e:76:4d:a0:83:6b:1a:cc:05:0b:9a:43:4b:39:33:e7:9e:42: + 48:0e:e0:82:24:b2:f1:35:15:1b:74:b5:e9:cd:78:e8:29:ac: + 95:d9:59:11:c7:93:d8:7f:c2:c2:f0:68:23:9c:b1:3b:5e:21: + d5:55:4e:ef:2b:d7:20:34:ca:d6:2f:84:74:fc:b3:74:8f:6b: + 86:62:24:c9:c5:29:c5:a6:ff:5c:1b:94:86:5c:f6:ab:f3:f0: + 60:5c:f6:4b:17:7b:31:69:8e:42:96:7a:55:d9:04:c4:15:25: + 0b:ac:58:be:60:93:14:8d:2c:8d:2c:a1:7c:db:50:11:c2:8c: + e7:9d:06:e1:f2:72:c8:1a:31:00:dc:f2:93:72:67:7e:d7:68: + d9:95:d0:20:44:d4:32:a2:1f:5a:2c:41:db:a5:2b:93:9f:73: + c2:b2:04:68:ab:8d:74:4f:da:77:12:3e:4b:6b:24:23:30:13: + 4b:5f:00:22:0b:f1:b1:cf:42:bd:e7:2c:e2:9a:dc:12:8d:00: + 7f:1c:62:88:38:61:5d:67:57:92:f3:81:4a:17:78:2a:82:38: + 4d:35:ae:fc:8c:0e:ac:2e:85:a1:2c:82:fe:8d:7f:cc:6e:2f: + d3:f4:21:47 -----BEGIN CERTIFICATE----- -MIICsTCCAhqgAwIBAgIJANG2v68GF4zAMA0GCSqGSIb3DQEBBQUAME8xCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhNMkNyeXB0bzEY -MBYGA1UEAxMPSGVpa2tpIFRvaXZvbmVuMB4XDTA5MDcyODA0MzcyNVoXDTE5MDcy -NjA0MzcyNVowaTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAP -BgNVBAoTCE0yQ3J5cHRvMQ8wDQYDVQQDEwZTaWduZXIxITAfBgkqhkiG9w0BCQEW -EnNpZ25lckBleGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA -w5x28yGqEBmfd+OCHZ3DStq8w4Nx0Yl4i4KkucVwu+MAv0m4mZZnC7/+csvZtmOF -9PuGVTIiHm7O/YhcdZ13PJIXxbJwBFkCM+++Mybx5HJBRXLxv8Qhsf7ekrnzJT4a -FUsmRynMOH9YO663xWnnSIG2VWFFwz+2nQblF0H28ukCAwEAAaN7MHkwCQYDVR0T -BAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNh -dGUwHQYDVR0OBBYEFCLKKbfXObS/Nfk2Xu4r5BdO+W7uMB8GA1UdIwQYMBaAFK1k -RXSPg8cs1deghZEQQJqcls/uMA0GCSqGSIb3DQEBBQUAA4GBAF+g2ms3tLslNKft -8/cu8oWqkQGPw4DlRIffnmReXz5cf8EHEipGzLufpKXIP4SapJ7VJjOvtF/rjn2B -ZfZEGHiJF3T7B9wEZfoVDLLz5+evH9kCxMREt5WRR/7AKuF6rt1f+Kn6u92JLQsF -ts66Ejd/l0xIqfvUt6XRYfaF6jCM +MIIDOzCCAiMCAQEwDQYJKoZIhvcNAQEFBQAwZjELMAkGA1UEBhMCVVMxCzAJBgNV +BAgTAkNBMREwDwYDVQQKEwhNMkNyeXB0bzEUMBIGA1UEAxMLTTJDcnlwdG8gQ0Ex +ITAfBgkqhkiG9w0BCQEWEnNpZ25lckBleGFtcGxlLmNvbTAeFw0xMzEwMTMwNTU0 +NTZaFw0yMzEwMTEwNTU0NTZaMGExCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTER +MA8GA1UEChMITTJDcnlwdG8xDzANBgNVBAMTBlNpZ25lcjEhMB8GCSqGSIb3DQEJ +ARYSc2lnbmVyQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEAt2JMCrLyiD9O+DX56EiAmNzN8GU/fAMY7z824zSJLLE60Hfy4Zduxl09 +WrlIGS6RfpyGNrnS3g1RQtk4Wo0IK32CkPHJ9MxxE3gsS334FNw6ZqvHRbG+TwOL +PRbKh0zM0IV2261JRQy5M6wCrD5m1mH2sMXB9egJa6Ph3AvnCqOxFT6W/tpoFBXe +TZ/ijaHVobj5SFc+eCBpxHlAXV73azVn7GWE/s6sKMO6gvBsgxnpm5gkj1m+SY1h +AUSCjnbNhslXf8nPmu6glmkjjMz4IsIR8Hd4oo4i2zNXc2iaA3E9Q7tyxAOi0TOM +FpWV3qoZGg2FlvjQuJJuFV6MC5+HyQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBO +jkGwD1wk4lkgSzA5B+hvWyQedk2gg2sazAULmkNLOTPnnkJIDuCCJLLxNRUbdLXp +zXjoKayV2VkRx5PYf8LC8GgjnLE7XiHVVU7vK9cgNMrWL4R0/LN0j2uGYiTJxSnF +pv9cG5SGXPar8/BgXPZLF3sxaY5ClnpV2QTEFSULrFi+YJMUjSyNLKF821ARwozn +nQbh8nLIGjEA3PKTcmd+12jZldAgRNQyoh9aLEHbpSuTn3PCsgRoq410T9p3Ej5L +ayQjMBNLXwAiC/Gxz0K95yzimtwSjQB/HGKIOGFdZ1eS84FKF3gqgjhNNa78jA6s +LoWhLIL+jX/Mbi/T9CFH -----END CERTIFICATE----- Index: m2crypto-0.21.1/tests/test_smime.py =================================================================== --- m2crypto-0.21.1.orig/tests/test_smime.py 2011-01-16 06:10:05.000000000 +1100 +++ m2crypto-0.21.1/tests/test_smime.py 2013-10-13 16:57:00.015028863 +1100 @@ -219,7 +219,7 @@ buf = BIO.MemoryBuffer() assert SMIME.load_pkcs7(self.filename).write_der(buf) == 1 s = buf.read() - assert len(s) in (1204, 1243), len(s) + assert len(s) in (1204, 1243, 1525, 1635), len(s) def test_load_pkcs7(self): assert SMIME.load_pkcs7(self.filename).type() == SMIME.PKCS7_SIGNED Index: m2crypto-0.21.1/tests/test_ssl_offline.py =================================================================== --- m2crypto-0.21.1.orig/tests/test_ssl_offline.py 2011-01-16 06:10:05.000000000 +1100 +++ m2crypto-0.21.1/tests/test_ssl_offline.py 2013-10-13 17:05:31.818318572 +1100 @@ -16,7 +16,7 @@ def test_checker(self): check = Checker.Checker(host=srv_host, - peerCertHash='7B754EFA41A264AAD370D43460BC8229F9354ECE') + peerCertHash='2F85CA0FED315FB6AEF597853525A6EB5278D60D') x509 = X509.load_cert('tests/server.pem') assert check(x509, srv_host) self.assertRaises(Checker.WrongHost, check, x509, 'example.com') Index: m2crypto-0.21.1/tests/test_ssl.py =================================================================== --- m2crypto-0.21.1.orig/tests/test_ssl.py 2013-10-13 12:00:30.000000000 +1100 +++ m2crypto-0.21.1/tests/test_ssl.py 2013-10-13 12:13:46.244944107 +1100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bintenv python """Unit tests for M2Crypto.SSL. @@ -117,7 +117,7 @@ self.srv_addr = (srv_host, srv_port) self.srv_url = 'https://%s:%s/' % (srv_host, srv_port) self.args = ['s_server', '-quiet', '-www', - #'-cert', 'server.pem', Implicitly using this + '-cert', 'server.pem', #Implicitly using this '-accept', str(self.srv_port)] def tearDown(self): @@ -376,7 +376,7 @@ def test_sslv23_no_v2(self): if fips_mode: # TLS is required in FIPS mode return - self.args.append('-no_tls1') + self.args = self.args + ['-no_tls1', '-no_tls1_1'] pid = self.start_server(self.args) try: ctx = SSL.Context('sslv23') @@ -475,7 +475,7 @@ finally: self.stop_server(pid) - def test_use_weak_cipher(self): + def disabled_test_use_weak_cipher(self): if fips_mode: # Weak ciphers are prohibited return self.args = self.args + ['-cipher', 'EXP'] Index: m2crypto-0.21.1/tests/test_x509.py =================================================================== --- m2crypto-0.21.1.orig/tests/test_x509.py 2011-01-16 06:10:05.000000000 +1100 +++ m2crypto-0.21.1/tests/test_x509.py 2013-10-13 17:01:53.575611868 +1100 @@ -340,14 +340,14 @@ def test_fingerprint(self): x509 = X509.load_cert('tests/x509.pem') fp = x509.get_fingerprint('sha1') - expected = '8D2EB9E203B5FFDC7F4FA7DC4103E852A55B808D' + expected = '5004D93C62E7239F11606FB8DBCE303DF95CC6A0' assert fp == expected, '%s != %s' % (fp, expected) def test_load_der_string(self): f = open('tests/x509.der', 'rb') x509 = X509.load_cert_der_string(''.join(f.readlines())) fp = x509.get_fingerprint('sha1') - expected = '8D2EB9E203B5FFDC7F4FA7DC4103E852A55B808D' + expected = '5004D93C62E7239F11606FB8DBCE303DF95CC6A0' assert fp == expected, '%s != %s' % (fp, expected) def test_save_der_string(self): @@ -412,7 +412,9 @@ x509 = X509.load_cert('tests/x509.pem') f = open('tests/x509.pem', 'r') lTmp = f.readlines() - x509_pem = ''.join(lTmp[44:60]) # -----BEGIN CERTIFICATE----- : -----END CERTIFICATE----- + first_line = lTmp.index('-----BEGIN CERTIFICATE-----\n') + last_line = lTmp.index('-----END CERTIFICATE-----\n') + x509_pem = ''.join(lTmp[first_line:last_line + 1]) f.close() f = open('tests/x509.der', 'rb') x509_der = f.read() Index: m2crypto-0.21.1/tests/x509.pem =================================================================== --- m2crypto-0.21.1.orig/tests/x509.pem 2011-01-16 06:10:05.000000000 +1100 +++ m2crypto-0.21.1/tests/x509.pem 2013-10-13 16:56:35.395010823 +1100 @@ -1,75 +1,96 @@ Certificate: Data: - Version: 3 (0x2) - Serial Number: - d1:b6:bf:af:06:17:8c:bf - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen + Version: 1 (0x0) + Serial Number: 5 (0x5) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C=US, ST=CA, O=M2Crypto, CN=M2Crypto CA/emailAddress=signer@example.com Validity - Not Before: Jul 28 04:34:34 2009 GMT - Not After : Jul 26 04:34:34 2019 GMT - Subject: C=US, ST=California, O=M2Crypto, CN=X509 + Not Before: Oct 13 05:56:14 2013 GMT + Not After : Oct 11 05:56:14 2023 GMT + Subject: C=US, ST=CA, O=M2Crypto, CN=x509 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:d3:62:55:12:30:b8:dc:84:7c:63:bd:80:1d:19: - 1a:72:f2:28:f8:59:0b:2a:6b:f2:2a:23:9d:bb:0f: - 7f:92:5e:dd:27:74:bc:78:0a:27:ab:1c:2e:23:1c: - 26:77:48:b6:8f:03:ef:57:1c:a0:54:ae:1a:e8:f5: - 24:a1:46:a1:27:48:55:33:98:fc:db:6a:83:2e:89: - 3f:e0:f3:91:9d:da:4f:db:74:90:9d:a6:8d:4a:46: - cb:9f:ba:b8:60:df:ae:ee:22:4b:3f:80:55:f7:1d: - 89:3c:2b:28:df:46:19:d5:18:ac:e9:07:4e:40:81: - 75:bc:da:5b:d5:e1:c2:04:15 + Public-Key: (2048 bit) + Modulus: + 00:b7:98:a6:d8:83:1c:2c:ad:0b:32:e5:03:2a:c9: + e0:3c:21:f3:e7:48:be:8f:8e:ef:3f:4b:ff:1a:5c: + ae:b5:22:f0:91:b4:d1:4e:cd:0b:04:af:98:f6:7b: + 3b:5a:35:b8:8b:3f:ec:af:63:9d:e7:70:d3:5b:6f: + 88:b7:75:25:88:f1:3c:c4:83:13:90:fe:b2:8b:31: + 8f:e6:40:f7:8b:cc:59:94:e4:66:81:8e:c4:0b:46: + d4:2f:94:00:70:f4:dd:8e:2b:c9:c1:dc:46:ac:71: + c7:26:2a:4b:53:a1:3f:d9:fe:5e:cd:a9:53:00:11: + 72:dd:84:c9:e7:5c:aa:ab:21:f5:df:01:c0:d5:6d: + 14:5a:65:cc:88:0c:52:d0:7e:68:4a:d2:f7:e4:68: + 31:30:df:64:64:c1:3f:af:f8:1d:23:ca:1f:9f:88: + da:cd:88:57:39:54:3e:69:8d:db:c9:19:1a:4d:d6: + e0:0b:a8:a9:03:6a:d2:9c:55:d2:71:d1:6c:61:6a: + 85:3e:41:ba:e1:24:8f:a3:ca:32:00:45:44:11:65: + cc:51:39:e5:67:66:89:f7:2f:10:f8:94:7f:fc:55: + 08:bf:14:88:f5:6a:cc:23:bd:1f:f6:54:52:f3:15: + aa:a3:5e:f1:ba:53:3a:e0:da:54:24:f2:16:1c:e7: + d2:35 Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - OpenSSL Generated Certificate - X509v3 Subject Key Identifier: - B1:C4:6F:98:6F:E8:3B:8C:A1:26:11:81:97:9A:12:50:4A:1A:6C:88 - X509v3 Authority Key Identifier: - keyid:AD:64:45:74:8F:83:C7:2C:D5:D7:A0:85:91:10:40:9A:9C:96:CF:EE - Signature Algorithm: sha1WithRSAEncryption - 3f:0b:44:bc:d2:da:5f:a9:39:be:08:53:e6:fd:10:ff:d6:f0: - a3:51:f6:be:03:20:cc:b3:52:cf:0f:7c:3f:56:42:6f:9d:72: - 9b:09:a5:64:3f:43:29:24:2b:d6:79:94:54:2f:99:e8:ce:fe: - fd:de:bb:ca:43:28:16:ff:32:ac:3d:c5:56:db:87:23:3c:d4: - 69:f7:4e:1b:c4:be:c9:d8:27:99:2a:64:be:3a:6b:7e:51:85: - db:75:35:40:a5:6c:ae:53:c3:09:e7:00:35:17:64:1a:17:71: - c5:d5:59:e5:8f:fc:96:4a:f9:81:33:23:4c:c1:60:71:93:18: - 0a:c4 + 46:82:4c:58:c1:8e:b5:d0:8b:f5:ec:cd:15:b8:d2:22:d7:e3: + ec:a6:46:56:49:07:52:11:70:c9:19:6b:df:09:ed:8b:ad:03: + 79:70:c2:3c:b6:2d:82:e7:79:a6:99:69:15:a4:6f:72:b7:75: + 61:67:d7:e3:c2:0d:e8:24:5f:4b:8b:ad:08:97:56:7a:c9:8d: + 49:df:46:76:08:13:91:cf:fc:a4:05:cf:b8:a4:1b:75:d9:c3: + 55:b9:ab:6a:2e:94:92:6d:81:ef:12:ba:ba:13:4f:44:40:8e: + 43:cc:27:e1:79:08:1d:41:d8:00:66:c8:3d:a2:57:98:da:71: + 5b:33:5e:42:4c:39:53:19:5b:5d:47:ec:c4:ef:6c:44:e8:77: + 2e:9b:cb:fc:31:2c:fd:b7:14:f2:c4:47:44:ce:70:2d:55:af: + 41:b9:fb:d1:e4:bf:b0:b0:9c:71:03:ce:0b:09:44:39:67:d7: + 91:7f:4f:3b:0a:13:a4:6b:5a:de:39:28:7f:21:6f:07:ce:5c: + 71:90:85:4c:14:94:ea:24:70:50:05:d4:86:a1:e9:6b:47:f8: + 5d:78:f5:d5:28:c4:ae:78:b0:9e:0a:f6:0f:b5:f8:e0:eb:81: + ac:ed:21:f3:d4:09:6e:ae:b8:0a:2e:5d:5d:2e:a0:ed:d6:00: + ee:23:b7:c1 -----BEGIN CERTIFICATE----- -MIICjDCCAfWgAwIBAgIJANG2v68GF4y/MA0GCSqGSIb3DQEBBQUAME8xCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhNMkNyeXB0bzEY -MBYGA1UEAxMPSGVpa2tpIFRvaXZvbmVuMB4XDTA5MDcyODA0MzQzNFoXDTE5MDcy -NjA0MzQzNFowRDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAP -BgNVBAoTCE0yQ3J5cHRvMQ0wCwYDVQQDEwRYNTA5MIGfMA0GCSqGSIb3DQEBAQUA -A4GNADCBiQKBgQDTYlUSMLjchHxjvYAdGRpy8ij4WQsqa/IqI527D3+SXt0ndLx4 -CierHC4jHCZ3SLaPA+9XHKBUrhro9SShRqEnSFUzmPzbaoMuiT/g85Gd2k/bdJCd -po1KRsufurhg367uIks/gFX3HYk8KyjfRhnVGKzpB05AgXW82lvV4cIEFQIDAQAB -o3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRl -ZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUscRvmG/oO4yhJhGBl5oSUEoabIgwHwYD -VR0jBBgwFoAUrWRFdI+DxyzV16CFkRBAmpyWz+4wDQYJKoZIhvcNAQEFBQADgYEA -PwtEvNLaX6k5vghT5v0Q/9bwo1H2vgMgzLNSzw98P1ZCb51ymwmlZD9DKSQr1nmU -VC+Z6M7+/d67ykMoFv8yrD3FVtuHIzzUafdOG8S+ydgnmSpkvjprflGF23U1QKVs -rlPDCecANRdkGhdxxdVZ5Y/8lkr5gTMjTMFgcZMYCsQ= +MIIDFjCCAf4CAQUwDQYJKoZIhvcNAQEFBQAwZjELMAkGA1UEBhMCVVMxCzAJBgNV +BAgTAkNBMREwDwYDVQQKEwhNMkNyeXB0bzEUMBIGA1UEAxMLTTJDcnlwdG8gQ0Ex +ITAfBgkqhkiG9w0BCQEWEnNpZ25lckBleGFtcGxlLmNvbTAeFw0xMzEwMTMwNTU2 +MTRaFw0yMzEwMTEwNTU2MTRaMDwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTER +MA8GA1UEChMITTJDcnlwdG8xDTALBgNVBAMTBHg1MDkwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQC3mKbYgxwsrQsy5QMqyeA8IfPnSL6Pju8/S/8aXK61 +IvCRtNFOzQsEr5j2eztaNbiLP+yvY53ncNNbb4i3dSWI8TzEgxOQ/rKLMY/mQPeL +zFmU5GaBjsQLRtQvlABw9N2OK8nB3EascccmKktToT/Z/l7NqVMAEXLdhMnnXKqr +IfXfAcDVbRRaZcyIDFLQfmhK0vfkaDEw32RkwT+v+B0jyh+fiNrNiFc5VD5pjdvJ +GRpN1uALqKkDatKcVdJx0WxhaoU+QbrhJI+jyjIARUQRZcxROeVnZon3LxD4lH/8 +VQi/FIj1aswjvR/2VFLzFaqjXvG6Uzrg2lQk8hYc59I1AgMBAAEwDQYJKoZIhvcN +AQEFBQADggEBAEaCTFjBjrXQi/XszRW40iLX4+ymRlZJB1IRcMkZa98J7YutA3lw +wjy2LYLneaaZaRWkb3K3dWFn1+PCDegkX0uLrQiXVnrJjUnfRnYIE5HP/KQFz7ik +G3XZw1W5q2oulJJtge8SuroTT0RAjkPMJ+F5CB1B2ABmyD2iV5jacVszXkJMOVMZ +W11H7MTvbETody6by/wxLP23FPLER0TOcC1Vr0G5+9Hkv7CwnHEDzgsJRDln15F/ +TzsKE6RrWt45KH8hbwfOXHGQhUwUlOokcFAF1Iah6WtH+F149dUoxK54sJ4K9g+1 ++ODrgaztIfPUCW6uuAouXV0uoO3WAO4jt8E= -----END CERTIFICATE----- ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDTYlUSMLjchHxjvYAdGRpy8ij4WQsqa/IqI527D3+SXt0ndLx4 -CierHC4jHCZ3SLaPA+9XHKBUrhro9SShRqEnSFUzmPzbaoMuiT/g85Gd2k/bdJCd -po1KRsufurhg367uIks/gFX3HYk8KyjfRhnVGKzpB05AgXW82lvV4cIEFQIDAQAB -AoGATPipcY48QlAb21XNqMrTTrfPI1+JKVFVRPLjJJJoKaxRa2SenDdWaoBAbJh7 -iUP49erA5D+QQkWDlwBs7i0B0NqSkZAUVTfzRjGackTNJUQ+smfeqRLMH+Oru6DS -VFbb818nJOJKqMMhMz8SrPrrbg+qiHlJ3JUQnNzTYohOMAECQQDvTJBSSit34ZBO -ABj4vWYucCnOygcpICQnIsG97sZmF8tuF55tA5e+0v9R7BPuyAjrQnKJqDj3r/AY -AxhgngGVAkEA4iMGoHzoSQvh+gT0A2rPCtVo+URNswIEZhQmMuA0VjrFCphWkZE+ -3jgDsJTNQUJs4mczQMcBzL34Nh1cJThYgQJARMMrdXn6o6gdX0yH4HIMOqvgV5uW -Eys5OEW0hm9mc0/DFQ+UZp7xq9PVqiS8VZEFfxTI9OVx+TqFM2EwUBMXQQJBAIge -n0mRhl0Z6v+NZbh83X3e8h5BUCf1ieJMNKYhMT/KhnsXMdzTui0XOJldKKQksNgj -WMWgROQSYctpJuM8pIECQQCNN27XVHs4YAQ6GvBkrHsK5w6LZkm6UaJgbCqDqyeS -eqfPp9VRurZ/FhK1mPbgNN67U4Ik1nwjR0o8wD4mreIj ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3mKbYgxwsrQsy +5QMqyeA8IfPnSL6Pju8/S/8aXK61IvCRtNFOzQsEr5j2eztaNbiLP+yvY53ncNNb +b4i3dSWI8TzEgxOQ/rKLMY/mQPeLzFmU5GaBjsQLRtQvlABw9N2OK8nB3Eascccm +KktToT/Z/l7NqVMAEXLdhMnnXKqrIfXfAcDVbRRaZcyIDFLQfmhK0vfkaDEw32Rk +wT+v+B0jyh+fiNrNiFc5VD5pjdvJGRpN1uALqKkDatKcVdJx0WxhaoU+QbrhJI+j +yjIARUQRZcxROeVnZon3LxD4lH/8VQi/FIj1aswjvR/2VFLzFaqjXvG6Uzrg2lQk +8hYc59I1AgMBAAECggEAZuSldSgdjSg5438XhE55XhoFMHTDX39StB2qTaLtwtRf +ELnOqCQf7bNfvZuYytjaoSflRPJGV6QSv+bFL1P3AkV4sgVn3NXxSDMxm3CDi5Su +C9TpYeiaFFvQpQ2EJcoFtRzzSLNj5Fcrrkb7ylXPjCOUDBy+SIZ+4oj+Aq0bdSZy +9F+vbll1DxbFwD7bIP5/qpyQJ+U6lBt4oOxwgXZvb5rt4cz4/OY+BEQOBTiFGXR3 +a5y1akdigDC6HYX7dGofPvtkdN1iVMZlGqU5Fpvmwc2os0+aZUkeYc6nowPhpKe3 +VOxdqoDKUQaUw77LwD+bPQI6vnnZSeffaHvR4nmSLQKBgQDjk6QwW1+KEOpxkb9t +2nqRvjiqtFpgjRA5jMBaLBRfRF4xINhLfBAOQ9iXRdieE9dyyLPAz1ruEgAUn1X6 +Xd1pgKNUy2pquMBLZZF9THZQRuEULOgYe4foMr2ccotrBGlEynWv3sLUnj8wjhq+ +RMOq4i0EeS/xaEqfwhQK8TzXlwKBgQDOhtCa5Ymd4f4wkhT4wbqX0ZjMMPioaCjv +eIdEgKt+p6NuGlula8CD72z1TH4STmPEKoUMxa7hFCWQJSG9OhMrW+CSIYQ+YFPc +MCdhYKgghPnlGS+2X9GH2oC8ulBIU49ClqWB1t7pk2ljoQwTzk9aob5GmsKy5Lhf +SZCVc+T+EwKBgQC/XLK/htX7fuXkwa26bfCLBO0ZfbZRYcy218gXCuHGifK6VOgL +8TJ/DEXgTfcsVXrhJisggjvv3Gr87E6bzLoVsPmmn7XIL7piq/F+7wC92BwDnw87 +JwTNF32hRCA/yOHL2oLDdAlYSAjSh2utep0d4DoCfPT3hb7aP5Qi71892QKBgAvB +HIpUWhrETAVTqyHlVMtjQIEOoHhlRT8r6vb5I8mXnPOdSG4HzfM0Y00qx1ofYApA +KUZq0eM5lFG560urzH+BQSzP/4jVTrCPhQ5DxA3lw5tIbbDBj1leFEmpiPw01UiC +7nSPWCyPGUZ0Wg2ehmGwJvY5xK8N2XiC5Vm8OOJFAoGBAKpr1wt2L5DHV4tatuXe +FlstayUi/tsIV69Osl9UbQmkJdLcQQREIXkqQvlHeuodRocTIteVXRkBR/FG9Ws1 ++S4XUMVWncH0oXuZQMrvO9zogyIO3pjR+vJOMT28gx+SIaZs89CUHxDh9Ymx8TJR +pHZVODzgmeerWonGm9f9fhZq +-----END PRIVATE KEY----- debian/patches/0002-Disable-SSLv2_method-when-disabled-in-OpenSSL-iself-.patch0000664000000000000000000000157212073026275023610 0ustar From 939cdded84d39a3bfef7cb85dd19a1dc3860e767 Mon Sep 17 00:00:00 2001 From: Charles Plessy Date: Tue, 16 Aug 2011 07:54:38 +0900 Subject: [PATCH] Disable SSLv2_method when disabled in OpenSSL iself (Closes: #637904). Thanks, Sebastian Ramacher . --- SWIG/_ssl.i | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/SWIG/_ssl.i b/SWIG/_ssl.i index 2373ff2..2844da7 100644 --- a/SWIG/_ssl.i +++ b/SWIG/_ssl.i @@ -48,8 +48,10 @@ extern const char *SSL_alert_desc_string(int); %rename(ssl_get_alert_desc_v) SSL_alert_desc_string_long; extern const char *SSL_alert_desc_string_long(int); +#ifndef OPENSSL_NO_SSL2 %rename(sslv2_method) SSLv2_method; extern SSL_METHOD *SSLv2_method(void); +#endif %rename(sslv3_method) SSLv3_method; extern SSL_METHOD *SSLv3_method(void); %rename(sslv23_method) SSLv23_method; -- 1.7.5.4 debian/patches/skip_sslv2_tests.patch0000664000000000000000000000311712073027236015165 0ustar Description: When SSLv2 is disabled via openssl configuration, as it is in Debian and Ubuntu, SSLv23 will use SSLv3/TLSv1 client hello format, thus enabling connection to SSLv3/TLSv1 servers. The expected failure to connect embodied in this test will not happen. See Python issue 13218 for additional detail. Author: Barry Warsaw Bug-Python: http://bugs.python.org/issue13218 Forwarded: not-needed --- a/tests/test_ssl.py +++ b/tests/test_ssl.py @@ -387,6 +387,12 @@ finally: self.stop_server(pid) + @unittest.skip( + 'When SSLv2 is disabled via openssl configuration, as it is in Debian ' + 'and Ubuntu, SSLv23 will use SSLv3/TLSv1 client hello format, thus ' + 'enabling connection to SSLv3/TLSv1 servers. The expected failure to ' + 'connect embodied in this test will not happen. See Python ' + 'issue 13218 for additional detail.') def test_sslv23_no_v2_no_service(self): if fips_mode: # TLS is required in FIPS mode return @@ -400,6 +406,12 @@ finally: self.stop_server(pid) + @unittest.skip( + 'When SSLv2 is disabled via openssl configuration, as it is in Debian ' + 'and Ubuntu, SSLv23 will use SSLv3/TLSv1 client hello format, thus ' + 'enabling connection to SSLv3/TLSv1 servers. The expected failure to ' + 'connect embodied in this test will not happen. See Python ' + 'issue 13218 for additional detail.') def test_sslv23_weak_crypto(self): if fips_mode: # TLS is required in FIPS mode return debian/python-m2crypto.doc-base.ssl-howto0000664000000000000000000000045712073026275015635 0ustar Document: m2crypto.ssl-howto Title: M2Crypto SSL howto Author: Ng Pheng Siong and Heikki Toivonen Abstract: HOWTO: Programming SSL in Python with M2Crypto Section: Programming/Python Format: HTML Index: /usr/share/doc/python-m2crypto/howto.ssl.html Files: /usr/share/doc/python-m2crypto/howto.ssl.html debian/rules0000775000000000000000000000076712073027236010264 0ustar #!/usr/bin/make -f DEB_DH_BUILDDEB_ARGS = -- -Z xz include /usr/share/cdbs/1/class/python-distutils.mk include /usr/share/cdbs/1/rules/debhelper.mk export DEB_HOST_MULTIARCH versions := $(shell pyversions -vs) ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) build/python-m2crypto:: for version in $(versions); \ do python$$version setup.py test || exit 1; \ done endif clean:: rm -f M2Crypto/__m2crypto.so SWIG/_m2crypto.py SWIG/_m2crypto_wrap.c tests/randpool.dat tests/sig.p7 tests/sig.p7s tests/x509.der0000664000000000000000000000143212226433023010306 0ustar 000  *H 0f1 0 UUS1 0 UCA10U M2Crypto10U M2Crypto CA1!0 *H  signer@example.com0 131013055614Z 231011055614Z0<1 0 UUS1 0 UCA10U M2Crypto1 0 Ux5090"0  *H 0 ؃, 2*iM jҜUqlaj>A$2EDeQ9gf/Uj#TR^S:T$50  *H FLXЋ"FVIRpk 틭yp<-yioruag $_KVzɍIFvϸuUj.mOD@C'yAf=Wq[3^BL9S[]GlDw.1,GDp-UA俰q D9gבO; kZ9(!o\qL$pPԆkG]x(Įx 끬! n .]].#