Fix signer profile names

internal/legacydb/legacydb.go

@@ -100,14 +100,14 @@ WHERE crt = ''
 FROM emailcerts
 WHERE crt_name = ''
   AND csr_name != ''
-  AND keytype = 'MS'
+  AND keytype IN ('MS', 'VI')
   AND codesign = 0
   AND warning < ?`
 	sqlFindPersonalCodeSigningCertRequests = `SELECT id, csr_name, type, md, subject
 FROM emailcerts
 WHERE crt_name = ''
   AND csr_name != ''
-  AND keytype = 'MS'
+  AND keytype IN ('MS', 'VI')
   AND codesign = 1
   AND warning < ?`
 	sqlFindPersonalServerCertRequests = `SELECT id, csr_name, type, md, subject
@@ -119,14 +119,14 @@ WHERE crt_name = ''
 FROM orgemailcerts
 WHERE crt_name = ''
   AND csr_name != ''
-  AND keytype = 'MS'
+  AND keytype IN ('MS', 'VI')
   AND codesign = 0
   AND warning < ?`
 	sqlFindOrganizationalCodeSigningCertRequests = `SELECT id, csr_name, type, md, subject
 FROM orgemailcerts
 WHERE crt_name = ''
   AND csr_name != ''
-  AND keytype = 'MS'
+  AND keytype IN ('MS', 'VI')
   AND codesign = 1
   AND warning < ?`
 	sqlFindOrganizationalServerCertRequests = `SELECT id, csr_name, type, md, subject
@@ -322,9 +322,9 @@ func New(logger *logrus.Logger, config *config.Database, commands chan *protocol
 		respPersonalClientCertificate:            "person",
 		respPersonalCodeSigningCertificate:       "code",
 		respPersonalServerCertificate:            "server",
-		respOrganizationalClientCertificate:      "org_person",
-		respOrganizationalCodeSigningCertificate: "org_code",
-		respOrganizationalServerCertificate:      "org_server",
+		respOrganizationalClientCertificate:      "person",
+		respOrganizationalCodeSigningCertificate: "code",
+		respOrganizationalServerCertificate:      "server",
 	}
 
 	supportedHashAlgorithms := map[string]crypto.Hash{
@@ -765,15 +765,15 @@ func parseSubjectStringComponent(identifier, value string, res *x509.Certificate
 	case "commonName":
 		res.Subject.CommonName = value
 		res.DNSNames = append(res.DNSNames, value)
-	case "organizationName":
+	case "O", "organizationName":
 		res.Subject.Organization = append(res.Subject.Organization, value)
-	case "organizationalUnitName":
+	case "OU", "organizationalUnitName":
 		res.Subject.OrganizationalUnit = append(res.Subject.OrganizationalUnit, value)
-	case "localityName":
+	case "L", "localityName":
 		res.Subject.Locality = append(res.Subject.Locality, value)
-	case "stateOrProvinceName":
+	case "ST", "stateOrProvinceName":
 		res.Subject.Province = append(res.Subject.Province, value)
-	case "countryName":
+	case "C", "countryName":
 		res.Subject.Country = append(res.Subject.Country, value)
 	case "emailAddress":
 		res.EmailAddresses = append(res.EmailAddresses, value)