summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
diff options
context:
space:
mode:
Diffstat (limited to 'src/network/ssl')
-rw-r--r--src/network/ssl/qsslcertificate.cpp8
-rw-r--r--src/network/ssl/qsslkey.cpp1
-rw-r--r--src/network/ssl/qsslsocket.cpp2
3 files changed, 11 insertions, 0 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index af60d8fed0..95b8a8e8fa 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -104,6 +104,12 @@
\value CountryName "C" The country.
\value StateOrProvinceName "ST" The state or province.
+
+ \value DistinguishedNameQualifier The distinguished name qualifier
+
+ \value SerialNumber The certificate's serial number
+
+ \value EmailAddress The email address associated with the certificate
*/
#include "qsslsocket_openssl_symbols_p.h"
@@ -398,6 +404,7 @@ QStringList QSslCertificate::subjectInfo(const QByteArray &attribute) const
}
/*!
+ \since 5.0
Returns a list of the attributes that have values in the subject
information of this certificate. The information associated
with a given attribute can be accessed using the subjectInfo()
@@ -418,6 +425,7 @@ QList<QByteArray> QSslCertificate::subjectInfoAttributes() const
}
/*!
+ \since 5.0
Returns a list of the attributes that have values in the issuer
information of this certificate. The information associated
with a given attribute can be accessed using the issuerInfo()
diff --git a/src/network/ssl/qsslkey.cpp b/src/network/ssl/qsslkey.cpp
index c1dcf7d223..e934a2e383 100644
--- a/src/network/ssl/qsslkey.cpp
+++ b/src/network/ssl/qsslkey.cpp
@@ -269,6 +269,7 @@ QSslKey::QSslKey(QIODevice *device, QSsl::KeyAlgorithm algorithm, QSsl::Encoding
}
/*!
+ \since 5.0
Constructs a QSslKey from a valid native key \a handle.
\a type specifies whether the key is public or private.
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 27c0123fbd..cfc59fd575 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -1608,6 +1608,7 @@ bool QSslSocket::supportsSsl()
}
/*!
+ \since 5.0
Returns the version number of the SSL library in use. Note that
this is the version of the library in use at run-time not compile
time. If no SSL support is available then this will return an
@@ -1619,6 +1620,7 @@ long QSslSocket::sslLibraryVersionNumber()
}
/*!
+ \since 5.0
Returns the version string of the SSL library in use. Note that
this is the version of the library in use at run-time not compile
time. If no SSL support is available then this will return an empty value.