modified certtool order of DN elements.

diff --git a/src/certtool.c b/src/certtool.c
index e76f1976413d452ea3f55d0260705f271dd80736..6230f7617599cda45ebefc9fe615769ede3c1653 100644 (file)
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -278,14 +278,14 @@ generate_certificate (gnutls_privkey_t * ret_key,
         {
           get_dn_crt_set (crt);
 
-          get_country_crt_set (crt);
-          get_state_crt_set (crt);
-          get_locality_crt_set (crt);
-          get_organization_crt_set (crt);
-          get_unit_crt_set (crt);
           get_cn_crt_set (crt);
-          get_dc_set (TYPE_CRT, crt);
           get_uid_crt_set (crt);
+          get_unit_crt_set (crt);
+          get_organization_crt_set (crt);
+          get_locality_crt_set (crt);
+          get_state_crt_set (crt);
+          get_country_crt_set (crt);
+          get_dc_set (TYPE_CRT, crt);
 
           get_oid_crt_set (crt);
           get_key_purpose_set (crt);
@@ -1784,12 +1784,13 @@ generate_request (common_info_st * cinfo)
    */
   get_dn_crq_set (crq);
 
-  get_country_crq_set (crq);
-  get_state_crq_set (crq);
-  get_locality_crq_set (crq);
-  get_organization_crq_set (crq);
-  get_unit_crq_set (crq);
   get_cn_crq_set (crq);
+  get_unit_crq_set (crq);
+  get_organization_crq_set (crq);
+  get_locality_crq_set (crq);
+  get_state_crq_set (crq);
+  get_country_crq_set (crq);
+
   get_dc_set (TYPE_CRQ, crq);
   get_uid_crq_set (crq);
   get_oid_crq_set (crq);

diff --git a/tests/cert-tests/template-test.pem b/tests/cert-tests/template-test.pem
index 0b0866fe4bf7b7b474334d799516b0b373b52da4..a17032e570f98257c12ae3e5294fb6a8d73fc892 100644 (file)
--- a/tests/cert-tests/template-test.pem
+++ b/tests/cert-tests/template-test.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIID4jCCA0ugAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UEBhMCR1Ix
-EjAQBgNVBAoTCUtva28gaW5jLjEXMBUGA1UECxMOc2xlZXBpbmcgZGVwdC4xDzAN
-BgNVBAgTBkF0dGlraTEVMBMGA1UEAxMMQ2luZHkgTGF1cGVyMRcwFQYKCZImiZPy
-LGQBARMHY2xhdXBlcjEMMAoGA1UEDBMDRHIuMQ8wDQYDVQRBEwZqYWNrYWwxHDAa
+MIID4jCCA0ugAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBuDEVMBMGA1UEAxMMQ2lu
+ZHkgTGF1cGVyMRcwFQYKCZImiZPyLGQBARMHY2xhdXBlcjEXMBUGA1UECxMOc2xl
+ZXBpbmcgZGVwdC4xEjAQBgNVBAoTCUtva28gaW5jLjEPMA0GA1UECBMGQXR0aWtp
+MQswCQYDVQQGEwJHUjEMMAoGA1UEDBMDRHIuMQ8wDQYDVQRBEwZqYWNrYWwxHDAa
 BgkqhkiG9w0BCQEWDW5vbmVAbm9uZS5vcmcwIhgPMjAwNzA0MjEyMjAwMDBaGA8y
-MDE0MDUyNDIyMDAwMFowgbgxCzAJBgNVBAYTAkdSMRIwEAYDVQQKEwlLb2tvIGlu
-Yy4xFzAVBgNVBAsTDnNsZWVwaW5nIGRlcHQuMQ8wDQYDVQQIEwZBdHRpa2kxFTAT
-BgNVBAMTDENpbmR5IExhdXBlcjEXMBUGCgmSJomT8ixkAQETB2NsYXVwZXIxDDAK
+MDE0MDUyNDIyMDAwMFowgbgxFTATBgNVBAMTDENpbmR5IExhdXBlcjEXMBUGCgmS
+JomT8ixkAQETB2NsYXVwZXIxFzAVBgNVBAsTDnNsZWVwaW5nIGRlcHQuMRIwEAYD
+VQQKEwlLb2tvIGluYy4xDzANBgNVBAgTBkF0dGlraTELMAkGA1UEBhMCR1IxDDAK
 BgNVBAwTA0RyLjEPMA0GA1UEQRMGamFja2FsMRwwGgYJKoZIhvcNAQkBFg1ub25l
 QG5vbmUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClxs51Q4S/ZJ4C
 JxPxA1n3eS2S7XwvUKQD8S15uYaLBX46u0Sqr4TPE5geHEo49zMtep9y1GttJrAx
@@ -17,7 +17,7 @@ ghd3d3cuZXZlbm1vcmV0aGFub25lLm9yZ4cEwKgBAYENbm9uZUBub25lLm9yZ4EO
 d2hlcmVAbm9uZS5vcmcwEwYDVR0lBAwwCgYIKwYBBQUHAwkwDwYDVR0PAQH/BAUD
 AwcEADAdBgNVHQ4EFgQUXUCt8M6UQJWLfpmUHZJUIspyNl8wLgYDVR0fBCcwJTAj
 oCGgH4YdaHR0cDovL3d3dy5nZXRjcmwuY3JsL2dldGNybC8wDQYJKoZIhvcNAQEL
-BQADgYEAkRe0HlWiwWEWV815XYU7IBWD+e7hVnpyTNaFrS2zn1vQfi0XQ1eX8DjH
-AEWFB5qKppkdXTP0MihieFvUbmgybuc/ep7JRu3l2MBly2latSJViqiHoo9GHqbi
-lX9KX8XUx1+ONbBy3rYqUATq+z7WEdN9iN8wNXMVMTv0hD5GnuM=
+BQADgYEARQvt5YE4a0i4SzfOOfEV6UkTq7k6gpkCuDjhUZhxdJxZz3BLIDtPyM6o
+kOVG9ONaedYGoNtpspf35BfP6CQuQpBCyGvwSzgcGgdy/iCeiguU6Wa3Sx0buXZU
+zFfveqvUXJfD8eLYTlLeydTqUqgbEc136Jkl/7hNXfrd144PUN8=
 -----END CERTIFICATE-----

diff --git a/tests/cert-tests/template-utf8.pem b/tests/cert-tests/template-utf8.pem
index 4f6615c92303df21a43974ed4dac6ee232b25fa2..f10e0dff6b558641d5e0d4598257b3d6ad41b882 100644 (file)
--- a/tests/cert-tests/template-utf8.pem
+++ b/tests/cert-tests/template-utf8.pem
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIC/TCCAmagAwIBAgIBCTANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQGEwJHUjEk
-MCIGA1UECgwbzpzOtc6zzqzOu863IM61z4TOsc65z4HOr86xMRUwEwYDVQQIDAzO
-kc+Ez4TOuc66zq4xDTALBgNVBAMMBPCfkKgwIhgPMjAwNzA0MjEyMjAwMDBaGA8y
-MDA4MDQyMDIyMDAwMFowWTELMAkGA1UEBhMCR1IxJDAiBgNVBAoMG86czrXOs86s
-zrvOtyDOtc+EzrHOuc+Bzq/OsTEVMBMGA1UECAwMzpHPhM+EzrnOus6uMQ0wCwYD
-VQQDDATwn5CoMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClxs51Q4S/ZJ4C
+MIIC/TCCAmagAwIBAgIBCTANBgkqhkiG9w0BAQsFADBZMQ0wCwYDVQQDDATwn5Co
+MSQwIgYDVQQKDBvOnM61zrPOrM67zrcgzrXPhM6xzrnPgc6vzrExFTATBgNVBAgM
+DM6Rz4TPhM65zrrOrjELMAkGA1UEBhMCR1IwIhgPMjAwNzA0MjEyMjAwMDBaGA8y
+MDA4MDQyMDIyMDAwMFowWTENMAsGA1UEAwwE8J+QqDEkMCIGA1UECgwbzpzOtc6z
+zqzOu863IM61z4TOsc65z4HOr86xMRUwEwYDVQQIDAzOkc+Ez4TOuc66zq4xCzAJ
+BgNVBAYTAkdSMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClxs51Q4S/ZJ4C
 JxPxA1n3eS2S7XwvUKQD8S15uYaLBX46u0Sqr4TPE5geHEo49zMtep9y1GttJrAx
 N3AQ+0Lp2J0YZX4ZSfwFlgRogx53hr/t9eUSOxP+MxicGnodaa9HAmB6H7noz9vI
 NDBRlj2MllwAvGHeCA+xNiF/qQDjBQIDAQABo4HQMIHNMAwGA1UdEwEB/wQCMAAw
@@ -12,8 +12,8 @@ gZ0GA1UdIASBlTCBkjCBjwYMKwYBBAGqbAEKYwEAMH8wSAYIKwYBBQUHAgIwPAw6
 zpzOuc6xIM+Azr/Ou865z4TOuc66zq4gz4DOv8+FIM64zq3Ou861zrkgzrTOuc6s
 zrLOsc+DzrzOsTAzBggrBgEFBQcCARYnaHR0cDovL3d3dy5leGFtcGxlLmNvbS9h
 LXBvbGljeS10by1yZWFkMB0GA1UdDgQWBBRdQK3wzpRAlYt+mZQdklQiynI2XzAN
-BgkqhkiG9w0BAQsFAAOBgQBo2g5++u6FKa1MSLEaXl2c6KOxrj0XFkpkWEnajEdn
-H2ApFr/EHZsGWET92s+AAkgJmfmzUB8+uEbSPTNXZnmx8HL5ZrVFwVJ8ZwJDBipQ
-1vgdwpPlxpJp0rIr76xXXmzXsdnCmuvBfiE0KT1/X/Ntm+HkolB7WUVxsIkp3hIS
-1w==
+BgkqhkiG9w0BAQsFAAOBgQCGQ2udbAUb8+DAjhtruN/EK/NN3vlvH/ssD7GdypD3
+ebWE+7O2R70zz0imBEqkwRgZyvjUfFBMzzI/k/Axjeq5k86Bci2g8nXBA72x4UvX
+q4bhES6mJP0ETfUZ87ZtcrFJnY6/Ytw75CQHbgcF6KUXSFlsP7pLhLygxPQq0zRq
+hQ==
 -----END CERTIFICATE-----