View | Details | Raw Unified | Return to bug 239491
Collapse All | Expand All

(-)Makefile (+1 lines)
Lines 3-8 Link Here
3 

          3
          

        

        

          4
          
PORTNAME=	strongswan

          4
          
PORTNAME=	strongswan

        

        

          5
          
PORTVERSION=	5.8.0

          5
          
PORTVERSION=	5.8.0

        

            

              
              
              6
              
PORTREVISION=	1

            

        

          6
          
CATEGORIES=	security

          7
          
CATEGORIES=	security

        

        

          7
          
MASTER_SITES=	http://download.strongswan.org/ \

          8
          
MASTER_SITES=	http://download.strongswan.org/ \

        

        

          8
          
		http://download2.strongswan.org/

          9
          
		http://download2.strongswan.org/

        



(-)files/patch-src_libstrongswan_plugins_openssl_openssl__ed__private__key.c
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- src/libstrongswan/plugins/openssl/openssl_ed_private_key.c.orig	2019-07-31 10:17:06 UTC

            

            

              2
              
+++ src/libstrongswan/plugins/openssl/openssl_ed_private_key.c

            

            

              3
              
@@ -15,7 +15,7 @@

            

            

              4
              
 

            

            

              5
              
 #include <openssl/evp.h>

            

            

              6
              
 

            

            

              7
              
-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC)

            

            

              8
              
+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER)

            

            

              9
              
 

            

            

              10
              
 #include "openssl_ed_private_key.h"

            

            

              11
              
 

            



(-)files/patch-src_libstrongswan_plugins_openssl_openssl__ed__public__key.c
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- src/libstrongswan/plugins/openssl/openssl_ed_public_key.c.orig	2019-07-31 10:17:19 UTC

            

            

              2
              
+++ src/libstrongswan/plugins/openssl/openssl_ed_public_key.c

            

            

              3
              
@@ -15,7 +15,7 @@

            

            

              4
              
 

            

            

              5
              
 #include <openssl/evp.h>

            

            

              6
              
 

            

            

              7
              
-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC)

            

            

              8
              
+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER)

            

            

              9
              
 

            

            

              10
              
 #include <openssl/x509.h>

            

            

              11
              
 

            



(-)files/patch-src_libstrongswan_plugins_openssl_openssl__plugin.c
      (-2 / +20 lines)




  

    
      
            Lines 1-6
          
      
      
        Link Here
      
    
  

          
            

              1
              
--- src/libstrongswan/plugins/openssl/openssl_plugin.c.orig	2018-12-14 15:48:24 UTC


              1
              
--- src/libstrongswan/plugins/openssl/openssl_plugin.c.orig	2019-03-14 13:20:42 UTC

            

        

          2
          
+++ src/libstrongswan/plugins/openssl/openssl_plugin.c

          2
          
+++ src/libstrongswan/plugins/openssl/openssl_plugin.c

        

          
            

              3
              
@@ -810,7 +810,7 @@ plugin_t *openssl_plugin_create()


              3
              
@@ -310,7 +310,7 @@ static private_key_t *openssl_private_key_load(key_typ

            

            

              
              

              4
              
 				case EVP_PKEY_EC:

            

            


              5
              
 					return openssl_ec_private_key_create(key, FALSE);

            

            


              6
              
 #endif

            

            


              7
              
-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC)

            

            


              8
              
+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER)

            

            


              9
              
 				case EVP_PKEY_ED25519:

            

            


              10
              
 				case EVP_PKEY_ED448:

            

            


              11
              
 					return openssl_ed_private_key_create(key, FALSE);

            

            


              12
              
@@ -462,7 +462,7 @@ static private_key_t *openssl_private_key_connect(key_

            

            


              13
              
 		case EVP_PKEY_EC:

            

            


              14
              
 			return openssl_ec_private_key_create(key, TRUE);

            

            


              15
              
 #endif

            

            


              16
              
-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC)

            

            


              17
              
+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER)

            

            


              18
              
 		case EVP_PKEY_ED25519:

            

            


              19
              
 		case EVP_PKEY_ED448:

            

            


              20
              
 			return openssl_ed_private_key_create(key, TRUE);

            

            


              21
              
@@ -814,7 +814,7 @@ plugin_t *openssl_plugin_create()

            

        

          4
          
 		},

          22
          
 		},

        

        

          5
          
 	);

          23
          
 	);

        

        

          6
          
 

          24
          
 

        



(-)files/patch-src_libstrongswan_plugins_openssl_openssl__x__diffie__hellman.c
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- src/libstrongswan/plugins/openssl/openssl_x_diffie_hellman.c.orig	2019-07-31 10:16:04 UTC

            

            

              2
              
+++ src/libstrongswan/plugins/openssl/openssl_x_diffie_hellman.c

            

            

              3
              
@@ -17,7 +17,7 @@

            

            

              4
              
 

            

            

              5
              
 /* basic support for X25519 was added with 1.1.0a, but we require features (e.g.

            

            

              6
              
  * to load the keys) that were only added with 1.1.1 */

            

            

              7
              
-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_ECDH)

            

            

              8
              
+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_ECDH) && !defined(LIBRESSL_VERSION_NUMBER)

            

            

              9
              
 

            

            

              10
              
 #include "openssl_x_diffie_hellman.h"

            

            

              11
              
 

            






  

  Return to bug 239491