Attachment 514 Details for Bug 775 – bsd-cray.c, bsd-cray.h, configure.ac, deattack.c patches

[patch] bsd-cray.c, bsd-cray.h, configure.ac, deattack.c patches

patches.openssh.12172003 (text/plain), 7.25 KB, created by wendy palm on 2003-12-17 12:47:52 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: wendy palm

Created: 2003-12-17 12:47:52 AEDT

Size: 7.25 KB

patch

obsolete

>*** ./openbsd-compat/bsd-cray.c.orig	Wed Dec 17 13:31:49 2003
>--- ./openbsd-compat/bsd-cray.c	Wed Dec 17 13:32:26 2003
>***************
>*** 59,64 ****
>--- 59,86 ----
>  #include <ia.h>
>  #include <urm.h>
>  #include "ssh.h"
>+ 
>+ #include "includes.h"
>+ #include "sys/types.h"
>+ 
>+ #ifndef HAVE_STRUCT_SOCKADDR_STORAGE
>+ # define      _SS_MAXSIZE     128     /* Implementation specific max size */
>+ # define       _SS_PADSIZE     (_SS_MAXSIZE - sizeof (struct sockaddr))
>+ 
>+ # define ss_family ss_sa.sa_family
>+ #endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
>+ 
>+ #ifndef IN6_IS_ADDR_LOOPBACK
>+ # define IN6_IS_ADDR_LOOPBACK(a) \
>+ 	(((u_int32_t *) (a))[0] == 0 && ((u_int32_t *) (a))[1] == 0 && \
>+ 	 ((u_int32_t *) (a))[2] == 0 && ((u_int32_t *) (a))[3] == htonl (1))
>+ #endif /* !IN6_IS_ADDR_LOOPBACK */
>+ 
>+ #ifndef AF_INET6
>+ /* Define it to something that should never appear */
>+ #define AF_INET6 AF_MAX
>+ #endif
>+ 
>  #include "log.h"
>  #include "servconf.h"
>  #include "bsd-cray.h"
>***************
>*** 182,188 ****
>  	/* passwd stuff for ia_user */
>  	passwd_t pwdacm, pwddialup, pwdudb, pwdwal, pwddce;
>  	ia_user_ret_t uret;		/* stuff returned from ia_user */
>! 	ia_user_t usent			/* ia_user main structure */
>  	int ia_rcode;			/* ia_user return code */
>  	ia_failure_t fsent;		/* ia_failure structure */
>  	ia_failure_ret_t fret;		/* ia_failure return stuff */
>--- 204,210 ----
>  	/* passwd stuff for ia_user */
>  	passwd_t pwdacm, pwddialup, pwdudb, pwdwal, pwddce;
>  	ia_user_ret_t uret;		/* stuff returned from ia_user */
>! 	ia_user_t usent;		/* ia_user main structure */
>  	int ia_rcode;			/* ia_user return code */
>  	ia_failure_t fsent;		/* ia_failure structure */
>  	ia_failure_ret_t fret;		/* ia_failure return stuff */
>***************
>*** 501,554 ****
>  					break;
>  				default:
>  					valid_acct = nam2acid(acct_name);
>! 					if (valid_acct == -1) {
>  						printf(
>  						    "Account id not found for"
>  						    " account name \"%s\"\n\n",
>  						    acct_name);
>  					break;
>- 					}
>- 					/*
>- 					 * If an account was given, search the user's
>- 					 * acids array to verify they can use this account.
>- 					 */
>- 					if ((valid_acct != -1) &&
>- 					    !(ue.ue_permbits & PERMBITS_ACCTID)) {
>- 						for (i = 0; i < MAXVIDS; i++) {
>- 							if (ue.ue_acids[i] == -1)
>- 								break;
>- 							if (valid_acct == ue.ue_acids[i])
>- 								break;
>- 						}
>- 						if (i == MAXVIDS ||
>- 						    ue.ue_acids[i] == -1) {
>- 							fprintf(stderr, "Cannot set"
>- 							    " account name to "
>- 							    "\"%s\", permission "
>- 							    "denied\n\n", acct_name);
>- 							valid_acct = -1;
>- 						}
>- 					}
>  				}
>- 			} else {
>  				/*
>! 				 * The client isn't connected to a terminal and can't
>! 				 * respond to an acid prompt.  Use default acid.
>  				 */
>! 				debug("cray_setup: ttyname false case, %.100s",
>! 				    ttyname);
>! 				valid_acct = ue.ue_acids[0];
>  			}
>  		} else {
>  			/*
>! 			 * The user doesn't have the askacid permbit set or
>! 			 * only has one valid account to use.
>  			 */
>  			valid_acct = ue.ue_acids[0];
>  		}
>! 		if (acctid(0, valid_acct) < 0) {
>! 			printf ("Bad account id: %d\n", valid_acct);
>! 			exit(1);
>  	}
>  
>  	/* 
>--- 523,576 ----
>  					break;
>  				default:
>  					valid_acct = nam2acid(acct_name);
>! 					if (valid_acct == -1) 
>  						printf(
>  						    "Account id not found for"
>  						    " account name \"%s\"\n\n",
>  						    acct_name);
>  					break;
>  				}
>  				/*
>! 				 * If an account was given, search the user's
>! 				 * acids array to verify they can use this account.
>  				 */
>! 				if ((valid_acct != -1) &&
>! 				    !(ue.ue_permbits & PERMBITS_ACCTID)) {
>! 					for (i = 0; i < MAXVIDS; i++) {
>! 						if (ue.ue_acids[i] == -1)
>! 							break;
>! 						if (valid_acct == ue.ue_acids[i])
>! 							break;
>! 					}
>! 					if (i == MAXVIDS ||
>! 					    ue.ue_acids[i] == -1) {
>! 						fprintf(stderr, "Cannot set"
>! 						    " account name to "
>! 						    "\"%s\", permission "
>! 						    "denied\n\n", acct_name);
>! 						valid_acct = -1;
>! 					}
>! 				}
>  			}
>  		} else {
>  			/*
>! 			 * The client isn't connected to a terminal and can't
>! 			 * respond to an acid prompt.  Use default acid.
>  			 */
>+ 			debug("cray_setup: ttyname false case, %.100s",
>+ 			    ttyname);
>  			valid_acct = ue.ue_acids[0];
>  		}
>! 	} else {
>! 		/*
>! 		 * The user doesn't have the askacid permbit set or
>! 		 * only has one valid account to use.
>! 		 */
>! 		valid_acct = ue.ue_acids[0];
>! 	}
>! 	if (acctid(0, valid_acct) < 0) {
>! 		printf ("Bad account id: %d\n", valid_acct);
>! 		exit(1);
>  	}
>  
>  	/* 
>***************
>*** 778,781 ****
>  	ut->ut_jid = jid;
>  	strncpy(ut->ut_tpath, cray_tmpdir, TPATHSIZ);
>  }
>! #endif
>--- 800,816 ----
>  	ut->ut_jid = jid;
>  	strncpy(ut->ut_tpath, cray_tmpdir, TPATHSIZ);
>  }
>! #endif /* UNICOS */
>! 
>! #ifdef _UNICOSMP
>! #include <pwd.h>
>! /*
>!  * Set job id and create tmpdir directory.
>!  */
>! void
>! cray_init_job(struct passwd *pw)
>! {
>! 	initrm_silent(pw->pw_uid);
>! 	return;
>! }
>! #endif /* _UNICOSMP */
>===========
>*** ./openbsd-compat/bsd-cray.h.orig	Wed Dec 17 13:31:54 2003
>--- ./openbsd-compat/bsd-cray.h	Wed Dec 17 13:32:39 2003
>***************
>*** 53,59 ****
>  # define MAXHOSTNAMELEN  64
>  #endif
>  #ifndef _CRAYT3E
>- # include <sys/ttold.h>
>  # define TIOCGPGRP (tIOC|20)
>  #endif
>  
>--- 53,58 ----
>===========
>*** ./configure.ac.orig	Wed Dec 17 13:31:19 2003
>--- ./configure.ac	Wed Dec 17 13:34:53 2003
>***************
>*** 384,389 ****
>--- 384,393 ----
>  	MANTYPE=man
>  	;;
>  *-*-unicosmk*)
>+ 	AC_DEFINE(NO_SSH_LASTLOG)
>+ 	AC_DEFINE(SETEUID_BREAKS_SETUID)
>+ 	AC_DEFINE(BROKEN_SETREUID)
>+ 	AC_DEFINE(BROKEN_SETREGID)
>  	AC_DEFINE(USE_PIPES)
>  	AC_DEFINE(DISABLE_FD_PASSING)
>  	LDFLAGS="$LDFLAGS"
>***************
>*** 391,404 ****
>  	MANTYPE=cat
>  	;;
>  *-*-unicosmp*)
>  	AC_DEFINE(WITH_ABBREV_NO_TTY)
>  	AC_DEFINE(USE_PIPES)
>  	AC_DEFINE(DISABLE_FD_PASSING)
>  	LDFLAGS="$LDFLAGS"
>! 	LIBS="$LIBS -lgen -lacid"
>  	MANTYPE=cat
>  	;;
>  *-*-unicos*)
>  	AC_DEFINE(USE_PIPES)
>  	AC_DEFINE(DISABLE_FD_PASSING)
>  	AC_DEFINE(NO_SSH_LASTLOG)
>--- 395,414 ----
>  	MANTYPE=cat
>  	;;
>  *-*-unicosmp*)
>+ 	AC_DEFINE(SETEUID_BREAKS_SETUID)
>+ 	AC_DEFINE(BROKEN_SETREUID)
>+ 	AC_DEFINE(BROKEN_SETREGID)
>  	AC_DEFINE(WITH_ABBREV_NO_TTY)
>  	AC_DEFINE(USE_PIPES)
>  	AC_DEFINE(DISABLE_FD_PASSING)
>  	LDFLAGS="$LDFLAGS"
>! 	LIBS="$LIBS -lgen -lacid -ldb"
>  	MANTYPE=cat
>  	;;
>  *-*-unicos*)
>+ 	AC_DEFINE(SETEUID_BREAKS_SETUID)
>+ 	AC_DEFINE(BROKEN_SETREUID)
>+ 	AC_DEFINE(BROKEN_SETREGID)
>  	AC_DEFINE(USE_PIPES)
>  	AC_DEFINE(DISABLE_FD_PASSING)
>  	AC_DEFINE(NO_SSH_LASTLOG)
>===========
>*** ./deattack.c.orig	Wed Dec 17 13:31:43 2003
>--- ./deattack.c	Wed Dec 17 13:32:54 2003
>***************
>*** 33,39 ****
>  
>  /* Hashing constants */
>  #define HASH_MINSIZE	(8 * 1024)
>! #define HASH_ENTRYSIZE	(2)
>  #define HASH_FACTOR(x)	((x)*3/2)
>  #define HASH_UNUSEDCHAR	(0xff)
>  #define HASH_UNUSED	(0xffff)
>--- 33,39 ----
>  
>  /* Hashing constants */
>  #define HASH_MINSIZE	(8 * 1024)
>! #define HASH_ENTRYSIZE	(sizeof(u_int16_t))
>  #define HASH_FACTOR(x)	((x)*3/2)
>  #define HASH_UNUSEDCHAR	(0xff)
>  #define HASH_UNUSED	(0xffff)
>***************
>*** 128,134 ****
>--- 128,138 ----
>  		}
>  		return (DEATTACK_OK);
>  	}
>+ #ifdef _UNICOS
>+ 	for (i=0; i<n; i++) h[i] = HASH_UNUSED;
>+ #else
>  	memset(h, HASH_UNUSEDCHAR, n * HASH_ENTRYSIZE);
>+ #endif /* _UNICOS */
>  
>  	if (IV)
>  		h[HASH(IV) & (n - 1)] = HASH_IV;

Actions: View | Diff

Attachments on bug 775: 514 | 789