From 95e9b93a771f09d4f8dcff87f99dfdd2b955acfa Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 20 Jan 2015 14:45:59 +0100 Subject: [PATCH] QSslEllipticCurve: don't call QSslSocketPrivate::ensureInitialized() in const functions Rationale: the case of an invalid QSslEllipticCurve is already dealt with before we'd call ensureInitialized(). But in order to have a non-invalid QSslEllipticCurve, we must have called one of the constructor functions first. There, we already call ensureInitialized(), so we don't need to do it here again. Change-Id: I96bdb5db63ec0165e6b8fac9469b5d81c6b2cdae Reviewed-by: Giuseppe D'Angelo --- src/network/ssl/qsslellipticcurve_openssl.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/network/ssl/qsslellipticcurve_openssl.cpp b/src/network/ssl/qsslellipticcurve_openssl.cpp index e44d85e397..e77b39f15e 100644 --- a/src/network/ssl/qsslellipticcurve_openssl.cpp +++ b/src/network/ssl/qsslellipticcurve_openssl.cpp @@ -55,8 +55,6 @@ QString QSslEllipticCurve::shortName() const if (id == 0) return QString(); - QSslSocketPrivate::ensureInitialized(); - QString result; #ifndef OPENSSL_NO_EC result = QString::fromLatin1(q_OBJ_nid2sn(id)); @@ -69,8 +67,6 @@ QString QSslEllipticCurve::longName() const if (id == 0) return QString(); - QSslSocketPrivate::ensureInitialized(); - QString result; #ifndef OPENSSL_NO_EC result = QString::fromLatin1(q_OBJ_nid2ln(id));