summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/chrome_browser.gypi16
-rw-r--r--chrome/common/net/x509_certificate_model.cc5
-rw-r--r--chrome/common/net/x509_certificate_model.h2
3 files changed, 15 insertions, 8 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 0003524..62f7fd2 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3432,12 +3432,6 @@
],
'sources': [
'browser/crash_handler_host_linux.h',
- 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
- 'third_party/mozilla_security_manager/nsNSSCertHelper.h',
- 'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
- 'third_party/mozilla_security_manager/nsNSSCertificate.h',
- 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
- 'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
],
'conditions': [
['use_gnome_keyring==1', {
@@ -3466,6 +3460,16 @@
'browser/crash_handler_host_linux_stub.cc',
],
}],
+ ['use_openssl==0', {
+ 'sources': [
+ 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
+ 'third_party/mozilla_security_manager/nsNSSCertHelper.h',
+ 'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
+ 'third_party/mozilla_security_manager/nsNSSCertificate.h',
+ 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
+ 'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
+ ],
+ }],
],
}, { # OS != "linux"
'sources!': [
diff --git a/chrome/common/net/x509_certificate_model.cc b/chrome/common/net/x509_certificate_model.cc
index 641e7c5d..0ec2bff 100644
--- a/chrome/common/net/x509_certificate_model.cc
+++ b/chrome/common/net/x509_certificate_model.cc
@@ -79,10 +79,11 @@ std::string ProcessRawBytes(const unsigned char* data, size_t data_length) {
return ProcessRawBytesWithSeparators(data, data_length, ' ', '\n');
}
+#if defined(USE_NSS)
std::string ProcessRawBits(const unsigned char* data, size_t data_length) {
- return ProcessRawBytesWithSeparators(data, (data_length + 7) / 8, ' ', '\n');
+ return ProcessRawBytes(data, (data_length + 7) / 8);
}
-
+#endif // USE_NSS
} // x509_certificate_model
diff --git a/chrome/common/net/x509_certificate_model.h b/chrome/common/net/x509_certificate_model.h
index 56bb0a75..3e4f14f 100644
--- a/chrome/common/net/x509_certificate_model.h
+++ b/chrome/common/net/x509_certificate_model.h
@@ -134,10 +134,12 @@ std::string ProcessRawBytesWithSeparators(const unsigned char* data,
std::string ProcessRawBytes(const unsigned char* data,
size_t data_length);
+#if defined(USE_NSS)
// Format a buffer as a space separated string, with 16 bytes on each line.
// |data_length| is the length in bits.
std::string ProcessRawBits(const unsigned char* data,
size_t data_length);
+#endif // USE_NSS
} // namespace x509_certificate_model