From 9a1a6a57a5b7bbe0197f6ff672a7f1db335fd03c Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Jun 07 2004 19:09:03 +0000 Subject: - prepare to work around libcrypto/libdes425 incompatibility --- diff --git a/ChangeLog b/ChangeLog index a46d63e..9e5daef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-05-07 nalin: + * pam_krb5afs.c: Allocate twice as much space as we should need to for + DES argument structures, in case weird run-time linking gives us the + OpenSSL libcrypto DES functions instead of the libdes425 versions on + an architecture where it matters. + Wed Aug 22 2001 Nalin Dahyabhai - Add minimum UID support (suggested by Matthew Miller). - Don't link pam_krb5 with libkrbafs. diff --git a/pam_krb5.spec b/pam_krb5.spec index 7484542..6768874 100644 --- a/pam_krb5.spec +++ b/pam_krb5.spec @@ -1,7 +1,7 @@ Summary: A Pluggable Authentication Module for Kerberos 5. Name: pam_krb5 Version: 1.47 -Release: 3 +Release: 4 Source0: pam_krb5-%{version}-%{release}.tar.gz License: LGPL Group: System Environment/Base @@ -39,6 +39,11 @@ make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} # $Id$ %changelog +* Mon Jun 7 2004 Nalin Dahyabhai 1.47-4 +- work around possible incompatibility between libcrypto and libdes425 when + loaded by applications which link to a libcrypto built without DES_INT on + arches where sizeof(int) != sizeof(long) + * Fri Jan 25 2002 Nalin Dahyabhai 1.47-3 - bump release number and rebuild diff --git a/pam_krb5afs.c b/pam_krb5afs.c index 75d474a..b08c816 100644 --- a/pam_krb5afs.c +++ b/pam_krb5afs.c @@ -1455,8 +1455,8 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) v4realm) == KSUCCESS) { KTEXT_ST ciphertext_st; KTEXT ciphertext = &ciphertext_st; - des_cblock key; - des_key_schedule key_schedule; + des_cblock key[2]; + des_key_schedule key_schedule[2]; int k4rc; /* Request a TGT for this realm. */