Changeset 66295 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Mar 28, 2017 11:51:16 AM (8 years ago)

Author:

vboxsync

Message:

VBoxManage extpack install: Lower case the digest; use stack buffer for digest too; don't convert the license to UTF-8 twice.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -1144 +1144 @@
                 case 'a':
                     lstLicenseHashes.append(ValueUnion.psz);
+                    lstLicenseHashes[lstLicenseHashes.size() - 1].toLower();
                     break;
 
@@ -1181 +1182 @@
             Utf8Str strLicense(bstrLicense);
             uint8_t abHash[RTSHA256_HASH_SIZE];
+            char    szDigest[RTSHA256_DIGEST_LEN + 1];
             RTSha256(strLicense.c_str(), strLicense.length(), abHash);
-            char *pszDigest = NULL;
-            vrc = RTStrAllocEx(&pszDigest, RTSHA256_DIGEST_LEN + 1);
-            if (RT_SUCCESS(vrc))
-                RTSha256ToString(abHash, pszDigest, RTSHA256_DIGEST_LEN + 1);
-            if (   pszDigest
-                && lstLicenseHashes.contains(pszDigest))
+            vrc = RTSha256ToString(abHash, szDigest, sizeof(szDigest));
+            AssertRCStmt(vrc, szDigest[0] = '\0');
+            if (lstLicenseHashes.contains(szDigest))
                 RTPrintf("License accepted.\n");
             else
             {
-                RTPrintf("%ls\n", bstrLicense.raw());
+                RTPrintf("%s\n", srcLicense.c_str());
                 RTPrintf("Do you agree to these license terms and conditions (y/n)? " );
                 ch = RTStrmGetCh(g_pStdIn);
@@ -1198 +1197 @@
                 {
                     RTPrintf("Installation of \"%ls\" aborted.\n", bstrName.raw());
-                    if (pszDigest)
-                        RTStrFree(pszDigest);
                     return RTEXITCODE_SUCCESS;
                 }
-                if (pszDigest)
-                {
+                if (szDigest[0])
                     RTPrintf("License accepted. For batch installaltion add\n"
                              "--accept-license=%s\n"
-                             "to the VBoxManage command line.\n\n", pszDigest);
-                }
-            }
-            if (pszDigest)
-                RTStrFree(pszDigest);
+                             "to the VBoxManage command line.\n\n", szDigest);
+            }
         }
         ComPtr<IProgress> ptrProgress;