crypto/x509: emit PKIX names in a more standard order.

(See referenced bug for details.)

Fixes #11966.

Change-Id: I91f9c95594cf4fd6d25d9a81f155a643c7a1f8e0
Reviewed-on: https://go-review.googlesource.com/13038
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/crypto/x509/pkix/pkix.go b/src/crypto/x509/pkix/pkix.go
index 5add4e5d3e0d0d5aab1a6be905fd2f6a68383bf6..1b3e3c0440e9de6c123e865621e25c225ac4b92b 100644 (file)
--- a/src/crypto/x509/pkix/pkix.go
+++ b/src/crypto/x509/pkix/pkix.go
@@ -129,12 +129,12 @@ func (n Name) appendRDNs(in RDNSequence, values []string, oid asn1.ObjectIdentif
 
 func (n Name) ToRDNSequence() (ret RDNSequence) {
        ret = n.appendRDNs(ret, n.Country, oidCountry)
-       ret = n.appendRDNs(ret, n.Organization, oidOrganization)
-       ret = n.appendRDNs(ret, n.OrganizationalUnit, oidOrganizationalUnit)
-       ret = n.appendRDNs(ret, n.Locality, oidLocality)
        ret = n.appendRDNs(ret, n.Province, oidProvince)
+       ret = n.appendRDNs(ret, n.Locality, oidLocality)
        ret = n.appendRDNs(ret, n.StreetAddress, oidStreetAddress)
        ret = n.appendRDNs(ret, n.PostalCode, oidPostalCode)
+       ret = n.appendRDNs(ret, n.Organization, oidOrganization)
+       ret = n.appendRDNs(ret, n.OrganizationalUnit, oidOrganizationalUnit)
        if len(n.CommonName) > 0 {
                ret = n.appendRDNs(ret, []string{n.CommonName}, oidCommonName)
        }