View | Details | Raw Unified | Return to bug 197049 | Differences between
and this patch

Collapse All | Expand All

(-)security/py-cryptography/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2 
# $FreeBSD$
 2 
# $FreeBSD$
3 

          3
          

        

        

          4
          
PORTNAME=	cryptography

          4
          
PORTNAME=	cryptography

        

          
            

              5
              
PORTVERSION=	0.7.2


              5
              
PORTVERSION=	0.8.2

            

        

          6
          
CATEGORIES=	security python

          6
          
CATEGORIES=	security python

        

        

          7
          
MASTER_SITES=	CHEESESHOP

          7
          
MASTER_SITES=	CHEESESHOP

        

        

          8
          
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

          8
          
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

        



(-)security/py-cryptography/distinfo
      (-2 / +2 lines)




  

    
      
            Lines 1-2
          
      
      
        Link Here
      
    
  

          
            

              1
              
SHA256 (cryptography-0.7.2.tar.gz) = fab7fcdde360ec6614442d0321dcd0eff5e43544cb30d975e9d75a914a4cdf78


              1
              
SHA256 (cryptography-0.8.2.tar.gz) = 1c9a022ab3decaf152093e2ef2d5ee4258c72c7d429446c86bd68ff8c0929db6

            

            

              2
              
SIZE (cryptography-0.7.2.tar.gz) = 247477


              2
              
SIZE (cryptography-0.8.2.tar.gz) = 268288

            



(-)security/py-cryptography/files/patch-src_cryptography_hazmat_bindings_openssl_engine.py
      (-10 lines)




  

    
      
            Lines 1-10
          
      
      
        Link Here
      
    
  

            

              1
              
--- src/cryptography/hazmat/bindings/openssl/engine.py.orig	2015-01-16 13:26:59 UTC

              
              
            

            

              2
              
+++ src/cryptography/hazmat/bindings/openssl/engine.py

            

            

              3
              
@@ -49,7 +49,6 @@ int ENGINE_init(ENGINE *);

            

            

              4
              
 int ENGINE_finish(ENGINE *);

            

            

              5
              
 void ENGINE_load_openssl(void);

            

            

              6
              
 void ENGINE_load_dynamic(void);

            

            

              7
              
-void ENGINE_load_cryptodev(void);

            

            

              8
              
 void ENGINE_load_builtin_engines(void);

            

            

              9
              
 void ENGINE_cleanup(void);

            

            

              10
              
 ENGINE *ENGINE_get_default_RSA(void);

            



(-)security/py-cryptography/files/patch-src_cryptography_hazmat_bindings_openssl_rand.py
      (-12 lines)




  

    
      
            Lines 1-12
          
      
      
        Link Here
      
    
  

            

              1
              
--- src/cryptography/hazmat/bindings/openssl/rand.py.orig	2015-01-16 13:26:59 UTC

              
              
            

            

              2
              
+++ src/cryptography/hazmat/bindings/openssl/rand.py

            

            

              3
              
@@ -16,9 +16,6 @@ void ERR_load_RAND_strings(void);

            

            

              4
              
 void RAND_seed(const void *, int);

            

            

              5
              
 void RAND_add(const void *, int, double);

            

            

              6
              
 int RAND_status(void);

            

            

              7
              
-int RAND_egd(const char *);

            

            

              8
              
-int RAND_egd_bytes(const char *, int);

            

            

              9
              
-int RAND_query_egd_bytes(const char *, unsigned char *, int);

            

            

              10
              
 const char *RAND_file_name(char *, size_t);

            

            

              11
              
 int RAND_load_file(const char *, long);

            

            

              12
              
 int RAND_write_file(const char *);

            



(-)security/py-cryptography/files/patch-src_cryptography_hazmat_bindings_openssl_ssl.py
      (-27 / +8 lines)




  

    
      
            Lines 1-30
          
      
      
        Link Here
      
    
  

          
            

              1
              
--- src/cryptography/hazmat/bindings/openssl/ssl.py.orig	2015-01-16 13:26:59 UTC


              1
              
--- src/cryptography/hazmat/bindings/openssl/ssl.py.orig	2015-04-21 08:58:58 UTC

            

        

          2
          
+++ src/cryptography/hazmat/bindings/openssl/ssl.py

          2
          
