Date: Fri, 31 Jan 2003 14:37:36 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 24489 for review Message-ID: <200301312237.h0VMbaur032969@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=24489 Change 24489 by marcel@marcel_nfs on 2003/01/31 14:36:44 IFC @24488. Affected files ... .. //depot/projects/ia64/MAINTAINERS#21 integrate .. //depot/projects/ia64/Makefile#21 integrate .. //depot/projects/ia64/UPDATING#31 integrate .. //depot/projects/ia64/bin/chmod/chmod.c#5 integrate .. //depot/projects/ia64/contrib/gcc/gcc.c#12 integrate .. //depot/projects/ia64/crypto/kerberosIV/admin/kdb_edit.c#2 integrate .. //depot/projects/ia64/crypto/kerberosIV/admin/kdb_init.c#2 integrate .. //depot/projects/ia64/crypto/kerberosIV/kadmin/kadmin.c#2 integrate .. //depot/projects/ia64/crypto/kerberosIV/kadmin/ksrvutil.c#2 integrate .. //depot/projects/ia64/crypto/kerberosIV/kadmin/ksrvutil_get.c#2 integrate .. //depot/projects/ia64/crypto/kerberosIV/kadmin/random_password.c#2 integrate .. //depot/projects/ia64/crypto/kerberosIV/server/kerberos.c#3 integrate .. //depot/projects/ia64/crypto/openssh/auth-chall.c#4 integrate .. //depot/projects/ia64/crypto/openssh/monitor.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/des/rnd_keys.c#2 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/enc_des.c#3 integrate .. //depot/projects/ia64/crypto/telnet/libtelnet/kerberos.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#17 integrate .. //depot/projects/ia64/lib/libc/gen/getosreldate.3#1 branch .. //depot/projects/ia64/lib/libc/stdio/gets.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.c#15 integrate .. //depot/projects/ia64/lib/libc/sys/chroot.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/rfork.2#6 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_krb5/pam_krb5.c#9 integrate .. //depot/projects/ia64/lib/libufs/Makefile#4 integrate .. //depot/projects/ia64/lib/libufs/block.c#5 integrate .. //depot/projects/ia64/lib/libufs/libufs.h#6 integrate .. //depot/projects/ia64/lib/libufs/type.c#6 integrate .. //depot/projects/ia64/libexec/ftpd/ftpchroot.5#2 integrate .. //depot/projects/ia64/libexec/ftpd/ftpcmd.y#13 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.8#9 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.c#18 integrate .. //depot/projects/ia64/release/Makefile#37 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#8 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#64 integrate .. //depot/projects/ia64/release/pc98/dokern.sh#7 integrate .. //depot/projects/ia64/release/pc98/drivers-small.conf#3 integrate .. //depot/projects/ia64/sbin/Makefile#21 integrate .. //depot/projects/ia64/sbin/newfs/Makefile#6 integrate .. //depot/projects/ia64/sbin/newfs/mkfs.c#22 integrate .. //depot/projects/ia64/sbin/newfs/newfs.c#18 integrate .. //depot/projects/ia64/sbin/newfs/newfs.h#9 integrate .. //depot/projects/ia64/sbin/newfs_msdos/Makefile#3 integrate .. //depot/projects/ia64/sbin/ping/ping.c#14 integrate .. //depot/projects/ia64/sbin/sunlabel/Makefile#1 branch .. //depot/projects/ia64/sbin/sunlabel/sunlabel.c#1 branch .. //depot/projects/ia64/secure/lib/libcrypto/Makefile#13 integrate .. //depot/projects/ia64/secure/lib/libssl/Makefile#7 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#24 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/apm.4#2 integrate .. //depot/projects/ia64/share/man/man4/umass.4#6 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#27 integrate .. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#6 integrate .. //depot/projects/ia64/sys/alpha/include/bus.h#6 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/Makefile#10 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#30 integrate .. //depot/projects/ia64/sys/conf/NOTES#35 integrate .. //depot/projects/ia64/sys/conf/files#59 integrate .. //depot/projects/ia64/sys/conf/files.i386#28 integrate .. //depot/projects/ia64/sys/conf/files.ia64#31 integrate .. //depot/projects/ia64/sys/conf/files.pc98#21 integrate .. //depot/projects/ia64/sys/conf/files.x86_64#7 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#23 integrate .. //depot/projects/ia64/sys/conf/options#41 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#16 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#16 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.c#13 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-fd.c#11 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_card.c#2 integrate .. //depot/projects/ia64/sys/dev/cm/smc90cx6.c#7 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#14 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#7 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#7 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.c#4 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#12 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcivar.h#6 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#12 integrate .. //depot/projects/ia64/sys/dev/md/md.c#19 integrate .. //depot/projects/ia64/sys/dev/sio/sio_pci.c#14 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder_rate.c#4 integrate .. //depot/projects/ia64/sys/dev/usb/umass.c#18 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#22 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#21 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#21 integrate .. //depot/projects/ia64/sys/dev/xe/if_xe.c#7 integrate .. //depot/projects/ia64/sys/dev/zs/zs.c#6 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_devs.c#9 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_rule.c#7 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vfsops.c#10 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#23 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#11 integrate .. //depot/projects/ia64/sys/geom/geom_apple.c#1 branch .. //depot/projects/ia64/sys/geom/geom_disk.c#20 integrate .. //depot/projects/ia64/sys/geom/geom_enc.c#7 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#22 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#14 integrate .. //depot/projects/ia64/sys/i386/include/bus_dma.h#3 integrate .. //depot/projects/ia64/sys/i386/include/clock.h#3 integrate .. //depot/projects/ia64/sys/i386/isa/clock.c#11 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_isppp.c#7 integrate .. //depot/projects/ia64/sys/ia64/ia64/sscdisk.c#6 integrate .. //depot/projects/ia64/sys/kern/init_main.c#24 integrate .. //depot/projects/ia64/sys/kern/kern_conf.c#13 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#45 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#26 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#2 integrate .. //depot/projects/ia64/sys/kern/subr_disk.c#12 integrate .. //depot/projects/ia64/sys/kern/subr_disklabel.c#13 delete .. //depot/projects/ia64/sys/kern/subr_diskmbr.c#10 delete .. //depot/projects/ia64/sys/kern/subr_diskslice.c#17 delete .. //depot/projects/ia64/sys/kern/subr_trap.c#20 integrate .. //depot/projects/ia64/sys/kern/sysv_sem.c#11 integrate .. //depot/projects/ia64/sys/kern/tty_tty.c#7 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#36 integrate .. //depot/projects/ia64/sys/net/if_arcsubr.c#8 integrate .. //depot/projects/ia64/sys/net/if_tap.c#15 integrate .. //depot/projects/ia64/sys/net/if_tun.c#12 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#21 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#21 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#18 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#25 integrate .. //depot/projects/ia64/sys/pc98/pc98/atapi.c#3 integrate .. //depot/projects/ia64/sys/pc98/pc98/clock.c#10 integrate .. //depot/projects/ia64/sys/pc98/pc98/diskslice_machdep.c#9 delete .. //depot/projects/ia64/sys/pc98/pc98/wfd.c#3 delete .. //depot/projects/ia64/sys/pc98/pc98/wst.c#4 delete .. //depot/projects/ia64/sys/pci/if_sisreg.h#8 integrate .. //depot/projects/ia64/sys/pci/if_vr.c#13 integrate .. //depot/projects/ia64/sys/pci/if_vrreg.h#5 integrate .. //depot/projects/ia64/sys/powerpc/include/bus.h#6 integrate .. //depot/projects/ia64/sys/powerpc/powermac/ata_macio.c#3 integrate .. //depot/projects/ia64/sys/powerpc/powermac/macio.c#4 integrate .. //depot/projects/ia64/sys/powerpc/powermac/maciovar.h#3 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#27 integrate .. //depot/projects/ia64/sys/sparc64/include/bus.h#10 integrate .. //depot/projects/ia64/sys/sparc64/include/iommuvar.h#7 integrate .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#17 integrate .. //depot/projects/ia64/sys/sparc64/sbus/sbus.c#8 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/bus_machdep.c#9 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/iommu.c#10 integrate .. //depot/projects/ia64/sys/sys/bio.h#12 integrate .. //depot/projects/ia64/sys/sys/disk.h#8 integrate .. //depot/projects/ia64/sys/sys/disklabel.h#22 integrate .. //depot/projects/ia64/sys/sys/diskslice.h#6 integrate .. //depot/projects/ia64/sys/sys/timetc.h#8 integrate .. //depot/projects/ia64/sys/sys/types.h#22 integrate .. //depot/projects/ia64/tools/regression/geom/Data/disk.apple.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/GLib/Makefile#8 integrate .. //depot/projects/ia64/tools/regression/geom/Test/Makefile#6 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T001/ref.conf#10 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T004/ref.conf#10 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T005/ref.conf#9 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T013/ref.conf#10 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T014/ref.conf#9 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T015/Makefile#1 branch .. //depot/projects/ia64/tools/regression/geom/Test/T015/ref.conf#1 branch .. //depot/projects/ia64/tools/regression/geom/Test/T015/testprg.c#1 branch .. //depot/projects/ia64/tools/regression/geom/geom_sim.h#10 integrate .. //depot/projects/ia64/usr.sbin/crunch/crunchide/endian.h#3 branch .. //depot/projects/ia64/usr.sbin/crunch/crunchide/exec_elf32.c#6 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.c#4 integrate .. //depot/projects/ia64/usr.sbin/pstat/pstat.c#10 integrate .. //depot/projects/ia64/usr.sbin/usbd/usbd.8#3 integrate .. //depot/projects/ia64/usr.sbin/usbd/usbd.conf.5#3 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#21 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.55 2002/12/17 21:14:45 jhb Exp $ +$FreeBSD: src/MAINTAINERS,v 1.56 2003/01/30 17:39:26 gordon Exp $ subsystem login notes ----------------------------- @@ -85,6 +85,5 @@ regression jmallett Will help write new tests, etc. libufs jmallett Willing to handle problems, appreciate heads-up but just try not to break it. -etc/rc.* gordon Requests heads-up to help keep etc/rc.d in sync. fdc(4) joerg Just keep me informed of changes, try not to break it. sppp(4) joerg Just keep me informed of changes, try not to break it. ==== //depot/projects/ia64/Makefile#21 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.273 2002/12/30 16:48:35 schweikh Exp $ +# $FreeBSD: src/Makefile,v 1.274 2003/01/29 10:00:42 ru Exp $ # # The user-driven targets are: # @@ -104,17 +104,19 @@ .ORDER: buildkernel installkernel .ORDER: buildkernel reinstallkernel +PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj -MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE_ARCH} -PATH= ${MAKEPATH}:/sbin:/bin:/usr/sbin:/usr/bin -MAKE= PATH=${PATH} make -m ${.CURDIR}/share/mk -f Makefile.inc1 +MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE} +_MAKE= PATH=${PATH} \ + `if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \ + -m ${.CURDIR}/share/mk -f Makefile.inc1 # # Handle the user-driven targets, using the source relative mk files. # ${TGTS} ${BITGTS}: upgrade_checks @cd ${.CURDIR}; \ - ${MAKE} ${.TARGET} + ${_MAKE} ${.TARGET} # Set a reasonable default .MAIN: all @@ -135,16 +137,16 @@ @echo "--------------------------------------------------------------" @echo ">>> Making 'pre-world' target" @echo "--------------------------------------------------------------" - @cd ${.CURDIR}; ${MAKE} pre-world + @cd ${.CURDIR}; ${_MAKE} pre-world .endif - @cd ${.CURDIR}; ${MAKE} buildworld - @cd ${.CURDIR}; ${MAKE} -B installworld + @cd ${.CURDIR}; ${_MAKE} buildworld + @cd ${.CURDIR}; ${_MAKE} -B installworld .if target(post-world) @echo @echo "--------------------------------------------------------------" @echo ">>> Making 'post-world' target" @echo "--------------------------------------------------------------" - @cd ${.CURDIR}; ${MAKE} post-world + @cd ${.CURDIR}; ${_MAKE} post-world .endif @echo @echo "--------------------------------------------------------------" @@ -163,9 +165,11 @@ # for building the world. # upgrade_checks: - @(cd ${.CURDIR}/tools/regression/usr.bin/make && \ - PATH=${PATH} make 2>/dev/null) || \ - (cd ${.CURDIR} && make make) + @if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \ + PATH=${PATH} ${MAKE} 2>/dev/null); \ + then \ + (cd ${.CURDIR} && make make); \ + fi # # Upgrade make(1) to the current version using the installed @@ -205,7 +209,7 @@ ${UPGRADE} : upgrade_checks @cd ${.CURDIR}; \ - ${MAKE} -f Makefile.upgrade -m ${.CURDIR}/share/mk ${.TARGET} + ${_MAKE} -f Makefile.upgrade -m ${.CURDIR}/share/mk ${.TARGET} universe: ==== //depot/projects/ia64/UPDATING#31 (text+ko) ==== @@ -17,6 +17,11 @@ developers choose to disable these features on build machines to maximize performance. +20030128 + NODEVFS option has been removed and DEVFS thereby made standard. + This makes all references to MAKEDEV obsolete, and the should + be removed when convenient. + 20030126: The name of the device for the ofw console has changed, sparc64 users must run mergemaster to update their installed /etc/ttys. @@ -1193,4 +1198,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.238 2003/01/27 23:30:21 fjoe Exp $ +$FreeBSD: src/UPDATING,v 1.239 2003/01/29 07:14:16 phk Exp $ ==== //depot/projects/ia64/bin/chmod/chmod.c#5 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.27 2002/08/04 05:29:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.28 2003/01/29 21:46:12 mux Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -57,7 +57,6 @@ #include <string.h> #include <unistd.h> -int main(int, char *[]); void usage(void); int ==== //depot/projects/ia64/contrib/gcc/gcc.c#12 (text+ko) ==== @@ -22,7 +22,7 @@ This paragraph is here to try to keep Sun CC from dying. The number of chars here seems crucial!!!! */ -/* $FreeBSD: src/contrib/gcc/gcc.c,v 1.33 2002/12/04 15:57:11 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/gcc.c,v 1.34 2003/01/29 05:16:58 obrien Exp $ */ /* This program is the user interface to the C compiler and possibly to other compilers. It is used because compilation is a complicated procedure @@ -3368,7 +3368,7 @@ int len; int optc = 1; int new_argc; - char **new_argv; + const char **new_argv; char *envopts; while (isspace (*temp)) @@ -3381,7 +3381,7 @@ if ((isspace (envopts[i])) && ! (isspace (envopts[i+1]))) optc++; - new_argv = (char **) alloca ((optc + argc) * sizeof(char *)); + new_argv = (const char **) alloca ((optc + argc) * sizeof(char *)); for (i = 0, new_argc = 1; new_argc <= optc; new_argc++) { ==== //depot/projects/ia64/crypto/kerberosIV/admin/kdb_edit.c#2 (text+ko) ==== @@ -8,6 +8,7 @@ * This routine changes the Kerberos encryption keys for principals, * i.e., users or services. */ +/* $FreeBSD: src/crypto/kerberosIV/admin/kdb_edit.c,v 1.2 2003/01/29 18:14:28 nectar Exp $ */ /* * exit returns 0 ==> success -1 ==> error @@ -162,7 +163,7 @@ memset(new_key, 0, sizeof(des_cblock)); new_key[0] = 127; #else - des_new_random_key(&new_key); + des_random_key(new_key); #endif memset(pw_str, 0, sizeof pw_str); } @@ -384,9 +385,6 @@ stdout)) < 0) return 1; - /* Initialize non shared random sequence */ - des_init_random_number_generator(&master_key); - /* lookup the default values */ n = kerb_get_principal(KERB_DEFAULT_NAME, KERB_DEFAULT_INST, &default_princ, 1, &more); ==== //depot/projects/ia64/crypto/kerberosIV/admin/kdb_init.c#2 (text+ko) ==== @@ -7,6 +7,7 @@ * program to initialize the database, reports error if database file * already exists. */ +/* $FreeBSD: src/crypto/kerberosIV/admin/kdb_init.c,v 1.2 2003/01/29 18:14:28 nectar Exp $ */ #include "adm_locl.h" @@ -43,7 +44,7 @@ memset(new_key, 0, sizeof(des_cblock)); new_key[0] = 127; #else - des_new_random_key(&new_key); + des_random_key(new_key); #endif kdb_encrypt_key (&new_key, &new_key, &master_key, master_key_schedule, DES_ENCRYPT); @@ -142,9 +143,6 @@ fprintf(stderr, "Wrote master key to %s\n", MKEYFILE); #endif - /* Initialize non shared random sequence */ - des_init_random_number_generator(&master_key); - /* Maximum lifetime for changepw.kerberos (kadmin) tickets, 10 minutes */ #define ADMLIFE (1 + (CLOCK_SKEW/(5*60))) ==== //depot/projects/ia64/crypto/kerberosIV/kadmin/kadmin.c#2 (text+ko) ==== @@ -18,6 +18,7 @@ or implied warranty. */ +/* $FreeBSD: src/crypto/kerberosIV/kadmin/kadmin.c,v 1.2 2003/01/29 18:14:28 nectar Exp $ */ /* * Kerberos database administrator's tool. @@ -212,7 +213,7 @@ #ifdef NOENCRYPTION memset(newkey, 0, sizeof(newkey)); #else - des_new_random_key(&newkey); + des_random_key(newkey); #endif } else { #ifdef NOENCRYPTION @@ -288,7 +289,6 @@ /* Initialize non shared random sequence from session key. */ memset(&c, 0, sizeof(c)); krb_get_cred(PWSERV_NAME, KADM_SINST, krbrlm, &c); - des_init_random_number_generator(&c.session); } else status = KDC_PR_UNKNOWN; ==== //depot/projects/ia64/crypto/kerberosIV/kadmin/ksrvutil.c#2 (text+ko) ==== @@ -18,6 +18,7 @@ or implied warranty. */ +/* $FreeBSD: src/crypto/kerberosIV/kadmin/ksrvutil.c,v 1.2 2003/01/29 18:14:28 nectar Exp $ */ /* * list and update contents of srvtab files @@ -228,7 +229,7 @@ memset(new_key, 0, sizeof(des_cblock)); (*new_key)[0] = (unsigned char) 1; #else /* NOENCRYPTION */ - des_new_random_key(new_key); + des_random_key(*new_key); #endif /* NOENCRYPTION */ return(KADM_SUCCESS); } @@ -494,17 +495,6 @@ printf("Not changing this key.\n"); if (change_this_key) { - /* - * This is not a good choice of seed when/if the - * key has been compromised so we also use a - * random sequence number! - */ - des_init_random_number_generator(&old_key); - { - des_cblock seqnum; - des_generate_random_block(&seqnum); - des_set_sequence_number((unsigned char *)&seqnum); - } /* * Pick a new key and determine whether or not * it is safe to change ==== //depot/projects/ia64/crypto/kerberosIV/kadmin/ksrvutil_get.c#2 (text+ko) ==== @@ -30,6 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +/* $FreeBSD: src/crypto/kerberosIV/kadmin/ksrvutil_get.c,v 1.2 2003/01/29 18:14:28 nectar Exp $ */ #include "kadm_locl.h" #include "ksrvutil.h" @@ -82,11 +83,6 @@ status = krb_get_pw_in_tkt(myname, myinst, myrealm, PWSERV_NAME, KADM_SINST, ticket_life, admin_passwd); memset(admin_passwd, 0, sizeof(admin_passwd)); - - /* Initialize non shared random sequence from session key. */ - memset(&c, 0, sizeof(c)); - krb_get_cred(PWSERV_NAME, KADM_SINST, myrealm, &c); - des_init_random_number_generator(&c.session); } else status = KDC_PR_UNKNOWN; @@ -190,7 +186,7 @@ memset(&values, 0, sizeof(values)); strlcpy(values.name, name, sizeof(values.name)); strlcpy(values.instance, inst, sizeof(values.instance)); - des_new_random_key(&newkey); + des_random_key(newkey); values.key_low = (newkey[0] << 24) | (newkey[1] << 16) | (newkey[2] << 8) | (newkey[3] << 0); values.key_high = (newkey[4] << 24) | (newkey[5] << 16) @@ -295,9 +291,7 @@ } ret = krb_get_cred (PWSERV_NAME, KADM_SINST, u_realm, &c); - if (ret == KSUCCESS) - des_init_random_number_generator (&c.session); - else { + if (ret != KSUCCESS) { umask(077); /* ==== //depot/projects/ia64/crypto/kerberosIV/kadmin/random_password.c#2 (text+ko) ==== @@ -30,6 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +/* $FreeBSD: src/crypto/kerberosIV/kadmin/random_password.c,v 1.2 2003/01/29 18:14:28 nectar Exp $ */ #include "kadm_locl.h" @@ -57,7 +58,7 @@ { des_cblock newkey; #ifdef OTP_STYLE - des_new_random_key(&newkey); + des_random_key(&newkey); otp_print_stddict (newkey, pw, len); strlwr(pw); #else @@ -87,7 +88,7 @@ RND(des_cblock *key, int *left) { if(*left == 0){ - des_new_random_key(key); + des_random_key(*key); *left = 8; } (*left)--; ==== //depot/projects/ia64/crypto/kerberosIV/server/kerberos.c#3 (text+ko) ==== @@ -5,7 +5,7 @@ * For copying and distribution information, please see the file * <mit-copyright.h>. */ -/* $FreeBSD: src/crypto/kerberosIV/server/kerberos.c,v 1.5 2003/01/28 20:18:26 nectar Exp $ */ +/* $FreeBSD: src/crypto/kerberosIV/server/kerberos.c,v 1.6 2003/01/29 18:14:28 nectar Exp $ */ #include "config.h" #include "protos.h" @@ -334,7 +334,7 @@ life = min(life, s_name.max_life); life = min(life, a_name.max_life); - des_new_random_key(&session); + des_random_key(session); copy_to_key(&s_name.key_low, &s_name.key_high, key); unseal(&key); krb_create_ticket(tk, flags, a_name.name, a_name.instance, @@ -428,7 +428,7 @@ life = min(life, s_name.max_life); copy_to_key(&s_name.key_low, &s_name.key_high, key); unseal(&key); - des_new_random_key(&session); + des_random_key(session); krb_create_ticket(tk, flags, ad.pname, ad.pinst, ad.prealm, client->sin_addr.s_addr, &session, life, kerb_time.tv_sec, @@ -860,7 +860,6 @@ fprintf(stdout, "\nCurrent Kerberos master key version is %d\n", master_key_version); - des_init_random_number_generator(&master_key); if (!rflag) { /* Look up our local realm */ ==== //depot/projects/ia64/crypto/openssh/auth-chall.c#4 (text+ko) ==== @@ -24,6 +24,7 @@ #include "includes.h" RCSID("$OpenBSD: auth-chall.c,v 1.8 2001/05/18 14:13:28 markus Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/auth-chall.c,v 1.5 2003/01/31 11:08:07 des Exp $"); #include "auth.h" #include "log.h" @@ -76,6 +77,24 @@ return 0; resp[0] = (char *)response; res = device->respond(authctxt->kbdintctxt, 1, resp); + if (res == 1) { + /* postponed - send a null query just in case */ + char *name, *info, **prompts; + u_int i, numprompts, *echo_on; + + res = device->query(authctxt->kbdintctxt, &name, &info, + &numprompts, &prompts, &echo_on); + if (res == 0) { + for (i = 0; i < numprompts; i++) + xfree(prompts[i]); + xfree(prompts); + xfree(name); + xfree(echo_on); + xfree(info); + } + /* if we received more prompts, we're screwed */ + res = (numprompts != 0); + } device->free_ctx(authctxt->kbdintctxt); authctxt->kbdintctxt = NULL; return res ? 0 : 1; ==== //depot/projects/ia64/crypto/openssh/monitor.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ #include "includes.h" RCSID("$OpenBSD: monitor.c,v 1.29 2002/09/26 11:38:43 markus Exp $"); -RCSID("$FreeBSD: src/crypto/openssh/monitor.c,v 1.10 2002/10/29 10:16:02 des Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/monitor.c,v 1.11 2003/01/31 11:08:07 des Exp $"); #include <openssl/dh.h> @@ -797,6 +797,8 @@ debug3("%s", __func__); pam_authok = NULL; ret = (pam_device.query)(pam_ctxt, &name, &info, &num, &prompts, &echo_on); + if (ret == 0 && num == 0) + pam_authok = pam_ctxt; if (num > 1 || name == NULL || info == NULL) ret = -1; buffer_clear(m); ==== //depot/projects/ia64/crypto/telnet/libtelnet/enc_des.c#3 (text+ko) ==== @@ -30,12 +30,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.8 2001/11/30 22:28:07 markm Exp $ + * $FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.9 2003/01/29 18:14:28 nectar Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.8 2001/11/30 22:28:07 markm Exp $"); +__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.9 2003/01/29 18:14:28 nectar Exp $"); #ifndef lint static const char sccsid[] = "@(#)enc_des.c 8.3 (Berkeley) 5/30/95"; @@ -54,7 +54,6 @@ #include "misc-proto.h" extern int encrypt_debug_mode; -void des_set_random_generator_seed(des_cblock *); /* XXX */ #define CFB 0 #define OFB 1 @@ -75,7 +74,6 @@ int need_start; int state[2]; int keyid[2]; - int once; struct stinfo { Block str_output; Block str_feed; @@ -211,7 +209,7 @@ /* * Create a random feed and send it over. */ - des_new_random_key((Block *)fbp->temp_feed); + des_random_key((Block *)fbp->temp_feed); des_ecb_encrypt((Block *)fbp->temp_feed, (Block *)fbp->temp_feed, fbp->krbdes_sched, 1); p = fbp->fb_feed + 3; @@ -397,10 +395,6 @@ fb64_stream_key(fbp->krbdes_key, &fbp->streams[DIR_ENCRYPT-1]); fb64_stream_key(fbp->krbdes_key, &fbp->streams[DIR_DECRYPT-1]); - if (fbp->once == 0) { - des_set_random_generator_seed((Block *)fbp->krbdes_key); - fbp->once = 1; - } des_key_sched((Block *)fbp->krbdes_key, fbp->krbdes_sched); /* * Now look to see if krbdes_start() was was waiting for ==== //depot/projects/ia64/crypto/telnet/libtelnet/kerberos.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/kerberos.c,v 1.7 2001/11/30 22:28:07 markm Exp $"); +__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/kerberos.c,v 1.8 2003/01/29 18:14:28 nectar Exp $"); #ifndef lint static const char sccsid[] = "@(#)kerberos.c 8.3 (Berkeley) 5/30/95"; @@ -207,8 +207,7 @@ register int i; des_key_sched(&cred.session, sched); - des_init_random_number_generator(&cred.session); - des_new_random_key(&session_key); + des_random_key(&session_key); des_ecb_encrypt(&session_key, &session_key, sched, 0); des_ecb_encrypt(&session_key, &challenge, sched, 0); /* @@ -299,11 +298,6 @@ break; } - /* - * Initialize the random number generator since it's - * used later on by the encryption routine. - */ - des_init_random_number_generator(&session_key); des_key_sched(&session_key, sched); memmove((void *)datablock, (void *)data, sizeof(Block)); /* ==== //depot/projects/ia64/lib/libc/gen/Makefile.inc#17 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.99 2002/12/26 14:34:18 tjr Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.100 2003/01/30 21:38:39 trhodes Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -44,7 +44,7 @@ getbootfile.3 getbsize.3 getcap.3 getcontext.3 getcwd.3 \ getdiskbyname.3 getdomainname.3 getfsent.3 \ getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \ - getmntinfo.3 getnetgrent.3 getobjformat.3 \ + getmntinfo.3 getnetgrent.3 getobjformat.3 getosreldate.3 \ getpagesize.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \ getttyent.3 getusershell.3 getvfsbyname.3 getvfsent.3 \ glob.3 initgroups.3 isinf.3 ldexp.3 lockf.3 makecontext.3 \ ==== //depot/projects/ia64/lib/libc/stdio/gets.c#4 (text+ko) ==== @@ -38,13 +38,15 @@ static char sccsid[] = "@(#)gets.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdio/gets.c,v 1.13 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/gets.c,v 1.16 2003/01/30 23:32:53 tjr Exp $"); #include "namespace.h" #include <unistd.h> #include <stdio.h> #include <sys/cdefs.h> #include "un-namespace.h" +#include "libc_private.h" +#include "local.h" __warn_references(gets, "warning: this program uses gets(), which is unsafe."); @@ -58,20 +60,22 @@ static char w[] = "warning: this program uses gets(), which is unsafe.\n"; - /* Orientation set by getchar(). */ - + FLOCKFILE(stdin); + ORIENT(stdin, -1); if (!warned) { (void) _write(STDERR_FILENO, w, sizeof(w) - 1); warned = 1; } - for (s = buf; (c = getchar()) != '\n';) + for (s = buf; (c = __sgetc(stdin)) != '\n';) if (c == EOF) - if (s == buf) + if (s == buf) { + FUNLOCKFILE(stdin); return (NULL); - else + } else break; else *s++ = c; *s = 0; + FUNLOCKFILE(stdin); return (buf); } ==== //depot/projects/ia64/lib/libc/stdlib/malloc.c#15 (text+ko) ==== @@ -9,7 +9,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.73 2003/01/23 21:26:47 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.74 2003/01/30 15:00:17 phk Exp $"); /* * Defining EXTRA_SANITY will enable extra checks which are related @@ -326,6 +326,8 @@ result = (caddr_t)pageround((u_long)sbrk(0)); tail = result + (pages << malloc_pageshift); + if (tail < result) + return 0; if (brk(tail)) { #ifdef EXTRA_SANITY @@ -745,6 +747,8 @@ if ((size + malloc_pagesize) < size) /* Check for overflow */ result = 0; + else if ((size + malloc_pagesize) >= (uintptr_t)page_dir) + result = 0; else if (size <= malloc_maxsize) result = malloc_bytes(size); else ==== //depot/projects/ia64/lib/libc/sys/chroot.2#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chroot.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/chroot.2,v 1.18 2002/12/19 09:40:24 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/chroot.2,v 1.19 2003/01/31 21:19:22 rwatson Exp $ .\" .Dd June 4, 1993 .Dt CHROOT 2 @@ -137,3 +137,9 @@ .Fn chroot system call appeared in .Bx 4.2 . +.Sh BUGS +If the process is able to change its working directory to the target +directory, but another access control check fails (such as a check for +open directories, or a MAC check), it is possible that this system +call may return an error, with the working directory of the process +left changed. ==== //depot/projects/ia64/lib/libc/sys/rfork.2#6 (text+ko) ==== @@ -3,9 +3,9 @@ .\" describe the actual BSD implementation. Permission for .\" use of this page comes from Rob Pike <rob@plan9.att.com>. .\" -.\" $FreeBSD: src/lib/libc/sys/rfork.2,v 1.26 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/rfork.2,v 1.29 2003/01/31 08:59:00 tjr Exp $ .\" -.Dd January 12, 1996 +.Dd January 31, 2003 .Dt RFORK 2 .Os .Sh NAME @@ -35,11 +35,10 @@ .Fa flags argument is the logical OR of some subset of: -.Bl -tag -width "RFCNAMEG" -compact -offset indent +.Bl -tag -width "RFLINUXTHPN" -offset indent .It RFPROC If set a new process is created; otherwise changes affect the current process. -The current implementation requires this flag to always be set. .It RFNOWAIT If set, the child process will be dissociated from the parent. Upon @@ -149,8 +148,6 @@ would be exceeded (see .Xr getrlimit 2 ) . .It Bq Er EINVAL -The RFPROC flag was not specified. -.It Bq Er EINVAL Both the RFFDG and the RFCFDG flags were specified. .It Bq Er EINVAL Any flags not listed above were specified. ==== //depot/projects/ia64/lib/libpam/modules/pam_krb5/pam_krb5.c#9 (text+ko) ==== @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.c,v 1.12 2003/01/10 13:38:44 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.c,v 1.13 2003/01/29 21:20:38 nectar Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -409,12 +409,15 @@ /* Retrieve the temporary cache */ retval = pam_get_data(pamh, "ccache", (const void **)&cache_name); - if (retval != PAM_SUCCESS) + if (retval != PAM_SUCCESS) { + retval = PAM_CRED_UNAVAIL; goto cleanup3; + } krbret = krb5_cc_resolve(pam_context, cache_name, &ccache_temp); if (krbret != 0) { PAM_LOG("Error krb5_cc_resolve(\"%s\"): %s", cache_name, krb5_get_err_text(pam_context, krbret)); + retval = PAM_SERVICE_ERR; goto cleanup3; } ==== //depot/projects/ia64/lib/libufs/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libufs/Makefile,v 1.6 2003/01/19 01:31:26 jmallett Exp $ +# $FreeBSD: src/lib/libufs/Makefile,v 1.7 2003/01/30 00:11:01 jmallett Exp $ LIB= ufs SRCS= block.c cgroup.c inode.c sblock.c type.c @@ -7,5 +7,6 @@ .if defined(LIBUFS_DEBUG) CFLAGS+= -D_LIBUFS_DEBUGGING .endif +WARNS?= 2 .include <bsd.lib.mk> ==== //depot/projects/ia64/lib/libufs/block.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libufs/block.c,v 1.5 2003/01/23 23:58:22 jmallett Exp $"); +__FBSDID("$FreeBSD: src/lib/libufs/block.c,v 1.6 2003/01/29 23:19:46 jmallett Exp $"); #include <sys/param.h> #include <sys/mount.h> @@ -75,14 +75,12 @@ bwrite(struct uufsd *disk, ufs2_daddr_t blockno, const void *data, size_t size) { ssize_t cnt; - int rofd; + int rv; ERROR(disk, NULL); - rofd = disk->d_fd; - - disk->d_fd = open(disk->d_name, O_WRONLY); - if (disk->d_fd < 0) { + rv = ufs_disk_write(disk); + if (rv == -1) { ERROR(disk, "failed to open disk for writing"); return -1; } @@ -93,8 +91,5 @@ return -1; } - close(disk->d_fd); - disk->d_fd = rofd; - return cnt; } ==== //depot/projects/ia64/lib/libufs/libufs.h#6 (text+ko) ==== @@ -24,7 +24,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libufs/libufs.h,v 1.9 2003/01/23 21:32:56 jmallett Exp $ + * $FreeBSD: src/lib/libufs/libufs.h,v 1.10 2003/01/29 23:19:46 jmallett Exp $ */ #ifndef __LIBUFS_H__ @@ -130,6 +130,7 @@ void ufs_disk_dtor(struct uufsd **); int ufs_disk_fillout(struct uufsd *, const char *); int ufs_disk_fillout_blank(struct uufsd *, const char *); +int ufs_disk_write(struct uufsd *); __END_DECLS ==== //depot/projects/ia64/lib/libufs/type.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libufs/type.c,v 1.10 2003/01/23 21:32:56 jmallett Exp $"); +__FBSDID("$FreeBSD: src/lib/libufs/type.c,v 1.12 2003/01/30 00:10:24 jmallett Exp $"); #include <sys/param.h> #include <sys/mount.h> @@ -50,6 +50,8 @@ /* Internally, track the 'name' value, it's ours. */ #define MINE_NAME 0x01 +/* Track if its fd points to a writable device. */ +#define MINE_WRITE 0x02 >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301312237.h0VMbaur032969>