Recognize the legacy OID 1.3.14.3.2.29 (sha1WithRSASignature) as equivalent to

net/cert/internal/signature_algorithm.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/cert/internal/signature_algorithm.h"
 
 #include <stdint.h>
 
 #include "net/der/input.h"
 #include "net/der/parser.h"
 
 namespace net {
 
 namespace {
 
 // From RFC 3279 section 2.2.1:
 //  sha-1WithRSAEncryption OBJECT IDENTIFIER  ::=  {
 //              iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1)
 //                          pkcs-1(1) 5  }
 // In dotted notation: 1.2.840.113549.1.1.5
 const uint8_t kOidSha1WithRsaEncryption[] =
     {0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05};
 
+// sha1WithRSASignature is a deprecated equivalent of
+// sha-1WithRSAEncryption.
+//
+// It originates from the NIST Open Systems Environment (OSE)
+// Implementor's Workshop (OIW).
+//
+// It is supported for compatibility with Microsoft products such as
+// Fiddler, which depend on certificates containing this OID.

[Ryan Sleevi, 2015/07/06 14:41:08]

Fiddler is not a Microsoft product.

// It is supported for compatibility with Microsoft's certificate APIs and
tools, particularly
// makecert.exe, which default(ed/s) to this OID for SHA-1.

[eroman, 2015/07/06 22:53:25]

Done.

+//
+// See also: https://bugzilla.mozilla.org/show_bug.cgi?id=1042479
+//
+// In dotted notation: 1.3.14.3.2.29
+const uint8_t kOidSha1WithRsaSignature[] = {0x2b, 0x0e, 0x03, 0x02, 0x1d};
+
 // From RFC 4055 section 6:
 //   pkcs-1  OBJECT IDENTIFIER  ::=  { iso(1) member-body(2)
 //                                 us(840) rsadsi(113549) pkcs(1) 1 }
 
 // From RFC 4055 section 5:
 //   sha256WithRSAEncryption  OBJECT IDENTIFIER  ::=  { pkcs-1 11 }
 // In dotted notation: 1.2.840.113549.1.1.11
 const uint8_t kOidSha256WithRsaEncryption[] =
     {0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b};
 
@@ skipping 242 matching lines @@
 
   if (oid.Equals(der::Input(kOidEcdsaWithSha384)))
     return ParseEcdsa(DigestAlgorithm::Sha384, params, this);
 
   if (oid.Equals(der::Input(kOidEcdsaWithSha512)))
     return ParseEcdsa(DigestAlgorithm::Sha512, params, this);
 
   if (oid.Equals(der::Input(kOidRsaSsaPss)))
     return ParseRsaPss(params, this);
 
+  if (oid.Equals(der::Input(kOidSha1WithRsaSignature)))
+    return ParseRsaPkcs1(DigestAlgorithm::Sha1, params, this);
+
   return false;  // Unsupported OID.
 }
 
 void SignatureAlgorithm::AssignRsaPkcs1(DigestAlgorithm digest) {
   algorithm_ = SignatureAlgorithmId::RsaPkcs1;
   digest_ = digest;
   params_.reset();
 }
 
 void SignatureAlgorithm::AssignEcdsa(DigestAlgorithm digest) {
@@ skipping 32 matching lines @@
   return nullptr;
 }
 
 void SignatureAlgorithm::AssignInvalid() {
   algorithm_ = static_cast<SignatureAlgorithmId>(-1);
   digest_ = static_cast<DigestAlgorithm>(-1);
   params_.reset();
 }
 
 }  // namespace net