Changeset 74340 in vbox for trunk/src/VBox/Runtime/common/crypto

Timestamp:

Sep 18, 2018 11:06:39 AM (6 years ago)

Author:

vboxsync

Message:

IPRT/ssl: Couple of fixes. bugref:9246

File:

• trunk/src/VBox/Runtime/common/crypto/ssl-openssl.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/crypto/ssl-openssl.cpp

@@ -184 +184 @@
 
     int rcOssl = SSL_CTX_use_certificate_file(pThis->pCtx, pszFile,
-                                              RTCRSSL_FILE_F_ASN1 & fFlags ? SSL_FILETYPE_PEM : SSL_FILETYPE_ASN1);
+                                              RTCRSSL_FILE_F_ASN1 & fFlags ? SSL_FILETYPE_ASN1 : SSL_FILETYPE_PEM);
     if (rcOssl != 0)
         return VINF_SUCCESS;
@@ -199 +199 @@
 
     int rcOssl = SSL_CTX_use_PrivateKey_file(pThis->pCtx, pszFile,
-                                             RTCRSSL_FILE_F_ASN1 & fFlags ? SSL_FILETYPE_PEM : SSL_FILETYPE_ASN1);
+                                             RTCRSSL_FILE_F_ASN1 & fFlags ? SSL_FILETYPE_ASN1 : SSL_FILETYPE_PEM);
     if (rcOssl != 0)
         return VINF_SUCCESS;
@@ -393 +393 @@
     AssertPtrNull(pszBuf);
     AssertPtrNull(pcbActual);
-    if (*pcbActual)
-        pcbActual = 0;
+    if (pcbActual)
+        *pcbActual = 0;
 
     /*
@@ -413 +413 @@
                  */
                 size_t cbNeeded = strlen(pszSrc) + 1;
-                if (*pcbActual)
+                if (pcbActual)
                     *pcbActual = cbNeeded;