Revert an old hack I put in to replace S/Key with OPIE. We haven't used

that code in ages - we use pam_opie(8) instead - so this is a NOP.

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"

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"
 

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>