- (tim) [kex.c myproposal.h md-sha256.c openbsd-compat/sha2.c,h] Disable

[openssh.git] / sshconnect.h

diff --git a/sshconnect.h b/sshconnect.h
index c15ed4bc4f8d69f90af25a71dd3bf17123792b42..e7c7a2b340dee3bfad9b772a1c389f8f6070c1b2 100644 (file)
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sshconnect.h,v 1.11 2001/06/26 06:33:03 itojun Exp $  */
+/*     $OpenBSD: sshconnect.h,v 1.18 2005/12/06 22:38:28 reyk Exp $    */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -26,21 +26,44 @@
 #ifndef SSHCONNECT_H
 #define SSHCONNECT_H
 
+typedef struct Sensitive Sensitive;
+struct Sensitive {
+       Key     **keys;
+       int     nkeys;
+       int     external_keysign;
+};
+
 int
-ssh_connect(const char *, struct sockaddr_storage *, u_short, int,
-    int, struct passwd *, const char *);
+ssh_connect(const char *, struct sockaddr_storage *, u_short, int, int,
+    int, const char *);
 
 void
-ssh_login(Key **, int, const char *, struct sockaddr *, struct passwd *);
+ssh_login(Sensitive *, const char *, struct sockaddr *, struct passwd *);
+
+int     verify_host_key(char *, struct sockaddr *, Key *);
+
+void    ssh_kex(char *, struct sockaddr *);
+void    ssh_kex2(char *, struct sockaddr *);
 
-int    verify_host_key(char *, struct sockaddr *, Key *);
+void    ssh_userauth1(const char *, const char *, char *, Sensitive *);
+void    ssh_userauth2(const char *, const char *, char *, Sensitive *);
 
-void   ssh_kex(char *, struct sockaddr *);
-void   ssh_kex2(char *, struct sockaddr *);
+void    ssh_put_password(char *);
+int     ssh_local_cmd(const char *);
 
-void   ssh_userauth1(const char *, const char *, char *, Key **, int);
-void   ssh_userauth2(const char *, const char *, char *, Key **, int);
+/*
+ * Macros to raise/lower permissions.
+ */
+#define PRIV_START do {                                \
+       int save_errno = errno;                 \
+       (void)seteuid(original_effective_uid);  \
+       errno = save_errno;                     \
+} while (0)
 
-void   ssh_put_password(char *);
+#define PRIV_END do {                          \
+       int save_errno = errno;                 \
+       (void)seteuid(original_real_uid);       \
+       errno = save_errno;                     \
+} while (0)
 
 #endif