summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/ssl.pri
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2014-08-23 12:46:05 +0200
committerOliver Wolff <oliver.wolff@digia.com>2014-08-24 06:01:05 +0200
commit4040bc21ab09408cb6f188c4c747fb55499d9f5c (patch)
tree756a57c1a0f7590082d55e9d76467991bf375bbc /src/network/ssl/ssl.pri
parent2d0072b0b3992b82385c72c2dad7e754d35e0bf7 (diff)
Added QAsn1Element
This element can be used for backends that do not offer all the information that is needed when implementing a ssl certificate backend. WinRT and the SecureTransport lack functionality in this area for example. The sources and tests are added for ssl and openssl configurations in order to be tested. The condition for adding these can be changed as soon as they are used by an actual implementation Change-Id: I2b836133105afdc178bf3b1ee7d732bea069effa Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Diffstat (limited to 'src/network/ssl/ssl.pri')
-rw-r--r--src/network/ssl/ssl.pri6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
index 0fbeb1d369..f7dceeb579 100644
--- a/src/network/ssl/ssl.pri
+++ b/src/network/ssl/ssl.pri
@@ -1,6 +1,7 @@
# OpenSSL support; compile in QSslSocket.
contains(QT_CONFIG, ssl) | contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
- HEADERS += ssl/qssl.h \
+ HEADERS += ssl/qasn1element_p.h \
+ ssl/qssl.h \
ssl/qsslcertificate.h \
ssl/qsslcertificate_p.h \
ssl/qsslconfiguration.h \
@@ -14,7 +15,8 @@ contains(QT_CONFIG, ssl) | contains(QT_CONFIG, openssl) | contains(QT_CONFIG, op
ssl/qsslsocket_p.h \
ssl/qsslcertificateextension.h \
ssl/qsslcertificateextension_p.h
- SOURCES += ssl/qssl.cpp \
+ SOURCES += ssl/qasn1element.cpp \
+ ssl/qssl.cpp \
ssl/qsslcertificate.cpp \
ssl/qsslconfiguration.cpp \
ssl/qsslcipher.cpp \