diff -Nur xca-0.5.1/widgets/NewX509.cpp xca-0.5.1BL/widgets/NewX509.cpp --- xca-0.5.1/widgets/NewX509.cpp 2004-05-21 21:07:44.000000000 +0200 +++ xca-0.5.1BL/widgets/NewX509.cpp 2006-10-03 16:34:08.000000000 +0200 @@ -78,12 +78,12 @@ int NewX509::name_nid[] = { - NID_commonName, NID_countryName, - NID_localityName, NID_stateOrProvinceName, + NID_localityName, NID_organizationName, NID_organizationalUnitName, + NID_commonName, NID_pkcs9_emailAddress }; @@ -91,6 +91,7 @@ :NewX509_UI(parent, name, modal, f) { unsigned int i; + extDNlist->setSortColumn(-1); connect( extDNadd, SIGNAL(clicked()), this, SLOT(addX509NameEntry()) ); connect( extDNdel, SIGNAL(clicked()), this, SLOT(delX509NameEntry()) ); @@ -169,12 +170,12 @@ X509V3_set_ctx_nodb((&ext_ctx)); // setup the list of x509nameEntrys - name_ptr[0] = commonName; - name_ptr[1] = countryName; + name_ptr[0] = countryName; + name_ptr[1] = stateOrProvinceName; name_ptr[2] = localityName; - name_ptr[3] = stateOrProvinceName; - name_ptr[4] = organisationName; - name_ptr[5] = organisationalUnitName; + name_ptr[3] = organisationName; + name_ptr[4] = organisationalUnitName; + name_ptr[5] = commonName; name_ptr[6] = emailAddress; // last polish