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.
This commit is contained in:
parent
93f9b5b4aa
commit
7cbfb01447
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=181090
@ -24,7 +24,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
__RCSID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifdef SKEY
|
#ifdef SKEY
|
||||||
|
|
||||||
@ -33,15 +32,7 @@ __RCSID("$FreeBSD$");
|
|||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
#include <stdio.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>
|
#include <skey.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
#include "key.h"
|
#include "key.h"
|
||||||
|
@ -1141,9 +1141,6 @@
|
|||||||
/* Define if you want OpenSSL's internally seeded PRNG only */
|
/* Define if you want OpenSSL's internally seeded PRNG only */
|
||||||
#define OPENSSL_PRNG_ONLY 1
|
#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 to the address where bug reports for this package should be sent. */
|
||||||
#define PACKAGE_BUGREPORT "openssh-unix-dev@mindrot.org"
|
#define PACKAGE_BUGREPORT "openssh-unix-dev@mindrot.org"
|
||||||
|
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
__RCSID("$FreeBSD$");
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
@ -47,16 +46,8 @@ __RCSID("$FreeBSD$");
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#ifdef SKEY
|
#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>
|
#include <skey.h>
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <openssl/dh.h>
|
#include <openssl/dh.h>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user