From 21ff2886fff9a99ebf80b416acc84c0e72472807 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 26 Nov 2020 23:26:36 -0600 Subject: [PATCH] Use system mbedtls on Linux --- .gitlab-ci.yml | 4 +- OpenRGB.pro | 177 +++++++++++++++++++++++++------------------------ debian/control | 1 + 3 files changed, 93 insertions(+), 89 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6274bef49..5326d9f7e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -143,7 +143,7 @@ before_script: stage: build script: - apt update - - apt install -y build-essential qtcreator qtbase5-dev libusb-1.0-0-dev libhidapi-dev pkgconf wget git file debhelper + - apt install -y build-essential qtcreator qtbase5-dev libusb-1.0-0-dev libhidapi-dev libmbedtls-dev pkgconf wget git file debhelper - dpkg-architecture -l - dpkg-buildpackage --target-arch i386 -us -B - rm -v ../openrgb-dbgsym*.deb @@ -166,7 +166,7 @@ before_script: stage: build script: - apt update - - apt install -y build-essential qtcreator qtbase5-dev libusb-1.0-0-dev libhidapi-dev pkgconf wget git file debhelper + - apt install -y build-essential qtcreator qtbase5-dev libusb-1.0-0-dev libhidapi-dev libmbedtls-dev pkgconf wget git file debhelper - dpkg-architecture -l - dpkg-buildpackage -us -B - rm -v ../openrgb-dbgsym*.deb diff --git a/OpenRGB.pro b/OpenRGB.pro index e2f4d2715..8b6889def 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -55,7 +55,6 @@ INCLUDEPATH += dependencies/json/ \ dependencies/libe131/src/ \ dependencies/libcmmk/include/ \ - dependencies/mbedtls/include \ i2c_smbus/ \ i2c_tools/ \ net_port/ \ @@ -413,92 +412,6 @@ SOURCES += dependencies/hueplusplus/src/ZLLSensors.cpp \ dependencies/libe131/src/e131.c \ dependencies/libcmmk/src/libcmmk.c \ - dependencies/mbedtls/library/aes.c \ - dependencies/mbedtls/library/aesni.c \ - dependencies/mbedtls/library/arc4.c \ - dependencies/mbedtls/library/aria.c \ - dependencies/mbedtls/library/asn1parse.c \ - dependencies/mbedtls/library/asn1write.c \ - dependencies/mbedtls/library/base64.c \ - dependencies/mbedtls/library/bignum.c \ - dependencies/mbedtls/library/blowfish.c \ - dependencies/mbedtls/library/camellia.c \ - dependencies/mbedtls/library/ccm.c \ - dependencies/mbedtls/library/certs.c \ - dependencies/mbedtls/library/chacha20.c \ - dependencies/mbedtls/library/chachapoly.c \ - dependencies/mbedtls/library/cipher.c \ - dependencies/mbedtls/library/cipher_wrap.c \ - dependencies/mbedtls/library/cmac.c \ - dependencies/mbedtls/library/ctr_drbg.c \ - dependencies/mbedtls/library/debug.c \ - dependencies/mbedtls/library/des.c \ - dependencies/mbedtls/library/dhm.c \ - dependencies/mbedtls/library/ecdh.c \ - dependencies/mbedtls/library/ecdsa.c \ - dependencies/mbedtls/library/ecjpake.c \ - dependencies/mbedtls/library/ecp.c \ - dependencies/mbedtls/library/ecp_curves.c \ - dependencies/mbedtls/library/entropy.c \ - dependencies/mbedtls/library/entropy_poll.c \ - dependencies/mbedtls/library/error.c \ - dependencies/mbedtls/library/gcm.c \ - dependencies/mbedtls/library/havege.c \ - dependencies/mbedtls/library/hkdf.c \ - dependencies/mbedtls/library/hmac_drbg.c \ - dependencies/mbedtls/library/md.c \ - dependencies/mbedtls/library/md2.c \ - dependencies/mbedtls/library/md4.c \ - dependencies/mbedtls/library/md5.c \ - dependencies/mbedtls/library/memory_buffer_alloc.c \ - dependencies/mbedtls/library/net_sockets.c \ - dependencies/mbedtls/library/nist_kw.c \ - dependencies/mbedtls/library/oid.c \ - dependencies/mbedtls/library/padlock.c \ - dependencies/mbedtls/library/pem.c \ - dependencies/mbedtls/library/pk.c \ - dependencies/mbedtls/library/pk_wrap.c \ - dependencies/mbedtls/library/pkcs5.c \ - dependencies/mbedtls/library/pkcs11.c \ - dependencies/mbedtls/library/pkcs12.c \ - dependencies/mbedtls/library/pkparse.c \ - dependencies/mbedtls/library/pkwrite.c \ - dependencies/mbedtls/library/platform.c \ - dependencies/mbedtls/library/platform_util.c \ - dependencies/mbedtls/library/poly1305.c \ - dependencies/mbedtls/library/psa_crypto.c \ - dependencies/mbedtls/library/psa_crypto_driver_wrappers.c \ - dependencies/mbedtls/library/psa_crypto_se.c \ - dependencies/mbedtls/library/psa_crypto_slot_management.c \ - dependencies/mbedtls/library/psa_crypto_storage.c \ - dependencies/mbedtls/library/psa_its_file.c \ - dependencies/mbedtls/library/ripemd160.c \ - dependencies/mbedtls/library/rsa.c \ - dependencies/mbedtls/library/rsa_internal.c \ - dependencies/mbedtls/library/sha1.c \ - dependencies/mbedtls/library/sha256.c \ - dependencies/mbedtls/library/sha512.c \ - dependencies/mbedtls/library/ssl_cache.c \ - dependencies/mbedtls/library/ssl_ciphersuites.c \ - dependencies/mbedtls/library/ssl_cli.c \ - dependencies/mbedtls/library/ssl_cookie.c \ - dependencies/mbedtls/library/ssl_msg.c \ - dependencies/mbedtls/library/ssl_srv.c \ - dependencies/mbedtls/library/ssl_ticket.c \ - dependencies/mbedtls/library/ssl_tls.c \ - dependencies/mbedtls/library/ssl_tls13_keys.c \ - dependencies/mbedtls/library/threading.c \ - dependencies/mbedtls/library/timing.c \ - dependencies/mbedtls/library/version.c \ - dependencies/mbedtls/library/version_features.c \ - dependencies/mbedtls/library/x509.c \ - dependencies/mbedtls/library/x509_create.c \ - dependencies/mbedtls/library/x509_crl.c \ - dependencies/mbedtls/library/x509_crt.c \ - dependencies/mbedtls/library/x509_csr.c \ - dependencies/mbedtls/library/x509write_crt.c \ - dependencies/mbedtls/library/x509write_csr.c \ - dependencies/mbedtls/library/xtea.c \ main.cpp \ cli.cpp \ LogManager.cpp \ @@ -825,6 +738,7 @@ win32:INCLUDEPATH += dependencies/hidapi \ dependencies/inpout32_1501/Win32/ \ dependencies/libusb-1.0.22/include \ + dependencies/mbedtls/include \ dependencies/NVFC \ dependencies/openrazer-win32 \ wmi/ \ @@ -833,6 +747,92 @@ win32:INCLUDEPATH += win32:SOURCES += \ # dependencies/hidapi/hidapi.c \ dependencies/hueplusplus/src/WinHttpHandler.cpp \ + dependencies/mbedtls/library/aes.c \ + dependencies/mbedtls/library/aesni.c \ + dependencies/mbedtls/library/arc4.c \ + dependencies/mbedtls/library/aria.c \ + dependencies/mbedtls/library/asn1parse.c \ + dependencies/mbedtls/library/asn1write.c \ + dependencies/mbedtls/library/base64.c \ + dependencies/mbedtls/library/bignum.c \ + dependencies/mbedtls/library/blowfish.c \ + dependencies/mbedtls/library/camellia.c \ + dependencies/mbedtls/library/ccm.c \ + dependencies/mbedtls/library/certs.c \ + dependencies/mbedtls/library/chacha20.c \ + dependencies/mbedtls/library/chachapoly.c \ + dependencies/mbedtls/library/cipher.c \ + dependencies/mbedtls/library/cipher_wrap.c \ + dependencies/mbedtls/library/cmac.c \ + dependencies/mbedtls/library/ctr_drbg.c \ + dependencies/mbedtls/library/debug.c \ + dependencies/mbedtls/library/des.c \ + dependencies/mbedtls/library/dhm.c \ + dependencies/mbedtls/library/ecdh.c \ + dependencies/mbedtls/library/ecdsa.c \ + dependencies/mbedtls/library/ecjpake.c \ + dependencies/mbedtls/library/ecp.c \ + dependencies/mbedtls/library/ecp_curves.c \ + dependencies/mbedtls/library/entropy.c \ + dependencies/mbedtls/library/entropy_poll.c \ + dependencies/mbedtls/library/error.c \ + dependencies/mbedtls/library/gcm.c \ + dependencies/mbedtls/library/havege.c \ + dependencies/mbedtls/library/hkdf.c \ + dependencies/mbedtls/library/hmac_drbg.c \ + dependencies/mbedtls/library/md.c \ + dependencies/mbedtls/library/md2.c \ + dependencies/mbedtls/library/md4.c \ + dependencies/mbedtls/library/md5.c \ + dependencies/mbedtls/library/memory_buffer_alloc.c \ + dependencies/mbedtls/library/net_sockets.c \ + dependencies/mbedtls/library/nist_kw.c \ + dependencies/mbedtls/library/oid.c \ + dependencies/mbedtls/library/padlock.c \ + dependencies/mbedtls/library/pem.c \ + dependencies/mbedtls/library/pk.c \ + dependencies/mbedtls/library/pk_wrap.c \ + dependencies/mbedtls/library/pkcs5.c \ + dependencies/mbedtls/library/pkcs11.c \ + dependencies/mbedtls/library/pkcs12.c \ + dependencies/mbedtls/library/pkparse.c \ + dependencies/mbedtls/library/pkwrite.c \ + dependencies/mbedtls/library/platform.c \ + dependencies/mbedtls/library/platform_util.c \ + dependencies/mbedtls/library/poly1305.c \ + dependencies/mbedtls/library/psa_crypto.c \ + dependencies/mbedtls/library/psa_crypto_driver_wrappers.c \ + dependencies/mbedtls/library/psa_crypto_se.c \ + dependencies/mbedtls/library/psa_crypto_slot_management.c \ + dependencies/mbedtls/library/psa_crypto_storage.c \ + dependencies/mbedtls/library/psa_its_file.c \ + dependencies/mbedtls/library/ripemd160.c \ + dependencies/mbedtls/library/rsa.c \ + dependencies/mbedtls/library/rsa_internal.c \ + dependencies/mbedtls/library/sha1.c \ + dependencies/mbedtls/library/sha256.c \ + dependencies/mbedtls/library/sha512.c \ + dependencies/mbedtls/library/ssl_cache.c \ + dependencies/mbedtls/library/ssl_ciphersuites.c \ + dependencies/mbedtls/library/ssl_cli.c \ + dependencies/mbedtls/library/ssl_cookie.c \ + dependencies/mbedtls/library/ssl_msg.c \ + dependencies/mbedtls/library/ssl_srv.c \ + dependencies/mbedtls/library/ssl_ticket.c \ + dependencies/mbedtls/library/ssl_tls.c \ + dependencies/mbedtls/library/ssl_tls13_keys.c \ + dependencies/mbedtls/library/threading.c \ + dependencies/mbedtls/library/timing.c \ + dependencies/mbedtls/library/version.c \ + dependencies/mbedtls/library/version_features.c \ + dependencies/mbedtls/library/x509.c \ + dependencies/mbedtls/library/x509_create.c \ + dependencies/mbedtls/library/x509_crl.c \ + dependencies/mbedtls/library/x509_crt.c \ + dependencies/mbedtls/library/x509_csr.c \ + dependencies/mbedtls/library/x509write_crt.c \ + dependencies/mbedtls/library/x509write_csr.c \ + dependencies/mbedtls/library/xtea.c \ dependencies/NVFC/nvapi.cpp \ i2c_smbus/i2c_smbus_amdadl.cpp \ i2c_smbus/i2c_smbus_i801.cpp \ @@ -955,6 +955,9 @@ unix:!macx { LIBS += \ -lusb-1.0 \ -lstdc++fs \ + -lmbedx509 \ + -lmbedcrypto \ + -lmbedtls \ #-------------------------------------------------------------------------------------------# # Determine which hidapi to use based on availability # diff --git a/debian/control b/debian/control index 4986306f8..320a07d52 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: qt5-qmake, libusb-1.0-0-dev, libhidapi-dev, + libmbedtls-dev, Homepage: https://gitlab.com/CalcProgrammer1/OpenRGB Package: openrgb