From ffbfd8eda691be9e6814187015d87dffc2b0d58f Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Wed, 3 Sep 2014 11:12:12 +0200 Subject: SSL: Add support for selecting which curves should be used by an elliptic cipher [ChangeLog][QtNetwork][QtSSL] It is now possible to choose which elliptic curves should be used by an elliptic curve cipher. Change-Id: If5d0d58922768b6f1375836489180e576f5a015a Done-with: Marc Mutz Reviewed-by: Richard J. Moore --- src/network/ssl/ssl.pri | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/network/ssl/ssl.pri') diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri index 384e149241..85fd6fc3f5 100644 --- a/src/network/ssl/ssl.pri +++ b/src/network/ssl/ssl.pri @@ -8,6 +8,7 @@ contains(QT_CONFIG, ssl) | contains(QT_CONFIG, openssl) | contains(QT_CONFIG, op ssl/qsslconfiguration_p.h \ ssl/qsslcipher.h \ ssl/qsslcipher_p.h \ + ssl/qsslellipticcurve.h \ ssl/qsslerror.h \ ssl/qsslkey.h \ ssl/qsslkey_p.h \ @@ -20,6 +21,7 @@ contains(QT_CONFIG, ssl) | contains(QT_CONFIG, openssl) | contains(QT_CONFIG, op ssl/qsslcertificate.cpp \ ssl/qsslconfiguration.cpp \ ssl/qsslcipher.cpp \ + ssl/qsslellipticcurve.cpp \ ssl/qsslkey_p.cpp \ ssl/qsslerror.cpp \ ssl/qsslsocket.cpp \ @@ -31,7 +33,8 @@ contains(QT_CONFIG, ssl) | contains(QT_CONFIG, openssl) | contains(QT_CONFIG, op ssl/qsslcertificate_winrt.cpp \ ssl/qsslkey_qt.cpp \ ssl/qsslkey_winrt.cpp \ - ssl/qsslsocket_winrt.cpp + ssl/qsslsocket_winrt.cpp \ + ssl/qsslellipticcurve_dummy.cpp } } @@ -41,6 +44,7 @@ contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { ssl/qsslsocket_openssl_symbols_p.h SOURCES += ssl/qsslcertificate_openssl.cpp \ ssl/qsslcontext_openssl.cpp \ + ssl/qsslellipticcurve_openssl.cpp \ ssl/qsslkey_openssl.cpp \ ssl/qsslsocket_openssl.cpp \ ssl/qsslsocket_openssl_symbols.cpp -- cgit v1.2.3