Mercurial > pidgin.yaz

comparison src/protocols/silc/ops.c @ 10336:114d3ac8ff5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 11543] This should fix public key authentication for SILC if your key is password protected. It's a patch from Michele Baldessari. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 09 Dec 2004 03:10:30 +0000
parents a66cf83552dc
children 0f7452b1f777
comparison
equal deleted inserted replaced
10335:20e750dd21a0 10336:114d3ac8ff5a
1599 else 1599 else
1600 gaim_connection_update_progress(gc, _("Authenticating connection"), 4, 5); 1600 gaim_connection_update_progress(gc, _("Authenticating connection"), 4, 5);
1601 1601
1602 /* Check configuration if we have this connection configured. If we 1602 /* Check configuration if we have this connection configured. If we
1603 have then return that data immediately, as it's faster way. */ 1603 have then return that data immediately, as it's faster way. */
1604 if (gaim_account_get_bool(sg->account, "pubkey-auth", FALSE)) {
1605 completion(TRUE, SILC_AUTH_PUBLIC_KEY, NULL, 0, context);
1606 return;
1607 }
1604 if (gc->account->password && *gc->account->password) { 1608 if (gc->account->password && *gc->account->password) {
1605 completion(TRUE, SILC_AUTH_PASSWORD, gc->account->password, 1609 completion(TRUE, SILC_AUTH_PASSWORD, gc->account->password,
1606 strlen(gc->account->password), context); 1610 strlen(gc->account->password), context);
1607 return;
1608 }
1609 if (gaim_account_get_bool(sg->account, "pubkey-auth", FALSE)) {
1610 completion(TRUE, SILC_AUTH_PUBLIC_KEY, NULL, 0, context);
1611 return; 1611 return;
1612 } 1612 }
1613 1613
1614 /* Resolve the authentication method from server, as we may not know it. */ 1614 /* Resolve the authentication method from server, as we may not know it. */
1615 internal = silc_calloc(1, sizeof(*internal)); 1615 internal = silc_calloc(1, sizeof(*internal));