From e262f873e53b69278a97f93168abaf06dfe107a2 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Fri, 18 Jan 2002 12:58:49 +0000 Subject: [PATCH] commit some forgotten changes git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10809 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/telnet/libtelnet/auth.c | 3 +++ appl/telnet/libtelnet/enc-proto.h | 1 + appl/telnet/libtelnet/encrypt.c | 7 +++++++ 3 files changed, 11 insertions(+) diff --git a/appl/telnet/libtelnet/auth.c b/appl/telnet/libtelnet/auth.c index 36f73d450..9f5d7605a 100644 --- a/appl/telnet/libtelnet/auth.c +++ b/appl/telnet/libtelnet/auth.c @@ -100,6 +100,8 @@ extern rsaencpwd_printsub(); #endif int auth_debug_mode = 0; +int auth_has_failed = 0; +int auth_enable_encrypt = 0; static const char *Name = "Noname"; static int Server = 0; static Authenticator *authenticated = 0; @@ -468,6 +470,7 @@ auth_send(unsigned char *data, int cnt) if (auth_debug_mode) printf(">>>%s: Sent failure message\r\n", Name); auth_finished(0, AUTH_REJECT); + auth_has_failed = 1; #ifdef KANNAN /* * We requested strong authentication, however no mechanisms worked. diff --git a/appl/telnet/libtelnet/enc-proto.h b/appl/telnet/libtelnet/enc-proto.h index bc43e9a8b..2fcf0c311 100644 --- a/appl/telnet/libtelnet/enc-proto.h +++ b/appl/telnet/libtelnet/enc-proto.h @@ -93,6 +93,7 @@ void encrypt_request_start(unsigned char*, int); void encrypt_send_end(void); void encrypt_send_keyid(int, unsigned char*, int, int); void encrypt_send_request_end(void); +int encrypt_is_encrypting(void); void encrypt_send_request_start(void); void encrypt_send_support(void); void encrypt_session_key(Session_Key*, int); diff --git a/appl/telnet/libtelnet/encrypt.c b/appl/telnet/libtelnet/encrypt.c index 923c5452b..d36999018 100644 --- a/appl/telnet/libtelnet/encrypt.c +++ b/appl/telnet/libtelnet/encrypt.c @@ -952,6 +952,13 @@ encrypt_delay(void) return 0; } +int encrypt_is_encrypting() +{ + if (encrypt_output && decrypt_input) + return 1; + return 0; +} + void encrypt_debug(int mode) {