diff options
Diffstat (limited to 'src/gmcerts.c')
-rw-r--r-- | src/gmcerts.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gmcerts.c b/src/gmcerts.c index 0dc52041..addd75d3 100644 --- a/src/gmcerts.c +++ b/src/gmcerts.c | |||
@@ -253,7 +253,7 @@ static void loadIdentities_GmCerts_(iGmCerts *d) { | |||
253 | } | 253 | } |
254 | } | 254 | } |
255 | 255 | ||
256 | static iGmIdentity *findIdentity_GmCerts_(iGmCerts *d, const iBlock *fingerprint) { | 256 | iGmIdentity *findIdentity_GmCerts(iGmCerts *d, const iBlock *fingerprint) { |
257 | iForEach(PtrArray, i, &d->idents) { | 257 | iForEach(PtrArray, i, &d->idents) { |
258 | iGmIdentity *ident = i.ptr; | 258 | iGmIdentity *ident = i.ptr; |
259 | if (cmp_Block(fingerprint, &ident->fingerprint) == 0) { /* TODO: could use a hash */ | 259 | if (cmp_Block(fingerprint, &ident->fingerprint) == 0) { /* TODO: could use a hash */ |
@@ -273,7 +273,7 @@ static void loadIdentityFromCertificate_GmCerts_(iGmCerts *d, const iString *crt | |||
273 | } | 273 | } |
274 | iTlsCertificate *cert = newPemKey_TlsCertificate(readFile_(crtPath), readFile_(keyPath)); | 274 | iTlsCertificate *cert = newPemKey_TlsCertificate(readFile_(crtPath), readFile_(keyPath)); |
275 | iBlock *finger = fingerprint_TlsCertificate(cert); | 275 | iBlock *finger = fingerprint_TlsCertificate(cert); |
276 | iGmIdentity *ident = findIdentity_GmCerts_(d, finger); | 276 | iGmIdentity *ident = findIdentity_GmCerts(d, finger); |
277 | if (!ident) { | 277 | if (!ident) { |
278 | /* User-provided certificate. */ | 278 | /* User-provided certificate. */ |
279 | ident = new_GmIdentity(); | 279 | ident = new_GmIdentity(); |
@@ -497,8 +497,10 @@ const iPtrArray *identities_GmCerts(const iGmCerts *d) { | |||
497 | } | 497 | } |
498 | 498 | ||
499 | void signIn_GmCerts(iGmCerts *d, iGmIdentity *identity, const iString *url) { | 499 | void signIn_GmCerts(iGmCerts *d, iGmIdentity *identity, const iString *url) { |
500 | signOut_GmCerts(d, url); | 500 | if (identity) { |
501 | setUse_GmIdentity(identity, url, iTrue); | 501 | signOut_GmCerts(d, url); |
502 | setUse_GmIdentity(identity, url, iTrue); | ||
503 | } | ||
502 | } | 504 | } |
503 | 505 | ||
504 | void signOut_GmCerts(iGmCerts *d, const iString *url) { | 506 | void signOut_GmCerts(iGmCerts *d, const iString *url) { |