The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-14 11:06:19 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Combine #90 and #315 and support UPN in name constraints

Browse Source
This commit is contained in:
Christian Hohnstaedt 2024-09-15 09:25:44 +02:00
parent cb1f02502d
commit 2b3f4dd039
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pki_temp.cpp
View File

@ -191,12 +191,14 @@ void pki_temp::fromExtList(extList *el, int nid, const char *item)
{
QString target;
el->genConf(nid, &target, &adv_ext);
if (nid == NID_subject_alt_name || nid == NID_issuer_alt_name) {
if (nid == NID_subject_alt_name || nid == NID_issuer_alt_name ||
nid == NID_name_constraints)
{
QStringList sl = target.split(",");
QRegularExpression match("([a-z]+;)*otherName:msUPN;UTF8:");
for (int i=0; i<sl.size(); i++) {
QString s = sl[i].trimmed();
if (s.startsWith("otherName:msUPN;UTF8:"))
sl[i] = s.replace("otherName:msUPN;UTF8:", "UPN:");
sl[i] = s.replace(match, "\\1UPN:");
}
target = sl.join(",");
}

6
lib/x509v3ext.cpp
View File

@ -83,12 +83,12 @@ x509v3ext &x509v3ext::create(int nid, const QString &et, X509V3_CTX *ctx)
if (new_san.size() > 0)
etext.replace(QString("DNS:copycn"), new_san.join(","));
}
if (nid == NID_subject_alt_name || nid == NID_issuer_alt_name) {
if (nid == NID_subject_alt_name || nid == NID_issuer_alt_name || nid == NID_name_constraints) {
QStringList sl = etext.split(",");
QRegularExpression match("([a-z]+;)*UPN:");
for (int i=0; i<sl.size(); i++) {
QString s = sl[i].trimmed();
if (s.startsWith("UPN:"))
sl[i] = s.replace("UPN:", "otherName:msUPN;UTF8:");
sl[i] = s.replace(match, "\\1otherName:msUPN;UTF8:");
}
etext = sl.join(",");
}

2
widgets/NewX509.cpp
View File

@ -1142,7 +1142,7 @@ void NewX509::on_editNameCons_clicked()
{
QStringList permut;
for (const QString &group : QStringList { "permitted", "excluded" }) {
for(const QString &type : QStringList { "URI", "email", "RID", "DNS", "IP" }) {
for(const QString &type : QStringList { "URI", "email", "RID", "DNS", "IP", "UPN", "othername" }) {
permut << QString("%1;%2").arg(group).arg(type);
}
}