- stevesk@cvs.openbsd.org 2006/07/06 16:03:53

[openssh.git] / sshconnect.h

diff --git a/sshconnect.h b/sshconnect.h
index 6610401858d1204d77f80620a776d00faea94a2f..c1b07390b38d155ed49988ed5938bad0b54084c4 100644 (file)
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sshconnect.h,v 1.9 2001/04/12 19:15:25 markus Exp $   */
+/* $OpenBSD: sshconnect.h,v 1.21 2006/07/06 16:03:53 stevesk Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -26,30 +26,52 @@
 #ifndef SSHCONNECT_H
 #define SSHCONNECT_H
 
+#include <sys/types.h>
+
+#include <pwd.h>
+
+typedef struct Sensitive Sensitive;
+struct Sensitive {
+       Key     **keys;
+       int     nkeys;
+       int     external_keysign;
+};
+
 int
-ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
-    u_short port, int connection_attempts,
-    int anonymous, struct passwd *pw,
-    const char *proxy_command);
+ssh_connect(const char *, struct sockaddr_storage *, u_short, int, int,
+    int, const char *);
 
 void
-ssh_login(Key **keys, int nkeys, const char *orighost,
-    struct sockaddr *hostaddr, struct passwd *pw);
+ssh_login(Sensitive *, const char *, struct sockaddr *, struct passwd *);
 
-void
-check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
-    const char *user_hostfile, const char *system_hostfile);
+int     verify_host_key(char *, struct sockaddr *, Key *);
 
-void   ssh_kex(char *host, struct sockaddr *hostaddr);
-void   ssh_kex2(char *host, struct sockaddr *hostaddr);
+void    ssh_kex(char *, struct sockaddr *);
+void    ssh_kex2(char *, struct sockaddr *);
 
-void
-ssh_userauth1(const char *local_user, const char *server_user, char *host,
-    Key **keys, int nkeys);
-void
-ssh_userauth2(const char *local_user, const char *server_user, char *host,
-    Key **keys, int nkeys);
+void    ssh_userauth1(const char *, const char *, char *, Sensitive *);
+void    ssh_userauth2(const char *, const char *, char *, Sensitive *);
+
+void    ssh_put_password(char *);
+int     ssh_local_cmd(const char *);
+
+/*
+ * Macros to raise/lower permissions.
+ */
+#define PRIV_START do {                                        \
+       int save_errno = errno;                         \
+       if (seteuid(original_effective_uid) != 0)       \
+               fatal("PRIV_START: seteuid: %s",        \
+                   strerror(errno));                   \
+       errno = save_errno;                             \
+} while (0)
 
-void   ssh_put_password(char *password);
+#define PRIV_END do {                                  \
+       int save_errno = errno;                         \
+       if (seteuid(original_real_uid) != 0)            \
+               fatal("PRIV_END: seteuid: %s",          \
+                   strerror(errno));                   \
+       errno = save_errno;                             \
+} while (0)
 
 #endif