Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(902)

Unified Diff: chrome/browser/extensions/extension_creator.cc

Issue 115682: Verify signed .crx extension installations (Closed)
Patch Set: moved extensions consts back to extensions_service (was causing compile errors on mac & linux) Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_creator.cc
diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc
index 8c38e177f4908fff7afc02c286ef26a341538841..9abd030b36db33d270eae048cf828e37001149ec 100755
--- a/chrome/browser/extensions/extension_creator.cc
+++ b/chrome/browser/extensions/extension_creator.cc
@@ -12,6 +12,7 @@
#include "base/file_util.h"
#include "base/scoped_handle.h"
#include "base/string_util.h"
+#include "chrome/browser/extensions/extensions_service.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/zip.h"
#include "net/base/base64.h"
@@ -20,8 +21,6 @@ namespace {
const int kRSAKeySize = 1024;
};
-const char ExtensionCreator::kExtensionHeaderMagic[] = "Cr24";
-
bool ExtensionCreator::InitializeInput(
const FilePath& extension_dir,
const FilePath& private_key_path,
@@ -167,14 +166,14 @@ bool ExtensionCreator::WriteCRX(const FilePath& zip_path,
return false;
}
- ExtensionCreator::ExtensionHeader header;
- memcpy(&header.magic, ExtensionCreator::kExtensionHeaderMagic,
- ExtensionCreator::kExtensionHeaderMagicSize);
- header.version = kCurrentVersion;
+ ExtensionsService::ExtensionHeader header;
+ memcpy(&header.magic, ExtensionsService::kExtensionHeaderMagic,
+ ExtensionsService::kExtensionHeaderMagicSize);
+ header.version = ExtensionsService::kCurrentVersion;
header.key_size = public_key.size();
header.signature_size = signature.size();
- fwrite(&header, sizeof(ExtensionCreator::ExtensionHeader), 1,
+ fwrite(&header, sizeof(ExtensionsService::ExtensionHeader), 1,
crx_handle.get());
fwrite(&public_key.front(), sizeof(uint8), public_key.size(),
crx_handle.get());
« no previous file with comments | « chrome/browser/extensions/extension_creator.h ('k') | chrome/browser/extensions/extension_shelf_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698