- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / auth.h

diff --git a/auth.h b/auth.h
index 6688c3dc56d684d50a29084eecac174669ba7fff..bebfb672dec4d7ee90f741e72c4b868995cb48d8 100644 (file)
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.h,v 1.54 2006/07/06 16:03:53 stevesk Exp $ */
+/* $OpenBSD: auth.h,v 1.63 2009/08/15 18:56:34 fgsch Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -28,12 +28,8 @@
 #ifndef AUTH_H
 #define AUTH_H
 
-#include <sys/types.h>
-
 #include <signal.h>
-#include <pwd.h>
 
-#include "buffer.h"
 #include <openssl/rsa.h>
 
 #ifdef HAVE_LOGIN_CAP
@@ -46,15 +42,13 @@
 #include <krb5.h>
 #endif
 
-#include "key.h"
-#include "hostfile.h"
-
 typedef struct Authctxt Authctxt;
 typedef struct Authmethod Authmethod;
 typedef struct KbdintDevice KbdintDevice;
 
 struct Authctxt {
        sig_atomic_t     success;
+       int              authenticated; /* authenticated and alarms cancelled */
        int              postponed;     /* authentication needs another step */
        int              valid;         /* user exists and is allowed to login */
        int              attempt;
@@ -65,6 +59,7 @@ struct Authctxt {
        struct passwd   *pw;            /* set if 'valid' */
        char            *style;
        void            *kbdintctxt;
+       void            *jpake_ctx;
 #ifdef BSD_AUTH
        auth_session_t  *as;
 #endif
@@ -162,6 +157,9 @@ int bsdauth_respond(void *, u_int, char **);
 int    skey_query(void *, char **, char **, u_int *, char ***, u_int **);
 int    skey_respond(void *, u_int, char **);
 
+void   auth2_jpake_get_pwdata(Authctxt *, BIGNUM **, char **, char **);
+void   auth2_jpake_stop(Authctxt *);
+
 int    allowed_user(struct passwd *);
 struct passwd * getpwnamallow(const char *user);
 
@@ -172,8 +170,7 @@ void        abandon_challenge_response(Authctxt *);
 char   *authorized_keys_file(struct passwd *);
 char   *authorized_keys_file2(struct passwd *);
 
-int
-secure_filename(FILE *, const char *, struct passwd *, char *, size_t);
+FILE   *auth_openkeyfile(const char *, struct passwd *, int);
 
 HostStatus
 check_key_in_hostfiles(struct passwd *, Key *, const char *,