Attachment 177664 Details for Bug 215051 – patch

patch

py-salt-2016.11.0_1.diff.txt (text/plain), 2.07 KB, created by Christer Edwards on 2016-12-04 20:22:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christer Edwards

Created: 2016-12-04 20:22:33 UTC

Size: 2.07 KB

patch

obsolete

>diff -ruN py-salt-2016.11.0/Makefile py-salt-2016.11.0_1/Makefile
>--- py-salt-2016.11.0/Makefile    2016-12-05 02:48:47.832112000 +0800
>+++ py-salt-2016.11.0_1/Makefile    2016-12-05 02:42:40.349378000 +0800
>@@ -3,6 +3,7 @@
>
> PORTNAME=    salt
> PORTVERSION=    2016.11.0
>+PORTREVISION=    1
> CATEGORIES=    sysutils python
> MASTER_SITES=    CHEESESHOP
> PKGNAMEPREFIX=    ${PYTHON_PKGNAMEPREFIX}
>diff -ruN py-salt-2016.11.0/files/patch-salt_utils_rsax931.py py-salt-2016.11.0_1/files/patch-salt_utils_rsax931.py
>--- py-salt-2016.11.0/files/patch-salt_utils_rsax931.py    1970-01-01 08:00:00.000000000 +0800
>+++ py-salt-2016.11.0_1/files/patch-salt_utils_rsax931.py    2016-12-05 02:40:52.898551000 +0800
>@@ -0,0 +1,34 @@
>+diff --git salt/utils/rsax931.py salt/utils/rsax931.py
>+index 9eb1f4a..bccdad6 100644
>+--- salt/utils/rsax931.py
>++++ salt/utils/rsax931.py
>+@@ -16,6 +16,11 @@
>+ from ctypes import cdll, c_char_p, c_int, c_void_p, pointer, create_string_buffer
>+ from ctypes.util import find_library
>+
>++# Constants taken from openssl-1.1.0c/include/openssl/crypto.h
>++OPENSSL_INIT_ADD_ALL_CIPHERS = 0x00000004
>++OPENSSL_INIT_ADD_ALL_DIGESTS = 0x00000008
>++OPENSSL_INIT_NO_LOAD_CONFIG = 0x00000080
>++
>+
>+ def _load_libcrypto():
>+     '''
>+@@ -60,8 +65,15 @@ def _init_libcrypto():
>+     libcrypto.RSA_private_encrypt.argtypes = (c_int, c_char_p, c_char_p, c_void_p, c_int)
>+     libcrypto.RSA_public_decrypt.argtypes = (c_int, c_char_p, c_char_p, c_void_p, c_int)
>+
>+-    libcrypto.OPENSSL_no_config()
>+-    libcrypto.OPENSSL_add_all_algorithms_noconf()
>++    try:
>++        if libcrypto.OPENSSL_init_crypto(OPENSSL_INIT_NO_LOAD_CONFIG |
>++                                         OPENSSL_INIT_ADD_ALL_CIPHERS |
>++                                         OPENSSL_INIT_ADD_ALL_DIGESTS, None) != 1:
>++            raise OSError("Failed to initialize OpenSSL library (OPENSSL_init_crypto failed)")
>++    except AttributeError:
>++        # Support for OpenSSL < 1.1 (OPENSSL_API_COMPAT < 0x10100000L)
>++        libcrypto.OPENSSL_no_config()
>++        libcrypto.OPENSSL_add_all_algorithms_noconf()
>+
>+     return libcrypto
>+

Flags:

christer.edwards: maintainer-approval+

Actions: View

Attachments on bug 215051: 177664 | 177665