diff options
| -rw-r--r-- | crypto/openssh/auth-skey.c | 9 | ||||
| -rw-r--r-- | crypto/openssh/config.h | 3 | ||||
| -rw-r--r-- | crypto/openssh/monitor.c | 9 |
3 files changed, 0 insertions, 21 deletions
diff --git a/crypto/openssh/auth-skey.c b/crypto/openssh/auth-skey.c index 426b052..25073db 100644 --- a/crypto/openssh/auth-skey.c +++ b/crypto/openssh/auth-skey.c @@ -24,7 +24,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #ifdef SKEY @@ -33,15 +32,7 @@ __RCSID("$FreeBSD$"); #include <pwd.h> #include <stdio.h> -#ifdef OPIE -#include <opie.h> -#define skey opie -#define skeychallenge(k, u, c) opiechallenge((k), (u), (c)) -#define skey_haskey(u) opie_haskey((u)) -#define skey_passcheck(u, r) opie_passverify((u), (r)) -#else #include <skey.h> -#endif #include "xmalloc.h" #include "key.h" diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h index 88412ab..d135826 100644 --- a/crypto/openssh/config.h +++ b/crypto/openssh/config.h @@ -1141,9 +1141,6 @@ /* Define if you want OpenSSL's internally seeded PRNG only */ #define OPENSSL_PRNG_ONLY 1 -/* Define if S/Key is actually OPIE */ -/* #undef OPIE */ - /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "openssh-unix-dev@mindrot.org" diff --git a/crypto/openssh/monitor.c b/crypto/openssh/monitor.c index 8702a91..48ae46c 100644 --- a/crypto/openssh/monitor.c +++ b/crypto/openssh/monitor.c @@ -26,7 +26,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> @@ -47,16 +46,8 @@ __RCSID("$FreeBSD$"); #include <unistd.h> #ifdef SKEY -#ifdef OPIE -#include <opie.h> -#define skey opie -#define skeychallenge(k, u, c) opiechallenge((k), (u), (c)) -#define skey_haskey(u) opie_haskey((u)) -#define skey_passcheck(u, r) opie_passverify((u), (r)) -#else #include <skey.h> #endif -#endif #include <openssl/dh.h> |
