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

Merge branch 'master' of git.hohnstaedt.de:/var/cache/git/xca

Browse Source
This commit is contained in:
Christian 2007-08-11 14:23:42 +02:00
commit c9d476bd8e
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/pki_x509super.cpp
View File

@ -48,13 +48,18 @@ void pki_x509super::delRefKey(pki_key *ref)
void pki_x509super::autoIntName()
{
int nids[] = { NID_commonName, NID_pkcs9_emailAddress,
NID_organizationalUnitName, NID_organizationName, NID_undef };
int i;
x509name subject = getSubject();
QString s;
s = subject.getEntryByNid(NID_commonName);
for (i = 0; nids[i] != NID_undef; i++) {
s = subject.getEntryByNid(nids[i]);
if (!s.isEmpty())
break;
}
if (s.isEmpty())
s = subject.getEntryByNid(NID_pkcs9_emailAddress);
if (s.isEmpty())
s = subject.getEntry(0);
s = subject.getEntry(-1);
setIntName(s);
}

4
lib/x509name.cpp
View File

@ -84,8 +84,8 @@ QString x509name::getEntryTag(int i) const
QString s = QObject::tr("Invalid");
ASN1_STRING *d;
if ( i<0 || i>entryCount() )
return s;
if (i<0 || i>=entryCount())
i = entryCount() - 1;
d = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(xn,i));
if (!d)