Attachment #214320 for bug #298539




#include <signal.h>
#include <pwd.h>
#include <shadow.h>
#include <xcrypt.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <rpcsvc/ypclnt.h>


	/* This exists because of timing attacks. */
	memset(input, 0x55, sizeof(input));
	fake_salt = xcrypt_gensalt_ra(pam_unix_param.crypt_prefix,
	    pam_unix_param.count, input, sizeof(input));

	if (!fake_salt) {
		pam_syslog(pamh, LOG_CRIT, "xcrypt_gensalt_ra: %m");
		return PAM_BUF_ERR;
	}


	void *data = NULL;
	int size = 0;

	retval = xcrypt_ra(key, salt, &data, &size);
	if (retval)
		retval = strdup(retval); /* we return NULL if strdup fails */
	else
		pam_syslog(pamh, LOG_CRIT, "xcrypt_ra: %m");
	if (data) {
		memset(data, 0, size);
		free(data);

Lines 13-19 Link Here

(-)pam_tcb/Makefile.orig (-1 / +1 lines)
13		13
14	$(PAM_TCB): $(LIBOBJ) $(PAM_MAP)	14	$(PAM_TCB): $(LIBOBJ) $(PAM_MAP)
15	$(CC) $(LDFLAGS) -shared -o $@ -Wl,--version-script=$(PAM_MAP) \	15	$(CC) $(LDFLAGS) -shared -o $@ -Wl,--version-script=$(PAM_MAP) \
16	$(LIBOBJ) -lnsl -lcrypt -lpam -ltcb	16	$(LIBOBJ) -lnsl -lxcrypt -lpam -ltcb
17		17
18	.c.o:	18	.c.o:
19	$(CC) $(CFLAGS) -fPIC -c $< -o $@	19	$(CC) $(CFLAGS) -fPIC -c $< -o $@

Return to bug 298539

Lines 10-16 Link Here

(-)pam_tcb/support.c.orig (-5 / +5 lines)
10	#include <signal.h>	10	#include <signal.h>
11	#include <pwd.h>	11	#include <pwd.h>
12	#include <shadow.h>	12	#include <shadow.h>
13	#include <crypt.h>	13	#include <xcrypt.h>
14	#include <sys/types.h>	14	#include <sys/types.h>
15	#include <sys/wait.h>	15	#include <sys/wait.h>
16	#include <rpcsvc/ypclnt.h>	16	#include <rpcsvc/ypclnt.h>
Lines 481-491 Link Here
481		481
482	/* This exists because of timing attacks. */	482	/* This exists because of timing attacks. */
483	memset(input, 0x55, sizeof(input));	483	memset(input, 0x55, sizeof(input));
484	fake_salt = crypt_gensalt_ra(pam_unix_param.crypt_prefix,	484	fake_salt = xcrypt_gensalt_ra(pam_unix_param.crypt_prefix,
485	pam_unix_param.count, input, sizeof(input));	485	pam_unix_param.count, input, sizeof(input));
486		486
487	if (!fake_salt) {	487	if (!fake_salt) {
488	pam_syslog(pamh, LOG_CRIT, "crypt_gensalt_ra: %m");	488	pam_syslog(pamh, LOG_CRIT, "xcrypt_gensalt_ra: %m");
489	return PAM_BUF_ERR;	489	return PAM_BUF_ERR;
490	}	490	}
491		491
Lines 823-833 Link Here
823	void *data = NULL;	823	void *data = NULL;
824	int size = 0;	824	int size = 0;
825		825
826	retval = crypt_ra(key, salt, &data, &size);	826	retval = xcrypt_ra(key, salt, &data, &size);
827	if (retval)	827	if (retval)
828	retval = strdup(retval); /* we return NULL if strdup fails */	828	retval = strdup(retval); /* we return NULL if strdup fails */
829	else	829	else
830	pam_syslog(pamh, LOG_CRIT, "crypt_ra: %m");	830	pam_syslog(pamh, LOG_CRIT, "xcrypt_ra: %m");
831	if (data) {	831	if (data) {
832	memset(data, 0, size);	832	memset(data, 0, size);
833	free(data);	833	free(data);