1 files changed, 10 insertions, 48 deletions
diff --git a/security/certificate-transparency/files/patch-cpp-client-ct.cc b/security/certificate-transparency/files/patch-cpp-client-ct.cc
index cf02f5cc3c18..4721a2a6a9e7 100644
--- a/security/certificate-transparency/files/patch-cpp-client-ct.cc
+++ b/security/certificate-transparency/files/patch-cpp-client-ct.cc
@@ -1,49 +1,11 @@
---- cpp/client/ct.cc.orig	2016-10-14 17:11:57 UTC
+--- cpp/client/ct.cc.orig	2017-02-11 20:58:57 UTC
 +++ cpp/client/ct.cc
-@@ -451,8 +451,8 @@ static void MakeCert() {
- // (This means the relevant section should be last in the configuration.)
- // 1.2.3.1=DER:[raw encoding of proof]
- static void WriteProofToConfig() {
--  CHECK(!FLAGS_sct_token.empty()) << google::ProgramUsage();
--  CHECK(!FLAGS_extensions_config_out.empty()) << google::ProgramUsage();
-+  CHECK(!FLAGS_sct_token.empty()) << gflags::ProgramUsage();
-+  CHECK(!FLAGS_extensions_config_out.empty()) << gflags::ProgramUsage();
- 
-   string sct;
- 
-@@ -479,8 +479,8 @@ static const char kPEMLabel[] = "SERVERI
- // Wrap the proof in the format expected by the TLS extension,
- // so that we can feed it to OpenSSL.
- static void ProofToExtensionData() {
--  CHECK(!FLAGS_sct_token.empty()) << google::ProgramUsage();
--  CHECK(!FLAGS_tls_extension_data_out.empty()) << google::ProgramUsage();
-+  CHECK(!FLAGS_sct_token.empty()) << gflags::ProgramUsage();
-+  CHECK(!FLAGS_tls_extension_data_out.empty()) << gflags::ProgramUsage();
- 
-   string serialized_sct;
-   PCHECK(util::ReadBinaryFile(FLAGS_sct_token, &serialized_sct))
-@@ -939,13 +939,13 @@ int GetSTH() {
- // Exit code upon abnormal exit (CHECK failures): != 0
- // (on UNIX, 134 is expected)
- int main(int argc, char** argv) {
--  google::SetUsageMessage(argv[0] + string(kUsage));
-+  gflags::SetUsageMessage(argv[0] + string(kUsage));
-   util::InitCT(&argc, &argv);
-   ConfigureSerializerForV1CT();
- 
-   const string main_command(argv[0]);
-   if (argc < 2) {
--    std::cout << google::ProgramUsage();
-+    std::cout << gflags::ProgramUsage();
-     return 1;
-   }
- 
-@@ -983,7 +983,7 @@ int main(int argc, char** argv) {
-   } else if (cmd == "sth") {
-     ret = GetSTH();
-   } else {
--    std::cout << google::ProgramUsage();
-+    std::cout << gflags::ProgramUsage();
-     ret = 1;
-   }
- 
+@@ -530,7 +530,7 @@ static void ProofToExtensionData() {
+                       << " for writing:" << strerror(errno);
+ 
+ // Work around broken PEM_write() declaration in older OpenSSL versions.
+-#if OPENSSL_VERSION_NUMBER < 0x10002000L
++#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
+   PEM_write(out, const_cast<char*>(kPEMLabel), const_cast<char*>(""),
+             const_cast<unsigned char*>(reinterpret_cast<const unsigned char*>(
+                 extension_data_out.str().data())),