diff options
Diffstat (limited to 'src/gmcerts.c')
-rw-r--r-- | src/gmcerts.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/gmcerts.c b/src/gmcerts.c index 09728414..96013392 100644 --- a/src/gmcerts.c +++ b/src/gmcerts.c | |||
@@ -277,6 +277,7 @@ static void loadIdentityFromCertificate_GmCerts_(iGmCerts *d, const iString *crt | |||
277 | iDate today; | 277 | iDate today; |
278 | initCurrent_Date(&today); | 278 | initCurrent_Date(&today); |
279 | set_String(&ident->notes, collect_String(format_Date(&today, "Imported on %b %d, %Y"))); | 279 | set_String(&ident->notes, collect_String(format_Date(&today, "Imported on %b %d, %Y"))); |
280 | pushBack_PtrArray(&d->idents, ident); | ||
280 | } | 281 | } |
281 | setCertificate_GmIdentity_(ident, cert); | 282 | setCertificate_GmIdentity_(ident, cert); |
282 | delete_Block(finger); | 283 | delete_Block(finger); |
@@ -414,15 +415,16 @@ const iGmIdentity *identityForUrl_GmCerts(const iGmCerts *d, const iString *url) | |||
414 | } | 415 | } |
415 | 416 | ||
416 | iGmIdentity *newIdentity_GmCerts(iGmCerts *d, int flags, iDate validUntil, const iString *commonName, | 417 | iGmIdentity *newIdentity_GmCerts(iGmCerts *d, int flags, iDate validUntil, const iString *commonName, |
417 | const iString *userId, const iString *domain, const iString *org, | 418 | const iString *email, const iString *userId, const iString *domain, |
418 | const iString *country) { | 419 | const iString *org, const iString *country) { |
419 | const iTlsCertificateName names[] = { | 420 | const iTlsCertificateName names[] = { |
420 | { issuerCommonName_TlsCertificateNameType, collectNewCStr_String("Lagrange v" LAGRANGE_APP_VERSION) }, | 421 | { issuerCommonName_TlsCertificateNameType, collectNewCStr_String("Lagrange v" LAGRANGE_APP_VERSION) }, |
421 | { issuerDomain_TlsCertificateNameType, collectNewCStr_String("lagrange.skyjake.fi") }, | 422 | { issuerDomain_TlsCertificateNameType, collectNewCStr_String("lagrange.skyjake.fi") }, |
422 | { subjectCommonName_TlsCertificateNameType, commonName }, | 423 | { subjectCommonName_TlsCertificateNameType, commonName }, |
423 | { subjectUserId_TlsCertificateNameType, !isEmpty_String(userId) ? userId : NULL }, | 424 | { subjectEmailAddress_TlsCertificateNameType, !isEmpty_String(email) ? email : NULL }, |
424 | { subjectDomain_TlsCertificateNameType, !isEmpty_String(domain) ? domain : NULL }, | 425 | { subjectUserId_TlsCertificateNameType, !isEmpty_String(userId) ? userId : NULL }, |
425 | { subjectOrganization_TlsCertificateNameType, !isEmpty_String(org) ? org : NULL }, | 426 | { subjectDomain_TlsCertificateNameType, !isEmpty_String(domain) ? domain : NULL }, |
427 | { subjectOrganization_TlsCertificateNameType, !isEmpty_String(org) ? org : NULL }, | ||
426 | { subjectCountry_TlsCertificateNameType, !isEmpty_String(country) ? country : NULL }, | 428 | { subjectCountry_TlsCertificateNameType, !isEmpty_String(country) ? country : NULL }, |
427 | { 0, NULL } | 429 | { 0, NULL } |
428 | }; | 430 | }; |