Don't pass empty sslCryptoProvider parameter in HANA

qgis · Dec 7, 2020 · 0c9ea7a · 0c9ea7a
1 parent b9ab4c2
commit 0c9ea7a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/providers/hana/qgshanaconnectionstringbuilder.cpp b/src/providers/hana/qgshanaconnectionstringbuilder.cpp
@@ -49,10 +49,11 @@ QString QgsHanaConnectionStringBuilder::toString() const
   if ( mSslEnabled )
   {
     ret += QStringLiteral( ";encrypt=true" );
-    ret += QStringLiteral( ";sslCryptoProvider=" ) + mSslCryptoProvider;
+    if ( !mSslCryptoProvider.isEmpty() )
+      ret += QStringLiteral( ";sslCryptoProvider=" ) + mSslCryptoProvider;
     ret += QStringLiteral( ";sslValidateCertificate=" ) + QString( mSslValidateCertificate ? QStringLiteral( "true" ) : QStringLiteral( "false" ) );
-    if ( mSslValidateCertificate )
-      ret += QStringLiteral( ";sslHostNameInCertificate=" ) + mSslValidateCertificate;
+    if ( !mSslHostNameInCertificate.isEmpty() )
+      ret += QStringLiteral( ";sslHostNameInCertificate=" ) + mSslHostNameInCertificate;
     if ( !mSslKeyStore.isEmpty() )
       ret += QStringLiteral( ";sslKeyStore=" ) + mSslKeyStore;
     if ( !mSslKeyStore.isEmpty() )

diff --git a/src/providers/hana/qgshanasettings.cpp b/src/providers/hana/qgshanasettings.cpp
@@ -105,7 +105,8 @@ QgsDataSourceUri QgsHanaSettings::toDataSourceUri() const
   if ( mSslEnabled )
   {
     uri.setParam( QStringLiteral( "sslEnabled" ), QStringLiteral( "true" ) );
-    uri.setParam( QStringLiteral( "sslCryptoProvider" ), mSslCryptoProvider );
+    if ( !mSslCryptoProvider.isEmpty() )
+      uri.setParam( QStringLiteral( "sslCryptoProvider" ), mSslCryptoProvider );
     uri.setParam( QStringLiteral( "sslValidateCertificate" ), mSslValidateCertificate ? QStringLiteral( "true" ) : QStringLiteral( "false" ) );
     if ( !mSslHostNameInCertificate.isEmpty() )
       uri.setParam( QStringLiteral( "sslHostNameInCertificate" ), mSslHostNameInCertificate );