- (djm) Stop shadow expiry checking from preventing logins with NIS. Based

[openssh.git] / kex.h

diff --git a/kex.h b/kex.h
index 81c41342a4e1d2fa392884ddb82ee625a56e4709..7e5c67024bff2f2676cd3ab403d369199c883feb 100644 (file)
--- a/kex.h
+++ b/kex.h
@@ -29,17 +29,6 @@
 #ifndef KEX_H
 #define KEX_H
 
-#include "config.h"
-
-#ifdef HAVE_OPENSSL
-# include <openssl/bn.h>
-# include <openssl/evp.h>
-#endif
-#ifdef HAVE_SSL
-# include <ssl/bn.h>
-# include <ssl/evp.h>
-#endif
-
 #define        KEX_DH1 "diffie-hellman-group1-sha1"
 #define KEX_DSS        "ssh-dss"
 
@@ -102,11 +91,17 @@ struct Kex {
 };
 
 Buffer *kex_init(char *myproposal[PROPOSAL_MAX]);
-DH     *new_dh_group1();
-Kex    *kex_choose_conf(char *cprop[PROPOSAL_MAX], char *sprop[PROPOSAL_MAX], int server);
+void
+kex_exchange_kexinit(
+    Buffer *my_kexinit, Buffer *peer_kexint,
+    char *peer_proposal[PROPOSAL_MAX]);
+Kex *
+kex_choose_conf(char *cprop[PROPOSAL_MAX],
+    char *sprop[PROPOSAL_MAX], int server);
 int    kex_derive_keys(Kex *k, unsigned char *hash, BIGNUM *shared_secret);
-void   bignum_print(BIGNUM *b);
 void   packet_set_kex(Kex *k);
+int    dh_pub_is_valid(DH *dh, BIGNUM *dh_pub);
+DH     *dh_new_group1();
 
 unsigned char *
 kex_hash(