Changeset 45398 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Apr 8, 2013 9:32:00 AM (12 years ago)

Author:

vboxsync

Message:

Runtime/http: more error codes

File:

• trunk/src/VBox/Runtime/common/misc/http.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/common/misc/http.cpp

@@ -35 +35 @@
 #include <iprt/string.h>
 #include <iprt/file.h>
+#include <iprt/stream.h>
 
 #include <curl/curl.h>
@@ -90 +91 @@
     CURLcode rcCurl = curl_global_init(CURL_GLOBAL_ALL);
     if (CURL_FAILED(rcCurl))
-        return VERR_INTERNAL_ERROR;
+        return VERR_HTTP_INIT_FAILED;
 
     CURL *pCurl = curl_easy_init();
     if (!pCurl)
-        return VERR_INTERNAL_ERROR;
+        return VERR_HTTP_INIT_FAILED;
 
     PRTHTTPINTERNAL pHttpInt = (PRTHTTPINTERNAL)RTMemAllocZ(sizeof(RTHTTPINTERNAL));
@@ -237 +238 @@
                     }
                     else
-                        rc = VERR_INTERNAL_ERROR;
+                        rc = VERR_HTTP_CACERT_WRONG_FORMAT;
                 }
                 else
@@ -243 +244 @@
             }
             else
-                rc = VERR_INTERNAL_ERROR;
+                rc = VERR_HTTP_CACERT_WRONG_FORMAT;
             X509_free(crt);
         }
         else
-            rc = VERR_INTERNAL_ERROR;
+            rc = VERR_HTTP_CACERT_WRONG_FORMAT;
         BIO_free(cert);
     }
@@ -334 +335 @@
     else
     {
+        RTPrintf("rcCurl = %d\n", rcCurl);
         switch (rcCurl)
         {
@@ -343 +345 @@
                 rc = VERR_HTTP_COULDNT_CONNECT;
                 break;
+            case CURLE_SSL_CONNECT_ERROR:
+                rc = VERR_HTTP_SSL_CONNECT_ERROR;
+                break;
+            case CURLE_SSL_CACERT:
+                /* The peer certificate cannot be authenticated with the CA certificates
+                 * set by RTHttpSetCAFile(). We need other or additional CA certificates. */
+                rc = VERR_HTTP_CACERT_CANNOT_AUTHENTICATE;
+                break;
+            case CURLE_SSL_CACERT_BADFILE:
+                /* CAcert file (see RTHttpSetCAFile()) has wrong format */
+                rc = VERR_HTTP_CACERT_WRONG_FORMAT;
+                break;
             default:
                 break;