Add new functions to handle UPN and email addresses

net/cert/x509_util_nss.h

Index: net/cert/x509_util_nss.h
diff --git a/net/cert/x509_util_nss.h b/net/cert/x509_util_nss.h
index 55e562effbab95875f4fb9cd76099c0977d8a83b..11e34dafdc25c0c94d4d7e3951ee252d1ad27a60 100644
--- a/net/cert/x509_util_nss.h
+++ b/net/cert/x509_util_nss.h
@@ -40,11 +40,44 @@ void ParseDate(const SECItem* der_date, base::Time* result);
 // Parses the serial number from |certificate|.
 std::string ParseSerialNumber(const CERTCertificate* certificate);
 
-// Gets the subjectAltName extension field from the certificate, if any.
+// Gets the dNSName and iPAddress name types from the subjectAltName
+// extension of |cert_handle|, storing them in |dns_names| and
+// |ip_addrs|, respectively.
+// If no subjectAltName is present, or no names of that type are
+// present, the relevant vectors are cleared.
 void GetSubjectAltName(CERTCertificate* cert_handle,
                        std::vector<std::string>* dns_names,
                        std::vector<std::string>* ip_addrs);
 
+// Stores the values of all rfc822Name subjectAltNames from |cert_handle|
+// into |names|. If no names are present, clears |names|.
+// WARNING: This method does not validate that the rfc822Name is
+// properly encoded; it MAY contain embedded NULs or other illegal
+// characters; care should be taken to validate the well-formedness
+// before using.
+NET_EXPORT void GetRFC822SubjectAltNames(CERTCertificate* cert_handle,
+                                         std::vector<std::string>* names);
+
+// Stores the values of all Microsoft UPN subjectAltNames from |cert_handle|
+// into |names|. If no names are present, clears |names|.
+//
+// A "Microsoft UPN subjectAltName" is an OtherName value whose type-id
+// is equal to 1.3.6.1.4.1.311.20.2.3 (known as either id-ms-san-sc-logon-upn,
+// as described in RFC 4556, or as szOID_NT_PRINCIPAL_NAME, as
+// documented in Microsoft KB287547).
+// The value field is a UTF8String literal.
+// For more information:
+//   https://www.ietf.org/mail-archive/web/pkix/current/msg03145.html
+//   https://www.ietf.org/proceedings/65/slides/pkix-4/sld1.htm
+//   https://tools.ietf.org/html/rfc4556
+//
+// WARNING: This method does not validate that the name is
+// properly encoded; it MAY contain embedded NULs or other illegal
+// characters; care should be taken to validate the well-formedness
+// before using.
+NET_EXPORT void GetUPNSubjectAltNames(CERTCertificate* cert_handle,
+                                      std::vector<std::string>* names);
+
 // Creates all possible OS certificate handles from |data| encoded in a specific
 // |format|. Returns an empty collection on failure.
 X509Certificate::OSCertHandles CreateOSCertHandlesFromBytes(