+++ src/cryptography/hazmat/bindings/openssl/ssl.py

        

          
            

              3
              
@@ -189,10 +189,6 @@ int SSL_shutdown(SSL *);


              3
              
@@ -526,7 +526,7 @@ static const long Cryptography_HAS_NEXTP

            

            

              4
              
 const char *SSL_get_cipher_list(const SSL *, int);


              
              
            

            

              5
              
 Cryptography_STACK_OF_SSL_CIPHER *SSL_get_ciphers(const SSL *);


            

            

              6
              
 


            

            

              7
              
-const COMP_METHOD *SSL_get_current_compression(SSL *);


            

            

              8
              
-const COMP_METHOD *SSL_get_current_expansion(SSL *);


            

            

              9
              
-const char *SSL_COMP_get_name(const COMP_METHOD *);


            

            

              10
              
-


            

            

              11
              
 /*  context */


            

            

              12
              
 void SSL_CTX_free(SSL_CTX *);


            

            

              13
              
 long SSL_CTX_set_timeout(SSL_CTX *, long);


            

            

              14
              
@@ -415,6 +411,16 @@ static const long Cryptography_HAS_RELEA


            

            

              15
              
 const long SSL_MODE_RELEASE_BUFFERS = 0;


            

        

          16
          
 #endif

          4
          
 #endif

        

        

          17
          
 

          5
          
 

        

          
            

              18
              
+#ifndef OPENSSL_NO_COMP


              6
              
 /* ALPN was added in OpenSSL 1.0.2. */

            

            

              19
              
+const COMP_METHOD *SSL_get_current_compression(SSL *s);


              7
              
-#if OPENSSL_VERSION_NUMBER < 0x10002001L

            

            

              20
              
+const COMP_METHOD *SSL_get_current_expansion(SSL *s);


              8
              
+#if OPENSSL_VERSION_NUMBER < 0x10002001L && !defined(LIBRESSL_VERSION_NUMBER)

            

            

              21
              
+const char *SSL_COMP_get_name(const COMP_METHOD *comp);


              9
              
 int (*SSL_CTX_set_alpn_protos)(SSL_CTX *,

            

            

              22
              
+#else


              10
              
                                const unsigned char *,

            

            

              23
              
+const void *SSL_get_current_compression(SSL *s);


              11
              
                                unsigned) = NULL;

            

            

              24
              
+const void *SSL_get_current_expansion(SSL *s);


              
              
            

            

              25
              
+const char *SSL_COMP_get_name(const void *comp);


            

            

              26
              
+#endif


            

            

              27
              
+


            

            

              28
              
 #ifdef SSL_OP_NO_COMPRESSION


            

            

              29
              
 static const long Cryptography_HAS_OP_NO_COMPRESSION = 1;


            

            

              30
              
 #else


            



(-)security/py-cryptography/files/patch-src_cryptography_hazmat_bindings_openssl_x509__vfy.py
      (-20 lines)




  

    
      
            Lines 1-20
          
      
      
        Link Here
      
    
  

            

              1
              
--- src/cryptography/hazmat/bindings/openssl/x509_vfy.py.orig	2015-01-16 13:26:59 UTC

              
              
            

            

              2
              
+++ src/cryptography/hazmat/bindings/openssl/x509_vfy.py

            

            

              3
              
@@ -191,7 +191,7 @@ int X509_VERIFY_PARAM_set1_ip_asc(X509_V

            

            

              4
              
 

            

            

              5
              
 CUSTOMIZATIONS = """

            

            

              6
              
 /* OpenSSL 1.0.2+ verification error codes */

            

            

              7
              
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L

            

            

              8
              
+#if X509_V_ERR_EMAIL_MISMATCH

            

            

              9
              
 static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 1;

            

            

              10
              
 #else

            

            

              11
              
 static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 0;

            

            

              12
              
@@ -207,7 +207,7 @@ static const long X509_V_ERR_IP_ADDRESS_

            

            

              13
              
 #endif

            

            

              14
              
 

            

            

              15
              
 /* OpenSSL 1.0.2+ verification parameters */

            

            

              16
              
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L

            

            

              17
              
+#if X509_V_FLAG_PARTIAL_CHAIN

            

            

              18
              
 static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1;

            

            

              19
              
 #else

            

            

              20
              
 static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 0;

            






  

  Return to bug 197049