X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=mac%2Fmac.c;h=8dde3e1296f1d407ec1a8d3bf31d62fc188c472e;hb=340afa273366858ad2a243b200a77b8fb3a1429a;hp=eb69224d8b8decdd7ef8aeb210e553373c9d0aa1;hpb=ccc9ec2bce3678ec496b8cd15de131385f6b3bb7;p=PuTTY.git diff --git a/mac/mac.c b/mac/mac.c index eb69224d..8dde3e12 100644 --- a/mac/mac.c +++ b/mac/mac.c @@ -1,4 +1,4 @@ -/* $Id: mac.c,v 1.58 2003/05/10 11:40:18 ben Exp $ */ +/* $Id$ */ /* * Copyright (c) 1999, 2003 Ben Harris * All rights reserved. @@ -672,18 +672,11 @@ int agent_query(void *in, int inlen, void **out, int *outlen, /* Temporary null routines for testing. */ -/* - * FIXME: verify_ssh_host_key() should be passed a frontend handle, - * but backends have to have a terminal handle instead, because they - * pass it to from_backend(), so we accept a terminal handle here as - * well, and hope no-one tries to call us with sensible arguments. - */ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, char *keystr, char *fingerprint) { Str255 stuff; - Terminal *term = frontend; - Session *s = term->frontend; + Session *s = frontend; /* * This function is horribly wrong. For one thing, the alert @@ -692,9 +685,9 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, * should use the Notification Manager to wake up the user. In * any case, we shouldn't hold up processing of other connections' * data just because this one's waiting for the user. It should - * also handle a host key cache, of course, and see the note above - * about the "frontend" argument and the one below about closing - * the connection. All in all, a bit of a mess really. + * also handle a host key cache, of course, and see the note below + * about closing the connection. All in all, a bit of a mess + * really. */ stuff[0] = sprintf((char *)(&stuff[1]), @@ -711,7 +704,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, } } -void askcipher(void *frontend, char *ciphername, int cs) +void askalg(void *frontend, const char *algtype, const char *algname) { }