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 "net/der/input.h"
 #include "net/der/parser.h"
 
 namespace net {
 
 namespace {
 
 // From RFC 5912:
 //
 //     sha1WithRSAEncryption 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
+// sha1WithRSAEncryption.
+//
+// It originates from the NIST Open Systems Environment (OSE)
+// Implementor's Workshop (OIW).
+//
+// 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.
+//
+// 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 5912:
 //
 //     pkcs-1  OBJECT IDENTIFIER  ::=
 //         { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 1 }
 
 // From RFC 5912:
 //
 //     sha256WithRSAEncryption  OBJECT IDENTIFIER  ::=  { pkcs-1 11 }
 //
 // In dotted notation: 1.2.840.113549.1.1.11
@@ skipping 255 matching lines @@
     return ParseEcdsa(DigestAlgorithm::Sha256, params);
 
   if (oid.Equals(der::Input(kOidEcdsaWithSha384)))
     return ParseEcdsa(DigestAlgorithm::Sha384, params);
 
   if (oid.Equals(der::Input(kOidEcdsaWithSha512)))
     return ParseEcdsa(DigestAlgorithm::Sha512, params);
 
   // TODO(eroman): Add parsing of RSASSA-PSS
 
+  if (oid.Equals(der::Input(kOidSha1WithRsaSignature)))
+    return ParseRsaPkcs1(DigestAlgorithm::Sha1, params);
+
   return nullptr;  // Unsupported OID.
 }
 
 scoped_ptr<SignatureAlgorithm> SignatureAlgorithm::CreateRsaPkcs1(
     DigestAlgorithm digest) {
   return make_scoped_ptr(
       new SignatureAlgorithm(SignatureAlgorithmId::RsaPkcs1, digest, nullptr));
 }
 
 scoped_ptr<SignatureAlgorithm> SignatureAlgorithm::CreateEcdsa(
@@ skipping 46 matching lines @@
 }
 
 SignatureAlgorithm::SignatureAlgorithm(
     SignatureAlgorithmId algorithm,
     DigestAlgorithm digest,
     scoped_ptr<SignatureAlgorithmParameters> params)
     : algorithm_(algorithm), digest_(digest), params_(params.Pass()) {
 }
 
 }  // namespace net