Use libcrypto instead of libdes.

Also - OpenSSH blesses us with a module for PAM.

5 files changed, 32 insertions, 3 deletions

diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index f8143a5..a1eb403 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -71,6 +71,9 @@ STATIC_MODULES+= ${MODOBJDIR}/pam_kerberos5/libpam_kerberos5.a
 STATIC_MODULES+= ${MODOBJDIR}/pam_permit/libpam_permit.a
 STATIC_MODULES+= ${MODOBJDIR}/pam_radius/libpam_radius.a
 STATIC_MODULES+= ${MODOBJDIR}/pam_skey/libpam_skey.a
+.if !defined(NO_OPENSSL)
+STATIC_MODULES+= ${MODOBJDIR}/pam_ssh/libpam_ssh.a
+.endif
 STATIC_MODULES+= ${MODOBJDIR}/pam_tacplus/libpam_tacplus.a
 STATIC_MODULES+= ${MODOBJDIR}/pam_unix/libpam_unix.a
 
diff --git a/lib/libpam/modules/Makefile b/lib/libpam/modules/Makefile
index 8018dbd..1404b36 100644
--- a/lib/libpam/modules/Makefile
+++ b/lib/libpam/modules/Makefile
@@ -29,9 +29,15 @@ SUBDIR+=	pam_deny
 .if defined(MAKE_KERBEROS4) && !defined(NOCRYPT)
 SUBDIR+=	pam_kerberosIV
 .endif
+.if defined(MAKE_KERBEROS5) && !defined(NOCRYPT)
+SUBDIR+=	pam_kerberos5
+.endif
 SUBDIR+=	pam_permit
 SUBDIR+=	pam_radius
 SUBDIR+=	pam_skey
+.if !defined(NO_OPENSSL)
+SUBDIR+=	pam_ssh
+.endif
 SUBDIR+=	pam_tacplus
 SUBDIR+=	pam_unix
 
diff --git a/lib/libpam/modules/pam_kerberosIV/Makefile b/lib/libpam/modules/pam_kerberosIV/Makefile
index ee4e6a6..b487946 100644
--- a/lib/libpam/modules/pam_kerberosIV/Makefile
+++ b/lib/libpam/modules/pam_kerberosIV/Makefile
@@ -36,8 +36,8 @@ CFLAGS+=	-DKERBEROS
 DPADD+=		${LIBKRB}
 LDADD+=		-lkrb
 .if !defined(NOSECURE)
-DPADD+=		${LIBDES}
-LDADD+=		-ldes
+DPADD+=		${LIBCRYPTO}
+LDADD+=		-lcrypto
 .endif
 DPADD+=		${LIBGCC_PIC} ${LIBCOM_ERR}
 LDADD+=		-lgcc_pic -lcom_err
diff --git a/lib/libpam/modules/pam_kerberosIV/klogin.c b/lib/libpam/modules/pam_kerberosIV/klogin.c
index 7c61b84..7abe878 100644
--- a/lib/libpam/modules/pam_kerberosIV/klogin.c
+++ b/lib/libpam/modules/pam_kerberosIV/klogin.c
@@ -29,6 +29,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -38,7 +40,7 @@ static const char sccsid[] = "@(#)klogin.c	8.3 (Berkeley) 4/2/94";
 #ifdef KERBEROS
 #include <sys/param.h>
 #include <sys/syslog.h>
-#include <des.h>
+#include <openssl/des.h>
 #include <krb.h>
 
 #include <err.h>
diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile
new file mode 100644
index 0000000..62cf248
--- /dev/null
+++ b/lib/libpam/modules/pam_ssh/Makefile
@@ -0,0 +1,18 @@
+# PAM module for SSH
+# $FreeBSD$
+
+SSHSRC=	${.CURDIR}/../../../../crypto/openssh
+
+LIB=		pam_ssh
+SHLIB_NAME=	pam_ssh.so
+SRCS=		log-client.c pam_ssh.c
+CFLAGS+=	-Wall -I${SSHSRC}
+DPADD+=		${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} ${LIBGCC_PIC}
+LDADD+=		-lcrypto -lcrypt -lutil -lz -lgcc_pic
+INTERNALLIB=	yes
+INTERNALSTATICLIB=yes
+
+.include <bsd.lib.mk>
+
+.PATH:		${SSHSRC}/pam_ssh
+.PATH:		${SSHSRC}