Hello community,
here is the log from the commit of package python-M2Crypto for openSUSE:Factory checked in at 2017-09-29 11:49:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-M2Crypto (Old)
and /work/SRC/openSUSE:Factory/.python-M2Crypto.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-M2Crypto"
Fri Sep 29 11:49:30 2017 rev:23 rq:528798 version:0.26.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-M2Crypto/python-M2Crypto.changes 2017-09-25 13:56:59.631285575 +0200
+++ /work/SRC/openSUSE:Factory/.python-M2Crypto.new/python-M2Crypto.changes 2017-09-29 11:49:32.600239354 +0200
@@ -1,0 +2,5 @@
+Tue Sep 26 12:32:25 UTC 2017 - michael@stroeder.com
+
+- Update to 0.26.4 with fix for OpenSSL 1.1.0 and LibreSSL
+
+-------------------------------------------------------------------
Old:
----
M2Crypto-0.26.3.tar.gz
New:
----
M2Crypto-0.26.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-M2Crypto.spec ++++++
--- /var/tmp/diff_new_pack.VWT3pP/_old 2017-09-29 11:49:33.984044212 +0200
+++ /var/tmp/diff_new_pack.VWT3pP/_new 2017-09-29 11:49:33.988043648 +0200
@@ -22,7 +22,7 @@
%define oldpython python
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-M2Crypto
-Version: 0.26.3
+Version: 0.26.4
Release: 0
Url: https://gitlab.com/m2crypto/m2crypto
Summary: Crypto and SSL toolkit for Python
++++++ M2Crypto-0.26.3.tar.gz -> M2Crypto-0.26.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/M2Crypto-0.26.3/CHANGES new/M2Crypto-0.26.4/CHANGES
--- old/M2Crypto-0.26.3/CHANGES 2017-03-25 13:20:10.000000000 +0100
+++ new/M2Crypto-0.26.4/CHANGES 2017-09-25 12:46:00.000000000 +0200
@@ -1,3 +1,29 @@
+0.26.3 - 2016-03-21
+-------------------
+- Fix a syntax typo.
+
+0.26.2 - 2016-03-21
+-------------------
+- port to support OpenSSL 1.1.0 API
+- add generated Sphinx documentation
+- another set of cleanups
+
+0.26.0 - 2017-03-21
+-------------------
+- Fix packaging on RHEL-6
+- Replace ASN1_UTCTIME with ASN1_TIME which supports both UTCTime and
+ GeneralizedTime
+- Add possibility to sign PKCS7 with a non-default digest.
+- Add possibility to set custom callback for X509 verification.
+- Clean up imports and PEP8ization
+- A lot of cleanups on the way towards Python 3
+- Other small bugfixes
+
+0.25.1 - 2016-07-25
+-------------------
+- Actually do check, whether we have SSLv2 compiled in, and don't run
+ test for it.
+
0.25.0 - 2016-03-21
-------------------
- More cleanups, removal of obsolete stuff, and moves towards py3k
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/M2Crypto-0.26.3/M2Crypto/__init__.py new/M2Crypto-0.26.4/M2Crypto/__init__.py
--- old/M2Crypto-0.26.3/M2Crypto/__init__.py 2017-09-22 16:43:22.000000000 +0200
+++ new/M2Crypto-0.26.4/M2Crypto/__init__.py 2017-09-26 11:28:54.000000000 +0200
@@ -19,7 +19,7 @@
"""
# noqa
from distutils.version import StrictVersion
-__version__ = '0.26.3'
+__version__ = '0.26.4'
version = __version__ # type: str
version_info = StrictVersion(__version__).version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/M2Crypto-0.26.3/PKG-INFO new/M2Crypto-0.26.4/PKG-INFO
--- old/M2Crypto-0.26.3/PKG-INFO 2017-09-22 16:55:39.000000000 +0200
+++ new/M2Crypto-0.26.4/PKG-INFO 2017-09-26 11:29:21.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: M2Crypto
-Version: 0.26.3
+Version: 0.26.4
Summary: M2Crypto: A Python crypto and SSL toolkit
Home-page: https://gitlab.com/m2crypto/m2crypto
Author: Matej Cepl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/M2Crypto-0.26.3/SWIG/_evp.i new/M2Crypto-0.26.4/SWIG/_evp.i
--- old/M2Crypto-0.26.3/SWIG/_evp.i 2017-09-21 11:29:46.000000000 +0200
+++ new/M2Crypto-0.26.4/SWIG/_evp.i 2017-09-26 11:26:33.000000000 +0200
@@ -21,7 +21,7 @@
#if OPENSSL_VERSION_NUMBER < 0x10100000L
-HMAC_CTX *HMAC_CTX_new() {
+HMAC_CTX *HMAC_CTX_new(void) {
HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX));
HMAC_CTX_init(ret);
return ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/M2Crypto-0.26.3/SWIG/_m2crypto.i new/M2Crypto-0.26.4/SWIG/_m2crypto.i
--- old/M2Crypto-0.26.3/SWIG/_m2crypto.i 2017-09-22 16:19:54.000000000 +0200
+++ new/M2Crypto-0.26.4/SWIG/_m2crypto.i 2017-09-26 11:26:33.000000000 +0200
@@ -21,6 +21,11 @@
#endif
%{
+#if __GNUC__ < 5
+#pragma GCC diagnostic ignored "-Wunused-label"
+#pragma GCC diagnostic warning "-Wstrict-prototypes"
+#endif
+
#include
#include
#include <_lib.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/M2Crypto-0.26.3/SWIG/_m2crypto_wrap.c new/M2Crypto-0.26.4/SWIG/_m2crypto_wrap.c
--- old/M2Crypto-0.26.3/SWIG/_m2crypto_wrap.c 2017-09-22 16:17:53.000000000 +0200
+++ new/M2Crypto-0.26.4/SWIG/_m2crypto_wrap.c 2017-09-26 11:26:33.000000000 +0200
@@ -3546,6 +3546,11 @@
#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a))
+#if __GNUC__ < 5
+#pragma GCC diagnostic ignored "-Wunused-label"
+#pragma GCC diagnostic warning "-Wstrict-prototypes"
+#endif
+
#include
#include
#include <_lib.h>
@@ -5746,7 +5751,7 @@
#if OPENSSL_VERSION_NUMBER < 0x10100000L
-HMAC_CTX *HMAC_CTX_new() {
+HMAC_CTX *HMAC_CTX_new(void) {
HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX));
HMAC_CTX_init(ret);
return ret;
@@ -7407,6 +7412,24 @@
_ssl_timeout_err = ssl_timeout_err;
}
+#ifndef OPENSSL_NO_SSL3
+const SSL_METHOD *sslv3_method(void) {
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ PyErr_WarnEx(PyExc_DeprecationWarning,
+ "Function SSLv3_method has been deprecated.", 1);
+#endif
+ return SSLv3_method();
+}
+#endif
+
+const SSL_METHOD *tlsv1_method(void) {
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ PyErr_WarnEx(PyExc_DeprecationWarning,
+ "Function TLSv1_method has been deprecated.", 1);
+#endif
+ return TLSv1_method();
+}
+
void ssl_ctx_passphrase_callback(SSL_CTX *ctx, PyObject *pyfunc) {
SSL_CTX_set_default_passwd_cb(ctx, passphrase_callback);
SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)pyfunc);
@@ -8294,7 +8317,7 @@
}
X509V3_CTX *
-x509v3_set_nconf() {
+x509v3_set_nconf(void) {
X509V3_CTX * ctx;
CONF *conf = NCONF_new(NULL);
@@ -17482,18 +17505,6 @@
}
-SWIGINTERN PyObject *_wrap_sslv3_method(PyObject *self, PyObject *args) {
- PyObject *resultobj = 0;
- SSL_METHOD *result = 0 ;
-
- result = (SSL_METHOD *)SSLv3_method();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SSL_METHOD, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_sslv23_method(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
SSL_METHOD *result = 0 ;
@@ -17506,18 +17517,6 @@
}
-SWIGINTERN PyObject *_wrap_tlsv1_method(PyObject *self, PyObject *args) {
- PyObject *resultobj = 0;
- SSL_METHOD *result = 0 ;
-
- result = (SSL_METHOD *)TLSv1_method();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SSL_METHOD, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_ssl_ctx_new(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
SSL_METHOD *arg1 = (SSL_METHOD *) 0 ;
@@ -19162,6 +19161,30 @@
}
+SWIGINTERN PyObject *_wrap_sslv3_method(PyObject *self, PyObject *args) {
+ PyObject *resultobj = 0;
+ SSL_METHOD *result = 0 ;
+
+ result = (SSL_METHOD *)sslv3_method();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SSL_METHOD, 0 | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_tlsv1_method(PyObject *self, PyObject *args) {
+ PyObject *resultobj = 0;
+ SSL_METHOD *result = 0 ;
+
+ result = (SSL_METHOD *)tlsv1_method();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SSL_METHOD, 0 | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
SWIGINTERN PyObject *_wrap_ssl_ctx_passphrase_callback(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
SSL_CTX *arg1 = (SSL_CTX *) 0 ;
@@ -28992,9 +29015,7 @@
{ (char *)"ssl_get_alert_type_v", _wrap_ssl_get_alert_type_v, METH_VARARGS, NULL},
{ (char *)"ssl_get_alert_desc", _wrap_ssl_get_alert_desc, METH_VARARGS, NULL},
{ (char *)"ssl_get_alert_desc_v", _wrap_ssl_get_alert_desc_v, METH_VARARGS, NULL},
- { (char *)"sslv3_method", _wrap_sslv3_method, METH_VARARGS, NULL},
{ (char *)"sslv23_method", _wrap_sslv23_method, METH_VARARGS, NULL},
- { (char *)"tlsv1_method", _wrap_tlsv1_method, METH_VARARGS, NULL},
{ (char *)"ssl_ctx_new", _wrap_ssl_ctx_new, METH_VARARGS, NULL},
{ (char *)"ssl_ctx_free", _wrap_ssl_ctx_free, METH_VARARGS, NULL},
{ (char *)"ssl_ctx_set_verify_depth", _wrap_ssl_ctx_set_verify_depth, METH_VARARGS, NULL},
@@ -29045,6 +29066,8 @@
{ (char *)"ssl_read", _wrap_ssl_read, METH_VARARGS, NULL},
{ (char *)"ssl_write", _wrap_ssl_write, METH_VARARGS, NULL},
{ (char *)"ssl_init", _wrap_ssl_init, METH_VARARGS, NULL},
+ { (char *)"sslv3_method", _wrap_sslv3_method, METH_VARARGS, NULL},
+ { (char *)"tlsv1_method", _wrap_tlsv1_method, METH_VARARGS, NULL},
{ (char *)"ssl_ctx_passphrase_callback", _wrap_ssl_ctx_passphrase_callback, METH_VARARGS, NULL},
{ (char *)"ssl_ctx_use_x509", _wrap_ssl_ctx_use_x509, METH_VARARGS, NULL},
{ (char *)"ssl_ctx_use_cert", _wrap_ssl_ctx_use_cert, METH_VARARGS, NULL},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/M2Crypto-0.26.3/SWIG/_ssl.i new/M2Crypto-0.26.4/SWIG/_ssl.i
--- old/M2Crypto-0.26.3/SWIG/_ssl.i 2017-09-22 16:40:56.000000000 +0200
+++ new/M2Crypto-0.26.4/SWIG/_ssl.i 2017-09-26 11:26:33.000000000 +0200
@@ -65,20 +65,12 @@
extern const char *SSL_alert_desc_string_long(int);
#ifndef OPENSSL_NO_SSL3
-#if OPENSSL_VERSION_NUMBER >= 0x11100000L
-PyErr_WarnEx(PyExc_DeprecationWarning,
- "Function SSLv3_method has been deprecated.", 1);
-#endif
-%rename(sslv3_method) SSLv3_method;
+%ignore SSLv3_method;
extern SSL_METHOD *SSLv3_method(void);
#endif
%rename(sslv23_method) SSLv23_method;
extern SSL_METHOD *SSLv23_method(void);
-#if OPENSSL_VERSION_NUMBER >= 0x11100000L
-PyErr_WarnEx(PyExc_DeprecationWarning,
- "Function TLSv1_method has been deprecated.", 1);
-#endif
-%rename(tlsv1_method) TLSv1_method;
+%ignore TLSv1_method;
extern SSL_METHOD *TLSv1_method(void);
%typemap(out) SSL_CTX * {
@@ -274,6 +266,24 @@
_ssl_timeout_err = ssl_timeout_err;
}
+#ifndef OPENSSL_NO_SSL3
+const SSL_METHOD *sslv3_method(void) {
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ PyErr_WarnEx(PyExc_DeprecationWarning,
+ "Function SSLv3_method has been deprecated.", 1);
+#endif
+ return SSLv3_method();
+}
+#endif
+
+const SSL_METHOD *tlsv1_method(void) {
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ PyErr_WarnEx(PyExc_DeprecationWarning,
+ "Function TLSv1_method has been deprecated.", 1);
+#endif
+ return TLSv1_method();
+}
+
void ssl_ctx_passphrase_callback(SSL_CTX *ctx, PyObject *pyfunc) {
SSL_CTX_set_default_passwd_cb(ctx, passphrase_callback);
SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)pyfunc);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/M2Crypto-0.26.3/SWIG/_x509.i new/M2Crypto-0.26.4/SWIG/_x509.i
--- old/M2Crypto-0.26.3/SWIG/_x509.i 2017-09-21 11:29:46.000000000 +0200
+++ new/M2Crypto-0.26.4/SWIG/_x509.i 2017-09-26 11:26:33.000000000 +0200
@@ -560,7 +560,7 @@
}
X509V3_CTX *
-x509v3_set_nconf() {
+x509v3_set_nconf(void) {
X509V3_CTX * ctx;
CONF *conf = NCONF_new(NULL);
Binary files old/M2Crypto-0.26.3/tests/randpool.dat and new/M2Crypto-0.26.4/tests/randpool.dat differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/M2Crypto-0.26.3/tests/sig.p7 new/M2Crypto-0.26.4/tests/sig.p7
--- old/M2Crypto-0.26.3/tests/sig.p7 2017-09-22 16:15:38.000000000 +0200
+++ new/M2Crypto-0.26.4/tests/sig.p7 2017-09-25 23:38:14.000000000 +0200
@@ -16,11 +16,11 @@
sCv9MYIB1TCCAdECAQEwVDBPMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZv
cm5pYTERMA8GA1UEChMITTJDcnlwdG8xGDAWBgNVBAMTD0hlaWtraSBUb2l2b25l
bgIBAzAJBgUrDgMCGgUAoIHYMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJ
-KoZIhvcNAQkFMQ8XDTE3MDkyMjE0MTUzOFowIwYJKoZIhvcNAQkEMRYEFDeqY8dz
+KoZIhvcNAQkFMQ8XDTE3MDkyNTIxMzgxNFowIwYJKoZIhvcNAQkEMRYEFDeqY8dz
mNlURzJi4aAFfB5jLtp3MHkGCSqGSIb3DQEJDzFsMGowCwYJYIZIAWUDBAEqMAsG
CWCGSAFlAwQBFjALBglghkgBZQMEAQIwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwIC
AgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0GCSqG
-SIb3DQEBAQUABIGAAwFTlkHfB0pG8NJEPx6h2OQB4a6H3y5Lue+hXM1owxsEjeNC
-egIC2LZ5hixij8hRSNee2MVq62T6EM1zLrt6Qi0M1LAezYziOOB6TBoxkos9LQlx
-edpkjmDlVnwXjvBDy3ZWRwQDl1xEZS4dNccmAou2XFJvIyIAkeqn+arRHiI=
+SIb3DQEBAQUABIGAjT4x237JhydLcQdkYdmwgMG6Shbdv7syHS6VOpBu2A4zBW4u
+EYxvi1CPKD/4NoWFm7n8TybXzzmZofyJkDW6dkdk8Tt6lVjW8jAqPinMNehnYLKL
+V9ToDJwEd/eiAJUK4UZL67u0hcuexPD9pfm75TTSVwfs/C1tZKm1ytoDU40=
-----END PKCS7-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/M2Crypto-0.26.3/tests/sig.p7s new/M2Crypto-0.26.4/tests/sig.p7s
--- old/M2Crypto-0.26.3/tests/sig.p7s 2017-09-22 16:15:38.000000000 +0200
+++ new/M2Crypto-0.26.4/tests/sig.p7s 2017-09-25 23:38:14.000000000 +0200
@@ -1,11 +1,11 @@
MIME-Version: 1.0
-Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg="sha1"; boundary="----FDA37644022ACBC6DCB9EB61F28BA806"
+Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg="sha1"; boundary="----5DF4E540E38DFC2C0E5AB5A8B8A0C6FA"
This is an S/MIME signed message
-------FDA37644022ACBC6DCB9EB61F28BA806
+------5DF4E540E38DFC2C0E5AB5A8B8A0C6FA
some text
-------FDA37644022ACBC6DCB9EB61F28BA806
+------5DF4E540E38DFC2C0E5AB5A8B8A0C6FA
Content-Type: application/x-pkcs7-signature; name="smime.p7s"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="smime.p7s"
@@ -27,13 +27,13 @@
ATBUME8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQK
EwhNMkNyeXB0bzEYMBYGA1UEAxMPSGVpa2tpIFRvaXZvbmVuAgEDMAkGBSsOAwIa
BQCggdgwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcN
-MTcwOTIyMTQxNTM4WjAjBgkqhkiG9w0BCQQxFgQUN6pjx3OY2VRHMmLhoAV8HmMu
+MTcwOTI1MjEzODE0WjAjBgkqhkiG9w0BCQQxFgQUN6pjx3OY2VRHMmLhoAV8HmMu
2ncweQYJKoZIhvcNAQkPMWwwajALBglghkgBZQMEASowCwYJYIZIAWUDBAEWMAsG
CWCGSAFlAwQBAjAKBggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcN
-AwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYAD
-AVOWQd8HSkbw0kQ/HqHY5AHhroffLku576FczWjDGwSN40J6AgLYtnmGLGKPyFFI
-157YxWrrZPoQzXMuu3pCLQzUsB7NjOI44HpMGjGSiz0tCXF52mSOYOVWfBeO8EPL
-dlZHBAOXXERlLh01xyYCi7ZcUm8jIgCR6qf5qtEeIg==
+AwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYCN
+PjHbfsmHJ0txB2Rh2bCAwbpKFt2/uzIdLpU6kG7YDjMFbi4RjG+LUI8oP/g2hYWb
+ufxPJtfPOZmh/ImQNbp2R2TxO3qVWNbyMCo+Kcw16GdgsotX1OgMnAR396IAlQrh
+Rkvru7SFy57E8P2l+bvlNNJXB+z8LW1kqbXK2gNTjQ==
-------FDA37644022ACBC6DCB9EB61F28BA806--
+------5DF4E540E38DFC2C0E5AB5A8B8A0C6FA--