openssl: add libressl as a provider

At this point, libressl can be added to the openssl virtual package.

- Remove the entry package/libressl/Config.in from package/Config.in
- Remove the file: package/libressl/Config.in
- Add libressl entry to package/openssl/Config.in

Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/Config.in b/package/Config.in
index 2a2df47a63161cb8f92b36ce72a67e3733e8cc36..55fe80139eaa55baabac678babd0ba3d3583c57c 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -1031,8 +1031,6 @@ menu "Crypto"
        source "package/libuecc/Config.in"
        source "package/mbedtls/Config.in"
        source "package/nettle/Config.in"
-       # libressl is a openssl replacement
-       source "package/libressl/Config.in"
        source "package/openssl/Config.in"
        source "package/rhash/Config.in"
        source "package/tinydtls/Config.in"

diff --git a/package/libressl/Config.in b/package/libressl/Config.in
deleted file mode 100644 (file)
index 0a1c9e2..0000000
--- a/package/libressl/Config.in
+++ /dev/null
@@ -1,20 +0,0 @@
-config BR2_PACKAGE_LIBRESSL
-       bool "libressl"
-       depends on !BR2_PACKAGE_OPENSSL
-       help
-         LibreSSL is a version of the TLS/crypto stack forked from
-         OpenSSL in 2014, with goals of modernizing the codebase,
-         improving security, and applying best practice development
-         processes.
-
-         http://www.libressl.org/
-
-if BR2_PACKAGE_LIBRESSL
-
-config BR2_PACKAGE_LIBRESSL_BIN
-       bool "openssl binary"
-       help
-         Install the openssl binary to the target file system. This is
-         a command line tool for doing various cryptographic stuff.
-
-endif

diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index b8d106ffb78e3a8178cc5c90847693b23a66d457..df1d1172578b45b9e8b7653994dcac8e3044c670 100644 (file)
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -13,7 +13,7 @@ choice
        prompt "ssl library"
        default BR2_PACKAGE_LIBOPENSSL
        help
-         Select OpenSSL.
+         Select OpenSSL or LibreSSL.
 
 config BR2_PACKAGE_LIBOPENSSL
        bool "openssl"
@@ -45,6 +45,27 @@ config BR2_PACKAGE_LIBOPENSSL_ENGINES
 
 endif
 
+config BR2_PACKAGE_LIBRESSL
+       bool "libressl"
+       depends on !BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
+       help
+         LibreSSL is a version of the TLS/crypto stack forked from
+         OpenSSL in 2014, with goals of modernizing the codebase,
+         improving security, and applying best practice development
+         processes.
+
+         http://www.libressl.org/
+
+if BR2_PACKAGE_LIBRESSL
+
+config BR2_PACKAGE_LIBRESSL_BIN
+       bool "openssl binary"
+       help
+         Install the openssl binary to the target file system. This is
+         a command line tool for doing various cryptographic stuff.
+
+endif
+
 endchoice
 
 config BR2_PACKAGE_HAS_OPENSSL
@@ -53,6 +74,7 @@ config BR2_PACKAGE_HAS_OPENSSL
 config BR2_PACKAGE_PROVIDES_OPENSSL
        string
        default "libopenssl"  if BR2_PACKAGE_LIBOPENSSL
+       default "libressl"  if BR2_PACKAGE_LIBRESSL
 
 config BR2_PACKAGE_PROVIDES_HOST_OPENSSL
        string