Project import generated by Copybara. GitOrigin-RevId: fdc06b52ddc5f01ec2ad692682627dc98a0b8179
diff --git a/Android.mk b/Android.mk index ecfe97c..8f1edb2 100644 --- a/Android.mk +++ b/Android.mk
@@ -45,14 +45,13 @@ LOCAL_CFLAGS := -O2 -pipe -Wall -g LOCAL_LDFLAGS := -Wl,-E -LOCAL_LDLIBS := -lcrypt -lutil -ldl +LOCAL_LDLIBS := -lutil -ldl LOCAL_SHARED_LIBRARIES := libcrypto libpam LOCAL_REQUIRED_MODULES := ppp-options LOCAL_CFLAGS += \ -DCHAPMS=1 \ -DHAS_SHADOW \ - -DHAVE_CRYPT_H=1 \ -DHAVE_MULTILINK \ -DUSE_TDB=1 \ -DPLUGIN \
diff --git a/pppd/auth.c b/pppd/auth.c index 00b885e..baed4cd 100644 --- a/pppd/auth.c +++ b/pppd/auth.c
@@ -1513,8 +1513,10 @@ if (secret[0] != 0 && !login_secret) { /* password given in pap-secrets - must match */ if (cryptpap || strcmp(passwd, secret) != 0) { +#ifdef HAVE_CRYPT_H char *cbuf = crypt(passwd, secret); if (!cbuf || strcmp(cbuf, secret) != 0) +#endif ret = UPAP_AUTHNAK; } }
diff --git a/pppd/session.c b/pppd/session.c index 2f1c83e..98a3a95 100644 --- a/pppd/session.c +++ b/pppd/session.c
@@ -343,8 +343,10 @@ */ if (pw->pw_passwd == NULL || strlen(pw->pw_passwd) < 2) return SESSION_FAILED; +#ifdef HAVE_CRYPT_H cbuf = crypt(passwd, pw->pw_passwd); if (!cbuf || strcmp(cbuf, pw->pw_passwd) != 0) +#endif return SESSION_FAILED; }