* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
-RCSID("$OpenBSD: auth2-chall.c,v 1.9 2001/12/09 18:45:56 markus Exp $");
+RCSID("$OpenBSD: auth2-chall.c,v 1.17 2002/03/18 17:50:31 provos Exp $");
#include "ssh2.h"
#include "auth.h"
+#include "buffer.h"
#include "packet.h"
#include "xmalloc.h"
#include "dispatch.h"
static int auth2_challenge_start(Authctxt *);
static int send_userauth_info_request(Authctxt *);
-static void input_userauth_info_response(int, int, void *);
+static void input_userauth_info_response(int, u_int32_t, void *);
#ifdef BSD_AUTH
extern KbdintDevice bsdauth_device;
kbdint_alloc(const char *devs)
{
KbdintAuthctxt *kbdintctxt;
+ Buffer b;
int i;
- char buf[1024];
kbdintctxt = xmalloc(sizeof(KbdintAuthctxt));
if (strcmp(devs, "") == 0) {
- buf[0] = '\0';
+ buffer_init(&b);
for (i = 0; devices[i]; i++) {
- if (i != 0)
- strlcat(buf, ",", sizeof(buf));
- strlcat(buf, devices[i]->name, sizeof(buf));
+ if (buffer_len(&b) > 0)
+ buffer_append(&b, ",", 1);
+ buffer_append(&b, devices[i]->name,
+ strlen(devices[i]->name));
}
- debug("kbdint_alloc: devices '%s'", buf);
- kbdintctxt->devices = xstrdup(buf);
+ buffer_append(&b, "\0", 1);
+ kbdintctxt->devices = xstrdup(buffer_ptr(&b));
+ buffer_free(&b);
} else {
kbdintctxt->devices = xstrdup(devs);
}
+ debug("kbdint_alloc: devices '%s'", kbdintctxt->devices);
kbdintctxt->ctxt = NULL;
kbdintctxt->device = NULL;
if (authctxt->user == NULL || !devs)
return 0;
- if (authctxt->kbdintctxt == NULL)
+ if (authctxt->kbdintctxt == NULL)
authctxt->kbdintctxt = kbdint_alloc(devs);
return auth2_challenge_start(authctxt);
}
}
static void
-input_userauth_info_response(int type, int plen, void *ctxt)
+input_userauth_info_response(int type, u_int32_t seq, void *ctxt)
{
Authctxt *authctxt = ctxt;
KbdintAuthctxt *kbdintctxt;
for (i = 0; i < nresp; i++)
response[i] = packet_get_string(NULL);
}
- packet_done();
+ packet_check_eom();
if (authctxt->valid) {
res = kbdintctxt->device->respond(kbdintctxt->ctxt,
len = strlen("keyboard-interactive") + 2 +
strlen(kbdintctxt->device->name);
method = xmalloc(len);
- method[0] = '\0';
- strlcat(method, "keyboard-interactive", len);
- strlcat(method, "/", len);
- strlcat(method, kbdintctxt->device->name, len);
+ snprintf(method, len, "keyboard-interactive/%s",
+ kbdintctxt->device->name);
if (!authctxt->postponed) {
if (authenticated) {
userauth_finish(authctxt, authenticated, method);
xfree(method);
}
+
+void
+privsep_challenge_enable(void)
+{
+#ifdef BSD_AUTH
+ extern KbdintDevice mm_bsdauth_device;
+#endif
+#ifdef SKEY
+ extern KbdintDevice mm_skey_device;
+#endif
+ /* As long as SSHv1 has devices[0] hard coded this is fine */
+#ifdef BSD_AUTH
+ devices[0] = &mm_bsdauth_device;
+#else
+#ifdef SKEY
+ devices[0] = &mm_skey_device;
+#endif
+#endif
+}