Changeset 74094 in vbox for trunk/src

Timestamp:

Sep 5, 2018 9:03:06 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/http: Fixed two bugs in RTHttpSignHeaders, adding a testcase for it. bugref:9167

Location:

trunk/src/VBox/Runtime

Files:

• generic/http-curl.cpp (modified) (4 diffs)
• testcase/Makefile.kmk (modified) (2 diffs)
• testcase/tstRTHttp.cpp (deleted)

trunk/src/VBox/Runtime/generic/http-curl.cpp

@@ -2300 +2300 @@
     static const char s_szRequestField[] = "(request-target)";
     size_t const      cchKeyId           = strlen(pszKeyId);
-    size_t const      cbSigRaw           = (RTCrKeyGetBitCount(hKey) + 8) / 8; /** @todo ?? */
+    size_t const      cbSigRaw           = (RTCrKeyGetBitCount(hKey) + 7) / 8;
     size_t const      cbSigRawAligned    = RT_ALIGN_Z(cbSigRaw, 8);
     size_t const      cchSigStr          = RTBase64EncodedLengthEx(cbSigRaw, RTBASE64_FLAGS_NO_LINE_BREAKS);
@@ -2337 +2337 @@
         Assert(cbLeft > sizeof(s_szRequestField));
         memcpy(pszLeft, RT_STR_TUPLE(s_szRequestField));
-        pszLeft += sizeof(s_szRequestField);
+        pszLeft += sizeof(s_szRequestField) - 1;
 
         rc = RTCrDigestUpdate(hDigest, RT_STR_TUPLE(s_szRequestField));
@@ -2353 +2353 @@
         {
             AssertBreakStmt(cbLeft > pCur->cchName, rc = VERR_INTERNAL_ERROR_3);
+            *pszLeft++ = ' ';
+            cbLeft--;
             memcpy(pszLeft, pCur->szData, pCur->cchName);
             pszLeft[pCur->cchName] = '\0';
@@ -2368 +2370 @@
 
             pszLeft += pCur->cchName;
-            cbLeft -= pCur->cchName;
+            cbLeft  -= pCur->cchName;
         }
         if (RT_SUCCESS(rc))

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -174 +174 @@
 ifdef VBOX_WITH_LIBCURL
  PROGRAMS += \
-        tstRTHttp \
+        tstRTHttp-1 \
         tstRTS3
 endif
@@ -318 +318 @@
 
 ifdef VBOX_WITH_LIBCURL
-tstRTHttp_TEMPLATE = VBOXR3TSTEXE
-tstRTHttp_SOURCES = tstRTHttp.cpp
-tstRTHttp_SDKS = VBOX_LIBCURL
+tstRTHttp-1_TEMPLATE = VBOXR3TSTEXE
+tstRTHttp-1_SOURCES = tstRTHttp-1.cpp
+tstRTHttp-1_SDKS = VBOX_LIBCURL
 endif