svn commit: r303968 - in user/alc/PQ_LAUNDRY: . cddl/usr.sbin/dtrace/tests/common/raise cddl/usr.sbin/dtrace/tests/common/safety cddl/usr.sbin/dtrace/tests/tools etc/rc.d include lib/libc/rpc lib/l...
Mark Johnston
markj at FreeBSD.org
Thu Aug 11 20:07:46 UTC 2016
Author: markj
Date: Thu Aug 11 20:07:42 2016
New Revision: 303968
URL: https://svnweb.freebsd.org/changeset/base/303968
Log:
MFH r303967
Added:
user/alc/PQ_LAUNDRY/sys/compat/cloudabi/cloudabi_vdso.c
- copied unchanged from r303967, head/sys/compat/cloudabi/cloudabi_vdso.c
user/alc/PQ_LAUNDRY/sys/compat/cloudabi64/cloudabi64_vdso.lds.s
- copied unchanged from r303967, head/sys/compat/cloudabi64/cloudabi64_vdso.lds.s
user/alc/PQ_LAUNDRY/sys/dev/hyperv/include/vmbus_xact.h
- copied unchanged from r303967, head/sys/dev/hyperv/include/vmbus_xact.h
user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/if_hnreg.h
- copied unchanged from r303967, head/sys/dev/hyperv/netvsc/if_hnreg.h
user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/if_hnvar.h
- copied unchanged from r303967, head/sys/dev/hyperv/netvsc/if_hnvar.h
user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/vmbus_xact.c
- copied unchanged from r303967, head/sys/dev/hyperv/vmbus/vmbus_xact.c
user/alc/PQ_LAUNDRY/sys/riscv/include/sbi.h
- copied unchanged from r303967, head/sys/riscv/include/sbi.h
user/alc/PQ_LAUNDRY/sys/riscv/riscv/riscv_console.c
- copied unchanged from r303967, head/sys/riscv/riscv/riscv_console.c
user/alc/PQ_LAUNDRY/sys/riscv/riscv/sbi.S
- copied unchanged from r303967, head/sys/riscv/riscv/sbi.S
user/alc/PQ_LAUNDRY/tools/tools/dmardump/
- copied from r303967, head/tools/tools/dmardump/
Deleted:
user/alc/PQ_LAUNDRY/lib/libc/sys/kse.2
user/alc/PQ_LAUNDRY/sys/riscv/htif/
user/alc/PQ_LAUNDRY/usr.bin/kdump/linux32_syscalls.conf
user/alc/PQ_LAUNDRY/usr.bin/kdump/linux_syscalls.conf
user/alc/PQ_LAUNDRY/usr.bin/truss/makesyscallsconf.sh
Modified:
user/alc/PQ_LAUNDRY/Makefile.inc1
user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
user/alc/PQ_LAUNDRY/etc/rc.d/jail
user/alc/PQ_LAUNDRY/include/unistd.h
user/alc/PQ_LAUNDRY/lib/libc/rpc/svc_vc.c
user/alc/PQ_LAUNDRY/lib/libcrypt/Makefile
user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-md5.c
user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-nthash.c
user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-sha256.c
user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-sha512.c
user/alc/PQ_LAUNDRY/lib/libcrypt/crypt.3
user/alc/PQ_LAUNDRY/lib/libcrypt/crypt.c
user/alc/PQ_LAUNDRY/lib/libcrypt/crypt.h
user/alc/PQ_LAUNDRY/lib/libcrypt/misc.c
user/alc/PQ_LAUNDRY/lib/libpcap/pcap-netmap.c
user/alc/PQ_LAUNDRY/release/release.sh
user/alc/PQ_LAUNDRY/sbin/ipfw/ipfw2.c
user/alc/PQ_LAUNDRY/secure/lib/libcrypt/crypt-blowfish.c
user/alc/PQ_LAUNDRY/secure/lib/libcrypt/crypt-des.c
user/alc/PQ_LAUNDRY/share/man/man4/pci.4
user/alc/PQ_LAUNDRY/share/mk/bsd.README
user/alc/PQ_LAUNDRY/share/mk/bsd.progs.mk
user/alc/PQ_LAUNDRY/sys/amd64/amd64/pmap.c
user/alc/PQ_LAUNDRY/sys/amd64/amd64/trap.c
user/alc/PQ_LAUNDRY/sys/amd64/cloudabi64/cloudabi64_sysvec.c
user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm2835_vcio.c
user/alc/PQ_LAUNDRY/sys/arm/xscale/ixp425/avila_ata.c
user/alc/PQ_LAUNDRY/sys/arm/xscale/pxa/pxa_smi.c
user/alc/PQ_LAUNDRY/sys/arm/xscale/pxa/pxa_space.c
user/alc/PQ_LAUNDRY/sys/arm64/arm64/pmap.c
user/alc/PQ_LAUNDRY/sys/arm64/arm64/vm_machdep.c
user/alc/PQ_LAUNDRY/sys/arm64/cloudabi64/cloudabi64_sysvec.c
user/alc/PQ_LAUNDRY/sys/boot/fdt/dts/riscv/qemu.dts
user/alc/PQ_LAUNDRY/sys/boot/fdt/dts/riscv/rocket.dts
user/alc/PQ_LAUNDRY/sys/boot/fdt/dts/riscv/spike.dts
user/alc/PQ_LAUNDRY/sys/boot/i386/btx/btxldr/btxldr.S
user/alc/PQ_LAUNDRY/sys/boot/i386/libi386/smbios.c
user/alc/PQ_LAUNDRY/sys/boot/i386/zfsboot/zfsboot.c
user/alc/PQ_LAUNDRY/sys/cam/ata/ata_all.c
user/alc/PQ_LAUNDRY/sys/cam/scsi/scsi_all.c
user/alc/PQ_LAUNDRY/sys/cam/scsi/scsi_da.c
user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
user/alc/PQ_LAUNDRY/sys/compat/cloudabi/cloudabi_util.h
user/alc/PQ_LAUNDRY/sys/compat/cloudabi64/cloudabi64_module.c
user/alc/PQ_LAUNDRY/sys/conf/files
user/alc/PQ_LAUNDRY/sys/conf/files.amd64
user/alc/PQ_LAUNDRY/sys/conf/files.arm64
user/alc/PQ_LAUNDRY/sys/conf/files.i386
user/alc/PQ_LAUNDRY/sys/conf/files.riscv
user/alc/PQ_LAUNDRY/sys/conf/ldscript.riscv
user/alc/PQ_LAUNDRY/sys/contrib/ncsw/user/env/xx.c
user/alc/PQ_LAUNDRY/sys/contrib/octeon-sdk/cvmx-twsi.c
user/alc/PQ_LAUNDRY/sys/dev/aic7xxx/aic7xxx_osm.c
user/alc/PQ_LAUNDRY/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
user/alc/PQ_LAUNDRY/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
user/alc/PQ_LAUNDRY/sys/dev/auxio/auxio.c
user/alc/PQ_LAUNDRY/sys/dev/bktr/bktr_os.c
user/alc/PQ_LAUNDRY/sys/dev/bktr/bktr_reg.h
user/alc/PQ_LAUNDRY/sys/dev/bxe/bxe.c
user/alc/PQ_LAUNDRY/sys/dev/cxgbe/adapter.h
user/alc/PQ_LAUNDRY/sys/dev/cxgbe/t4_sge.c
user/alc/PQ_LAUNDRY/sys/dev/e1000/e1000_osdep.h
user/alc/PQ_LAUNDRY/sys/dev/e1000/if_em.h
user/alc/PQ_LAUNDRY/sys/dev/e1000/if_igb.h
user/alc/PQ_LAUNDRY/sys/dev/e1000/if_lem.h
user/alc/PQ_LAUNDRY/sys/dev/etherswitch/ip17x/ip17x.c
user/alc/PQ_LAUNDRY/sys/dev/hyperv/include/vmbus.h
user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_net_vsc.c
user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_net_vsc.h
user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_rndis_filter.c
user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_rndis_filter.h
user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/vmbus.c
user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/vmbus_var.h
user/alc/PQ_LAUNDRY/sys/dev/ixgb/if_ixgb.h
user/alc/PQ_LAUNDRY/sys/dev/ixgb/if_ixgb_osdep.h
user/alc/PQ_LAUNDRY/sys/dev/ixgbe/ixgbe.h
user/alc/PQ_LAUNDRY/sys/dev/ixl/i40e_osdep.h
user/alc/PQ_LAUNDRY/sys/dev/ixl/ixl.h
user/alc/PQ_LAUNDRY/sys/dev/ixl/ixl_pf.h
user/alc/PQ_LAUNDRY/sys/dev/ixl/ixlv.h
user/alc/PQ_LAUNDRY/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
user/alc/PQ_LAUNDRY/sys/dev/mpt/mpt_pci.c
user/alc/PQ_LAUNDRY/sys/dev/msk/if_msk.c
user/alc/PQ_LAUNDRY/sys/dev/nand/nand_generic.c
user/alc/PQ_LAUNDRY/sys/dev/nand/nandsim_chip.c
user/alc/PQ_LAUNDRY/sys/dev/netmap/netmap_mem2.c
user/alc/PQ_LAUNDRY/sys/dev/ofw/openfirmio.c
user/alc/PQ_LAUNDRY/sys/dev/ofw/openpromio.c
user/alc/PQ_LAUNDRY/sys/dev/pci/pci_user.c
user/alc/PQ_LAUNDRY/sys/dev/pci/pcivar.h
user/alc/PQ_LAUNDRY/sys/dev/sound/sbus/cs4231.c
user/alc/PQ_LAUNDRY/sys/dev/tpm/tpm.c
user/alc/PQ_LAUNDRY/sys/dev/tws/tws.c
user/alc/PQ_LAUNDRY/sys/dev/usb/controller/ehci_ixp4xx.c
user/alc/PQ_LAUNDRY/sys/fs/autofs/autofs_vnops.c
user/alc/PQ_LAUNDRY/sys/fs/smbfs/smbfs_node.c
user/alc/PQ_LAUNDRY/sys/fs/tmpfs/tmpfs_subr.c
user/alc/PQ_LAUNDRY/sys/fs/unionfs/union_vnops.c
user/alc/PQ_LAUNDRY/sys/i386/i386/trap.c
user/alc/PQ_LAUNDRY/sys/kern/kern_descrip.c
user/alc/PQ_LAUNDRY/sys/kern/kern_kthread.c
user/alc/PQ_LAUNDRY/sys/kern/kern_ktrace.c
user/alc/PQ_LAUNDRY/sys/kern/kern_timeout.c
user/alc/PQ_LAUNDRY/sys/kern/subr_bus.c
user/alc/PQ_LAUNDRY/sys/kern/vfs_bio.c
user/alc/PQ_LAUNDRY/sys/kern/vfs_cluster.c
user/alc/PQ_LAUNDRY/sys/kern/vfs_default.c
user/alc/PQ_LAUNDRY/sys/kern/vfs_lookup.c
user/alc/PQ_LAUNDRY/sys/kern/vfs_mount.c
user/alc/PQ_LAUNDRY/sys/kern/vfs_subr.c
user/alc/PQ_LAUNDRY/sys/mips/nlm/dev/net/xlpge.c
user/alc/PQ_LAUNDRY/sys/mips/rmi/dev/nlge/if_nlge.c
user/alc/PQ_LAUNDRY/sys/modules/cloudabi/Makefile
user/alc/PQ_LAUNDRY/sys/modules/cloudabi64/Makefile
user/alc/PQ_LAUNDRY/sys/modules/hyperv/vmbus/Makefile
user/alc/PQ_LAUNDRY/sys/net80211/ieee80211_crypto_wep.c
user/alc/PQ_LAUNDRY/sys/netinet/ip_fw.h
user/alc/PQ_LAUNDRY/sys/netinet/sctp_indata.c
user/alc/PQ_LAUNDRY/sys/netpfil/ipfw/ip_fw2.c
user/alc/PQ_LAUNDRY/sys/netpfil/ipfw/ip_fw_sockopt.c
user/alc/PQ_LAUNDRY/sys/powerpc/powerpc/busdma_machdep.c
user/alc/PQ_LAUNDRY/sys/riscv/conf/GENERIC
user/alc/PQ_LAUNDRY/sys/riscv/conf/QEMU
user/alc/PQ_LAUNDRY/sys/riscv/conf/ROCKET
user/alc/PQ_LAUNDRY/sys/riscv/conf/SPIKE
user/alc/PQ_LAUNDRY/sys/riscv/include/cpufunc.h
user/alc/PQ_LAUNDRY/sys/riscv/include/pcpu.h
user/alc/PQ_LAUNDRY/sys/riscv/include/riscvreg.h
user/alc/PQ_LAUNDRY/sys/riscv/include/vmparam.h
user/alc/PQ_LAUNDRY/sys/riscv/riscv/exception.S
user/alc/PQ_LAUNDRY/sys/riscv/riscv/genassym.c
user/alc/PQ_LAUNDRY/sys/riscv/riscv/identcpu.c
user/alc/PQ_LAUNDRY/sys/riscv/riscv/intr_machdep.c
user/alc/PQ_LAUNDRY/sys/riscv/riscv/locore.S
user/alc/PQ_LAUNDRY/sys/riscv/riscv/machdep.c
user/alc/PQ_LAUNDRY/sys/riscv/riscv/mp_machdep.c
user/alc/PQ_LAUNDRY/sys/riscv/riscv/pmap.c
user/alc/PQ_LAUNDRY/sys/riscv/riscv/timer.c
user/alc/PQ_LAUNDRY/sys/riscv/riscv/vm_machdep.c
user/alc/PQ_LAUNDRY/sys/sparc64/fhc/clkbrd.c
user/alc/PQ_LAUNDRY/sys/sparc64/pci/fire.c
user/alc/PQ_LAUNDRY/sys/sys/buf.h
user/alc/PQ_LAUNDRY/sys/sys/rman.h
user/alc/PQ_LAUNDRY/sys/sys/vnode.h
user/alc/PQ_LAUNDRY/sys/tools/embed_mfs.sh
user/alc/PQ_LAUNDRY/sys/ufs/ffs/ffs_snapshot.c
user/alc/PQ_LAUNDRY/sys/ufs/ffs/ffs_vnops.c
user/alc/PQ_LAUNDRY/sys/ufs/ufs/ufs_lookup.c
user/alc/PQ_LAUNDRY/sys/ufs/ufs/ufs_quota.c
user/alc/PQ_LAUNDRY/sys/vm/vm_object.c
user/alc/PQ_LAUNDRY/sys/x86/cpufreq/powernow.c
user/alc/PQ_LAUNDRY/sys/x86/iommu/intel_reg.h
user/alc/PQ_LAUNDRY/usr.bin/truss/syscalls.c
user/alc/PQ_LAUNDRY/usr.bin/xinstall/xinstall.c
user/alc/PQ_LAUNDRY/usr.sbin/ancontrol/ancontrol.c
user/alc/PQ_LAUNDRY/usr.sbin/bsdinstall/scripts/hardening
Directory Properties:
user/alc/PQ_LAUNDRY/ (props changed)
user/alc/PQ_LAUNDRY/cddl/ (props changed)
user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/ (props changed)
user/alc/PQ_LAUNDRY/sys/contrib/octeon-sdk/ (props changed)
Modified: user/alc/PQ_LAUNDRY/Makefile.inc1
==============================================================================
--- user/alc/PQ_LAUNDRY/Makefile.inc1 Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/Makefile.inc1 Thu Aug 11 20:07:42 2016 (r303968)
@@ -1013,7 +1013,7 @@ distributeworld installworld stageworld:
${IMAKEENV} rm -rf ${INSTALLTMP}
.if make(distributeworld)
.for dist in ${EXTRA_DISTRIBUTIONS}
- find ${DESTDIR}/${DISTDIR}/${dist} -mindepth 1 -empty -delete
+ find ${DESTDIR}/${DISTDIR}/${dist} -mindepth 1 -type d -empty -delete
.endfor
.if defined(NO_ROOT)
.for dist in base ${EXTRA_DISTRIBUTIONS}
Modified: user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
==============================================================================
--- user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/common/raise/Makefile Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/common/raise/Makefile Thu Aug 11 20:07:42 2016 (r303968)
@@ -20,4 +20,6 @@ CFILES= \
tst.raise3.c \
+TEST_METADATA.t_dtrace_contrib+= required_memory="4g"
+
.include "../../dtrace.test.mk"
Modified: user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
==============================================================================
--- user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/common/safety/Makefile Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/common/safety/Makefile Thu Aug 11 20:07:42 2016 (r303968)
@@ -53,4 +53,6 @@ CFILES= \
+TEST_METADATA.t_dtrace_contrib+= required_memory="4g"
+
.include "../../dtrace.test.mk"
Modified: user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
==============================================================================
--- user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Thu Aug 11 20:07:42 2016 (r303968)
@@ -34,15 +34,28 @@ genmakefile()
# One-off variable definitions.
local special
- if [ "$basedir" = proc ]; then
+ case "$basedir" in
+ proc)
special="
LIBADD.tst.sigwait.exe+= rt
"
- elif [ "$basedir" = uctf ]; then
+ ;;
+ raise)
+ special="
+TEST_METADATA.t_dtrace_contrib+= required_memory=\"4g\"
+"
+ ;;
+ safety)
+ special="
+TEST_METADATA.t_dtrace_contrib+= required_memory=\"4g\"
+"
+ ;;
+ uctf)
special="
WITH_CTF=YES
"
- fi
+ ;;
+ esac
local makefile=$(mktemp)
cat <<__EOF__ > $makefile
Modified: user/alc/PQ_LAUNDRY/etc/rc.d/jail
==============================================================================
--- user/alc/PQ_LAUNDRY/etc/rc.d/jail Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/etc/rc.d/jail Thu Aug 11 20:07:42 2016 (r303968)
@@ -260,6 +260,7 @@ parse_options()
extract_var $_jv set_hostname_allow allow.set_hostname YN NO
extract_var $_jv sysvipc_allow allow.sysvipc YN NO
+ extract_var $_jv enforce_statfs enforce_statfs - 2
extract_var $_jv osreldate osreldate
extract_var $_jv osrelease osrelease
for _p in $_parameters; do
Modified: user/alc/PQ_LAUNDRY/include/unistd.h
==============================================================================
--- user/alc/PQ_LAUNDRY/include/unistd.h Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/include/unistd.h Thu Aug 11 20:07:42 2016 (r303968)
@@ -484,11 +484,18 @@ pid_t vfork(void) __returns_twice;
#if __BSD_VISIBLE
struct timeval; /* select(2) */
+
+struct crypt_data {
+ int initialized; /* For compatibility with glibc. */
+ char __buf[256]; /* Buffer returned by crypt_r(). */
+};
+
int acct(const char *);
int async_daemon(void);
int check_utility_compat(const char *);
const char *
crypt_get_format(void);
+char *crypt_r(const char *, const char *, struct crypt_data *);
int crypt_set_format(const char *);
int des_cipher(const char *, char *, long, int);
int des_setkey(const char *key);
Modified: user/alc/PQ_LAUNDRY/lib/libc/rpc/svc_vc.c
==============================================================================
--- user/alc/PQ_LAUNDRY/lib/libc/rpc/svc_vc.c Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/lib/libc/rpc/svc_vc.c Thu Aug 11 20:07:42 2016 (r303968)
@@ -700,7 +700,7 @@ svc_vc_rendezvous_ops(SVCXPRT *xprt)
ops.xp_reply =
(bool_t (*)(SVCXPRT *, struct rpc_msg *))abort;
ops.xp_freeargs =
- (bool_t (*)(SVCXPRT *, xdrproc_t, void *))abort,
+ (bool_t (*)(SVCXPRT *, xdrproc_t, void *))abort;
ops.xp_destroy = svc_vc_destroy;
ops2.xp_control = svc_vc_rendezvous_control;
}
Modified: user/alc/PQ_LAUNDRY/lib/libcrypt/Makefile
==============================================================================
--- user/alc/PQ_LAUNDRY/lib/libcrypt/Makefile Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/lib/libcrypt/Makefile Thu Aug 11 20:07:42 2016 (r303968)
@@ -17,7 +17,8 @@ SRCS= crypt.c misc.c \
crypt-sha256.c sha256c.c \
crypt-sha512.c sha512c.c
MAN= crypt.3
-MLINKS= crypt.3 crypt_get_format.3 crypt.3 crypt_set_format.3
+MLINKS= crypt.3 crypt_get_format.3 crypt.3 crypt_r.3 \
+ crypt.3 crypt_set_format.3
CFLAGS+= -I${.CURDIR}/../libmd -I${.CURDIR}/../libutil \
-I${.CURDIR}/../../sys/crypto/sha2
Modified: user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-md5.c
==============================================================================
--- user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-md5.c Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-md5.c Thu Aug 11 20:07:42 2016 (r303968)
@@ -41,31 +41,27 @@ __FBSDID("$FreeBSD$");
* UNIX password
*/
-char *
-crypt_md5(const char *pw, const char *salt)
+int
+crypt_md5(const char *pw, const char *salt, char *buffer)
{
MD5_CTX ctx,ctx1;
unsigned long l;
int sl, pl;
u_int i;
u_char final[MD5_SIZE];
- static const char *sp, *ep;
- static char passwd[120], *p;
+ const char *ep;
static const char *magic = "$1$";
- /* Refine the Salt first */
- sp = salt;
-
- /* If it starts with the magic string, then skip that */
- if(!strncmp(sp, magic, strlen(magic)))
- sp += strlen(magic);
+ /* If the salt starts with the magic string, skip that. */
+ if (!strncmp(salt, magic, strlen(magic)))
+ salt += strlen(magic);
/* It stops at the first '$', max 8 chars */
- for(ep = sp; *ep && *ep != '$' && ep < (sp + 8); ep++)
+ for (ep = salt; *ep && *ep != '$' && ep < salt + 8; ep++)
continue;
/* get the length of the true salt */
- sl = ep - sp;
+ sl = ep - salt;
MD5Init(&ctx);
@@ -76,12 +72,12 @@ crypt_md5(const char *pw, const char *sa
MD5Update(&ctx, (const u_char *)magic, strlen(magic));
/* Then the raw salt */
- MD5Update(&ctx, (const u_char *)sp, (u_int)sl);
+ MD5Update(&ctx, (const u_char *)salt, (u_int)sl);
/* Then just as many characters of the MD5(pw,salt,pw) */
MD5Init(&ctx1);
MD5Update(&ctx1, (const u_char *)pw, strlen(pw));
- MD5Update(&ctx1, (const u_char *)sp, (u_int)sl);
+ MD5Update(&ctx1, (const u_char *)salt, (u_int)sl);
MD5Update(&ctx1, (const u_char *)pw, strlen(pw));
MD5Final(final, &ctx1);
for(pl = (int)strlen(pw); pl > 0; pl -= MD5_SIZE)
@@ -99,9 +95,9 @@ crypt_md5(const char *pw, const char *sa
MD5Update(&ctx, (const u_char *)pw, 1);
/* Now make the output string */
- strcpy(passwd, magic);
- strncat(passwd, sp, (u_int)sl);
- strcat(passwd, "$");
+ buffer = stpcpy(buffer, magic);
+ buffer = stpncpy(buffer, salt, (u_int)sl);
+ *buffer++ = '$';
MD5Final(final, &ctx);
@@ -118,7 +114,7 @@ crypt_md5(const char *pw, const char *sa
MD5Update(&ctx1, (const u_char *)final, MD5_SIZE);
if(i % 3)
- MD5Update(&ctx1, (const u_char *)sp, (u_int)sl);
+ MD5Update(&ctx1, (const u_char *)salt, (u_int)sl);
if(i % 7)
MD5Update(&ctx1, (const u_char *)pw, strlen(pw));
@@ -130,24 +126,22 @@ crypt_md5(const char *pw, const char *sa
MD5Final(final, &ctx1);
}
- p = passwd + strlen(passwd);
-
l = (final[ 0]<<16) | (final[ 6]<<8) | final[12];
- _crypt_to64(p, l, 4); p += 4;
+ _crypt_to64(buffer, l, 4); buffer += 4;
l = (final[ 1]<<16) | (final[ 7]<<8) | final[13];
- _crypt_to64(p, l, 4); p += 4;
+ _crypt_to64(buffer, l, 4); buffer += 4;
l = (final[ 2]<<16) | (final[ 8]<<8) | final[14];
- _crypt_to64(p, l, 4); p += 4;
+ _crypt_to64(buffer, l, 4); buffer += 4;
l = (final[ 3]<<16) | (final[ 9]<<8) | final[15];
- _crypt_to64(p, l, 4); p += 4;
+ _crypt_to64(buffer, l, 4); buffer += 4;
l = (final[ 4]<<16) | (final[10]<<8) | final[ 5];
- _crypt_to64(p, l, 4); p += 4;
+ _crypt_to64(buffer, l, 4); buffer += 4;
l = final[11];
- _crypt_to64(p, l, 2); p += 2;
- *p = '\0';
+ _crypt_to64(buffer, l, 2); buffer += 2;
+ *buffer = '\0';
/* Don't leave anything around in vm they could use. */
memset(final, 0, sizeof(final));
- return (passwd);
+ return (0);
}
Modified: user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-nthash.c
==============================================================================
--- user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-nthash.c Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-nthash.c Thu Aug 11 20:07:42 2016 (r303968)
@@ -46,16 +46,14 @@ __FBSDID("$FreeBSD$");
*/
/* ARGSUSED */
-char *
-crypt_nthash(const char *pw, const char *salt __unused)
+int
+crypt_nthash(const char *pw, const char *salt __unused, char *buffer)
{
size_t unipwLen;
- int i, j;
- static char hexconvtab[] = "0123456789abcdef";
+ int i;
+ static const char hexconvtab[] = "0123456789abcdef";
static const char *magic = "$3$";
- static char passwd[120];
u_int16_t unipw[128];
- char final[MD4_SIZE*2 + 1];
u_char hash[MD4_SIZE];
const char *s;
MD4_CTX ctx;
@@ -70,19 +68,14 @@ crypt_nthash(const char *pw, const char
MD4Init(&ctx);
MD4Update(&ctx, (u_char *)unipw, unipwLen*sizeof(u_int16_t));
MD4Final(hash, &ctx);
-
- for (i = j = 0; i < MD4_SIZE; i++) {
- final[j++] = hexconvtab[hash[i] >> 4];
- final[j++] = hexconvtab[hash[i] & 15];
- }
- final[j] = '\0';
-
- strcpy(passwd, magic);
- strcat(passwd, "$");
- strncat(passwd, final, MD4_SIZE*2);
- /* Don't leave anything around in vm they could use. */
- memset(final, 0, sizeof(final));
+ buffer = stpcpy(buffer, magic);
+ *buffer++ = '$';
+ for (i = 0; i < MD4_SIZE; i++) {
+ *buffer++ = hexconvtab[hash[i] >> 4];
+ *buffer++ = hexconvtab[hash[i] & 15];
+ }
+ *buffer = '\0';
- return (passwd);
+ return (0);
}
Modified: user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-sha256.c
==============================================================================
--- user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-sha256.c Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-sha256.c Thu Aug 11 20:07:42 2016 (r303968)
@@ -59,11 +59,10 @@ static const char sha256_rounds_prefix[]
/* Maximum number of rounds. */
#define ROUNDS_MAX 999999999
-static char *
-crypt_sha256_r(const char *key, const char *salt, char *buffer, int buflen)
+int
+crypt_sha256(const char *key, const char *salt, char *buffer)
{
u_long srounds;
- int n;
uint8_t alt_result[32], temp_result[32];
SHA256_CTX ctx, alt_ctx;
size_t salt_len, key_len, cnt, rounds;
@@ -210,42 +209,27 @@ crypt_sha256_r(const char *key, const ch
/* Now we can construct the result string. It consists of three
* parts. */
- cp = stpncpy(buffer, sha256_salt_prefix, MAX(0, buflen));
- buflen -= sizeof(sha256_salt_prefix) - 1;
+ cp = stpcpy(buffer, sha256_salt_prefix);
- if (rounds_custom) {
- n = snprintf(cp, MAX(0, buflen), "%s%zu$",
- sha256_rounds_prefix, rounds);
+ if (rounds_custom)
+ cp += sprintf(cp, "%s%zu$", sha256_rounds_prefix, rounds);
- cp += n;
- buflen -= n;
- }
+ cp = stpncpy(cp, salt, salt_len);
- cp = stpncpy(cp, salt, MIN((size_t)MAX(0, buflen), salt_len));
- buflen -= MIN((size_t)MAX(0, buflen), salt_len);
+ *cp++ = '$';
- if (buflen > 0) {
- *cp++ = '$';
- --buflen;
- }
-
- b64_from_24bit(alt_result[0], alt_result[10], alt_result[20], 4, &buflen, &cp);
- b64_from_24bit(alt_result[21], alt_result[1], alt_result[11], 4, &buflen, &cp);
- b64_from_24bit(alt_result[12], alt_result[22], alt_result[2], 4, &buflen, &cp);
- b64_from_24bit(alt_result[3], alt_result[13], alt_result[23], 4, &buflen, &cp);
- b64_from_24bit(alt_result[24], alt_result[4], alt_result[14], 4, &buflen, &cp);
- b64_from_24bit(alt_result[15], alt_result[25], alt_result[5], 4, &buflen, &cp);
- b64_from_24bit(alt_result[6], alt_result[16], alt_result[26], 4, &buflen, &cp);
- b64_from_24bit(alt_result[27], alt_result[7], alt_result[17], 4, &buflen, &cp);
- b64_from_24bit(alt_result[18], alt_result[28], alt_result[8], 4, &buflen, &cp);
- b64_from_24bit(alt_result[9], alt_result[19], alt_result[29], 4, &buflen, &cp);
- b64_from_24bit(0, alt_result[31], alt_result[30], 3, &buflen, &cp);
- if (buflen <= 0) {
- errno = ERANGE;
- buffer = NULL;
- }
- else
- *cp = '\0'; /* Terminate the string. */
+ b64_from_24bit(alt_result[0], alt_result[10], alt_result[20], 4, &cp);
+ b64_from_24bit(alt_result[21], alt_result[1], alt_result[11], 4, &cp);
+ b64_from_24bit(alt_result[12], alt_result[22], alt_result[2], 4, &cp);
+ b64_from_24bit(alt_result[3], alt_result[13], alt_result[23], 4, &cp);
+ b64_from_24bit(alt_result[24], alt_result[4], alt_result[14], 4, &cp);
+ b64_from_24bit(alt_result[15], alt_result[25], alt_result[5], 4, &cp);
+ b64_from_24bit(alt_result[6], alt_result[16], alt_result[26], 4, &cp);
+ b64_from_24bit(alt_result[27], alt_result[7], alt_result[17], 4, &cp);
+ b64_from_24bit(alt_result[18], alt_result[28], alt_result[8], 4, &cp);
+ b64_from_24bit(alt_result[9], alt_result[19], alt_result[29], 4, &cp);
+ b64_from_24bit(0, alt_result[31], alt_result[30], 3, &cp);
+ *cp = '\0'; /* Terminate the string. */
/* Clear the buffer for the intermediate result so that people
* attaching to processes or reading core dumps cannot get any
@@ -263,37 +247,7 @@ crypt_sha256_r(const char *key, const ch
if (copied_salt != NULL)
memset(copied_salt, '\0', salt_len);
- return buffer;
-}
-
-/* This entry point is equivalent to crypt(3). */
-char *
-crypt_sha256(const char *key, const char *salt)
-{
- /* We don't want to have an arbitrary limit in the size of the
- * password. We can compute an upper bound for the size of the
- * result in advance and so we can prepare the buffer we pass to
- * `crypt_sha256_r'. */
- static char *buffer;
- static int buflen;
- int needed;
- char *new_buffer;
-
- needed = (sizeof(sha256_salt_prefix) - 1
- + sizeof(sha256_rounds_prefix) + 9 + 1
- + strlen(salt) + 1 + 43 + 1);
-
- if (buflen < needed) {
- new_buffer = (char *)realloc(buffer, needed);
-
- if (new_buffer == NULL)
- return NULL;
-
- buffer = new_buffer;
- buflen = needed;
- }
-
- return crypt_sha256_r(key, salt, buffer, buflen);
+ return (0);
}
#ifdef TEST
Modified: user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-sha512.c
==============================================================================
--- user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-sha512.c Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/lib/libcrypt/crypt-sha512.c Thu Aug 11 20:07:42 2016 (r303968)
@@ -59,11 +59,10 @@ static const char sha512_rounds_prefix[]
/* Maximum number of rounds. */
#define ROUNDS_MAX 999999999
-static char *
-crypt_sha512_r(const char *key, const char *salt, char *buffer, int buflen)
+int
+crypt_sha512(const char *key, const char *salt, char *buffer)
{
u_long srounds;
- int n;
uint8_t alt_result[64], temp_result[64];
SHA512_CTX ctx, alt_ctx;
size_t salt_len, key_len, cnt, rounds;
@@ -210,54 +209,39 @@ crypt_sha512_r(const char *key, const ch
/* Now we can construct the result string. It consists of three
* parts. */
- cp = stpncpy(buffer, sha512_salt_prefix, MAX(0, buflen));
- buflen -= sizeof(sha512_salt_prefix) - 1;
+ cp = stpcpy(buffer, sha512_salt_prefix);
- if (rounds_custom) {
- n = snprintf(cp, MAX(0, buflen), "%s%zu$",
- sha512_rounds_prefix, rounds);
+ if (rounds_custom)
+ cp += sprintf(cp, "%s%zu$", sha512_rounds_prefix, rounds);
- cp += n;
- buflen -= n;
- }
+ cp = stpncpy(cp, salt, salt_len);
- cp = stpncpy(cp, salt, MIN((size_t)MAX(0, buflen), salt_len));
- buflen -= MIN((size_t)MAX(0, buflen), salt_len);
+ *cp++ = '$';
- if (buflen > 0) {
- *cp++ = '$';
- --buflen;
- }
+ b64_from_24bit(alt_result[0], alt_result[21], alt_result[42], 4, &cp);
+ b64_from_24bit(alt_result[22], alt_result[43], alt_result[1], 4, &cp);
+ b64_from_24bit(alt_result[44], alt_result[2], alt_result[23], 4, &cp);
+ b64_from_24bit(alt_result[3], alt_result[24], alt_result[45], 4, &cp);
+ b64_from_24bit(alt_result[25], alt_result[46], alt_result[4], 4, &cp);
+ b64_from_24bit(alt_result[47], alt_result[5], alt_result[26], 4, &cp);
+ b64_from_24bit(alt_result[6], alt_result[27], alt_result[48], 4, &cp);
+ b64_from_24bit(alt_result[28], alt_result[49], alt_result[7], 4, &cp);
+ b64_from_24bit(alt_result[50], alt_result[8], alt_result[29], 4, &cp);
+ b64_from_24bit(alt_result[9], alt_result[30], alt_result[51], 4, &cp);
+ b64_from_24bit(alt_result[31], alt_result[52], alt_result[10], 4, &cp);
+ b64_from_24bit(alt_result[53], alt_result[11], alt_result[32], 4, &cp);
+ b64_from_24bit(alt_result[12], alt_result[33], alt_result[54], 4, &cp);
+ b64_from_24bit(alt_result[34], alt_result[55], alt_result[13], 4, &cp);
+ b64_from_24bit(alt_result[56], alt_result[14], alt_result[35], 4, &cp);
+ b64_from_24bit(alt_result[15], alt_result[36], alt_result[57], 4, &cp);
+ b64_from_24bit(alt_result[37], alt_result[58], alt_result[16], 4, &cp);
+ b64_from_24bit(alt_result[59], alt_result[17], alt_result[38], 4, &cp);
+ b64_from_24bit(alt_result[18], alt_result[39], alt_result[60], 4, &cp);
+ b64_from_24bit(alt_result[40], alt_result[61], alt_result[19], 4, &cp);
+ b64_from_24bit(alt_result[62], alt_result[20], alt_result[41], 4, &cp);
+ b64_from_24bit(0, 0, alt_result[63], 2, &cp);
- b64_from_24bit(alt_result[0], alt_result[21], alt_result[42], 4, &buflen, &cp);
- b64_from_24bit(alt_result[22], alt_result[43], alt_result[1], 4, &buflen, &cp);
- b64_from_24bit(alt_result[44], alt_result[2], alt_result[23], 4, &buflen, &cp);
- b64_from_24bit(alt_result[3], alt_result[24], alt_result[45], 4, &buflen, &cp);
- b64_from_24bit(alt_result[25], alt_result[46], alt_result[4], 4, &buflen, &cp);
- b64_from_24bit(alt_result[47], alt_result[5], alt_result[26], 4, &buflen, &cp);
- b64_from_24bit(alt_result[6], alt_result[27], alt_result[48], 4, &buflen, &cp);
- b64_from_24bit(alt_result[28], alt_result[49], alt_result[7], 4, &buflen, &cp);
- b64_from_24bit(alt_result[50], alt_result[8], alt_result[29], 4, &buflen, &cp);
- b64_from_24bit(alt_result[9], alt_result[30], alt_result[51], 4, &buflen, &cp);
- b64_from_24bit(alt_result[31], alt_result[52], alt_result[10], 4, &buflen, &cp);
- b64_from_24bit(alt_result[53], alt_result[11], alt_result[32], 4, &buflen, &cp);
- b64_from_24bit(alt_result[12], alt_result[33], alt_result[54], 4, &buflen, &cp);
- b64_from_24bit(alt_result[34], alt_result[55], alt_result[13], 4, &buflen, &cp);
- b64_from_24bit(alt_result[56], alt_result[14], alt_result[35], 4, &buflen, &cp);
- b64_from_24bit(alt_result[15], alt_result[36], alt_result[57], 4, &buflen, &cp);
- b64_from_24bit(alt_result[37], alt_result[58], alt_result[16], 4, &buflen, &cp);
- b64_from_24bit(alt_result[59], alt_result[17], alt_result[38], 4, &buflen, &cp);
- b64_from_24bit(alt_result[18], alt_result[39], alt_result[60], 4, &buflen, &cp);
- b64_from_24bit(alt_result[40], alt_result[61], alt_result[19], 4, &buflen, &cp);
- b64_from_24bit(alt_result[62], alt_result[20], alt_result[41], 4, &buflen, &cp);
- b64_from_24bit(0, 0, alt_result[63], 2, &buflen, &cp);
-
- if (buflen <= 0) {
- errno = ERANGE;
- buffer = NULL;
- }
- else
- *cp = '\0'; /* Terminate the string. */
+ *cp = '\0'; /* Terminate the string. */
/* Clear the buffer for the intermediate result so that people
* attaching to processes or reading core dumps cannot get any
@@ -275,37 +259,7 @@ crypt_sha512_r(const char *key, const ch
if (copied_salt != NULL)
memset(copied_salt, '\0', salt_len);
- return buffer;
-}
-
-/* This entry point is equivalent to crypt(3). */
-char *
-crypt_sha512(const char *key, const char *salt)
-{
- /* We don't want to have an arbitrary limit in the size of the
- * password. We can compute an upper bound for the size of the
- * result in advance and so we can prepare the buffer we pass to
- * `crypt_sha512_r'. */
- static char *buffer;
- static int buflen;
- int needed;
- char *new_buffer;
-
- needed = (sizeof(sha512_salt_prefix) - 1
- + sizeof(sha512_rounds_prefix) + 9 + 1
- + strlen(salt) + 1 + 86 + 1);
-
- if (buflen < needed) {
- new_buffer = (char *)realloc(buffer, needed);
-
- if (new_buffer == NULL)
- return NULL;
-
- buffer = new_buffer;
- buflen = needed;
- }
-
- return crypt_sha512_r(key, salt, buffer, buflen);
+ return (0);
}
#ifdef TEST
Modified: user/alc/PQ_LAUNDRY/lib/libcrypt/crypt.3
==============================================================================
--- user/alc/PQ_LAUNDRY/lib/libcrypt/crypt.3 Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/lib/libcrypt/crypt.3 Thu Aug 11 20:07:42 2016 (r303968)
@@ -29,7 +29,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 9, 2014
+.Dd August 10, 2016
.Dt CRYPT 3
.Os
.Sh NAME
@@ -41,6 +41,8 @@
.In unistd.h
.Ft char *
.Fn crypt "const char *key" "const char *salt"
+.Ft char *
+.Fn crypt_r "const char *key" "const char *salt" "struct crypt_data *data"
.Ft const char *
.Fn crypt_get_format "void"
.Ft int
@@ -246,10 +248,20 @@ The
.Fn crypt_set_format
function sets the default encoding format according to the supplied
.Fa string .
+.Pp
+The
+.Fn crypt_r
+function behaves identically to
+.Fn crypt ,
+except that the resulting string is stored in
+.Fa data ,
+making it thread-safe.
.Sh RETURN VALUES
The
.Fn crypt
-function returns a pointer to the encrypted value on success, and NULL on
+and
+.Fn crypt_r
+functions return a pointer to the encrypted value on success, and NULL on
failure.
Note: this is not a standard behaviour, AT&T
.Fn crypt
@@ -280,6 +292,11 @@ section of the code (FreeSec 1.0) was de
States of America as an unencumbered replacement for the U.S.-only
.Nx
libcrypt encryption library.
+.Pp
+The
+.Fn crypt_r
+function was added in
+.Fx 12.0 .
.Sh AUTHORS
.An -nosplit
Originally written by
Modified: user/alc/PQ_LAUNDRY/lib/libcrypt/crypt.c
==============================================================================
--- user/alc/PQ_LAUNDRY/lib/libcrypt/crypt.c Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/lib/libcrypt/crypt.c Thu Aug 11 20:07:42 2016 (r303968)
@@ -46,9 +46,9 @@ __FBSDID("$FreeBSD$");
* and it needs to be the default for backward compatibility.
*/
static const struct crypt_format {
- const char *const name;
- char *(*const func)(const char *, const char *);
- const char *const magic;
+ const char *name;
+ int (*func)(const char *, const char *, char *);
+ const char *magic;
} crypt_formats[] = {
{ "md5", crypt_md5, "$1$" },
#ifdef HAS_BLOWFISH
@@ -104,20 +104,37 @@ crypt_set_format(const char *format)
* otherwise, the currently selected format is used.
*/
char *
-crypt(const char *passwd, const char *salt)
+crypt_r(const char *passwd, const char *salt, struct crypt_data *data)
{
const struct crypt_format *cf;
+ int (*func)(const char *, const char *, char *);
#ifdef HAS_DES
int len;
#endif
for (cf = crypt_formats; cf->name != NULL; ++cf)
- if (cf->magic != NULL && strstr(salt, cf->magic) == salt)
- return (cf->func(passwd, salt));
+ if (cf->magic != NULL && strstr(salt, cf->magic) == salt) {
+ func = cf->func;
+ goto match;
+ }
#ifdef HAS_DES
len = strlen(salt);
- if ((len == 13 || len == 2) && strspn(salt, DES_SALT_ALPHABET) == len)
- return (crypt_des(passwd, salt));
+ if ((len == 13 || len == 2) && strspn(salt, DES_SALT_ALPHABET) == len) {
+ func = crypt_des;
+ goto match;
+ }
#endif
- return (crypt_format->func(passwd, salt));
+ func = crypt_format->func;
+match:
+ if (func(passwd, salt, data->__buf) != 0)
+ return (NULL);
+ return (data->__buf);
+}
+
+char *
+crypt(const char *passwd, const char *salt)
+{
+ static struct crypt_data data;
+
+ return (crypt_r(passwd, salt, &data));
}
Modified: user/alc/PQ_LAUNDRY/lib/libcrypt/crypt.h
==============================================================================
--- user/alc/PQ_LAUNDRY/lib/libcrypt/crypt.h Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/lib/libcrypt/crypt.h Thu Aug 11 20:07:42 2016 (r303968)
@@ -32,12 +32,12 @@
#define MD4_SIZE 16
#define MD5_SIZE 16
-char *crypt_des(const char *pw, const char *salt);
-char *crypt_md5(const char *pw, const char *salt);
-char *crypt_nthash(const char *pw, const char *salt);
-char *crypt_blowfish(const char *pw, const char *salt);
-char *crypt_sha256 (const char *pw, const char *salt);
-char *crypt_sha512 (const char *pw, const char *salt);
+int crypt_des(const char *pw, const char *salt, char *buf);
+int crypt_md5(const char *pw, const char *salt, char *buf);
+int crypt_nthash(const char *pw, const char *salt, char *buf);
+int crypt_blowfish(const char *pw, const char *salt, char *buf);
+int crypt_sha256 (const char *pw, const char *salt, char *buf);
+int crypt_sha512 (const char *pw, const char *salt, char *buf);
extern void _crypt_to64(char *s, u_long v, int n);
-extern void b64_from_24bit(uint8_t B2, uint8_t B1, uint8_t B0, int n, int *buflen, char **cp);
+extern void b64_from_24bit(uint8_t B2, uint8_t B1, uint8_t B0, int n, char **cp);
Modified: user/alc/PQ_LAUNDRY/lib/libcrypt/misc.c
==============================================================================
--- user/alc/PQ_LAUNDRY/lib/libcrypt/misc.c Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/lib/libcrypt/misc.c Thu Aug 11 20:07:42 2016 (r303968)
@@ -47,7 +47,7 @@ _crypt_to64(char *s, u_long v, int n)
}
void
-b64_from_24bit(uint8_t B2, uint8_t B1, uint8_t B0, int n, int *buflen, char **cp)
+b64_from_24bit(uint8_t B2, uint8_t B1, uint8_t B0, int n, char **cp)
{
uint32_t w;
int i;
@@ -56,8 +56,6 @@ b64_from_24bit(uint8_t B2, uint8_t B1, u
for (i = 0; i < n; i++) {
**cp = itoa64[w&0x3f];
(*cp)++;
- if ((*buflen)-- < 0)
- break;
w >>= 6;
}
}
Modified: user/alc/PQ_LAUNDRY/lib/libpcap/pcap-netmap.c
==============================================================================
--- user/alc/PQ_LAUNDRY/lib/libpcap/pcap-netmap.c Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/lib/libpcap/pcap-netmap.c Thu Aug 11 20:07:42 2016 (r303968)
@@ -240,7 +240,7 @@ pcap_netmap_activate(pcap_t *p)
p->linktype = DLT_EN10MB;
p->selectable_fd = p->fd;
p->read_op = pcap_netmap_dispatch;
- p->inject_op = pcap_netmap_inject,
+ p->inject_op = pcap_netmap_inject;
p->setfilter_op = install_bpf_program;
p->setdirection_op = NULL;
p->set_datalink_op = NULL;
Modified: user/alc/PQ_LAUNDRY/release/release.sh
==============================================================================
--- user/alc/PQ_LAUNDRY/release/release.sh Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/release/release.sh Thu Aug 11 20:07:42 2016 (r303968)
@@ -287,9 +287,15 @@ extra_chroot_setup() {
fi
if [ ! -z "${EMBEDDEDPORTS}" ]; then
+ _OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
+ REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
+ BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
+ PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
+ PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
+ PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
for _PORT in ${EMBEDDEDPORTS}; do
eval chroot ${CHROOTDIR} make -C /usr/ports/${_PORT} \
- BATCH=1 FORCE_PKG_REGISTER=1 install clean distclean
+ FORCE_PKG_REGISTER=1 ${PBUILD_FLAGS} install clean distclean
done
fi
Modified: user/alc/PQ_LAUNDRY/sbin/ipfw/ipfw2.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sbin/ipfw/ipfw2.c Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/sbin/ipfw/ipfw2.c Thu Aug 11 20:07:42 2016 (r303968)
@@ -1583,7 +1583,7 @@ show_static_rule(struct cmdline_opts *co
break;
case O_NAT:
- if (cmd->arg1 != 0)
+ if (cmd->arg1 != IP_FW_NAT44_GLOBAL)
bprint_uint_arg(bp, "nat ", cmd->arg1);
else
bprintf(bp, "nat global");
@@ -3776,7 +3776,7 @@ compile_rule(char *av[], uint32_t *rbuf,
action->len = F_INSN_SIZE(ipfw_insn_nat);
CHECK_ACTLEN;
if (*av != NULL && _substrcmp(*av, "global") == 0) {
- action->arg1 = 0;
+ action->arg1 = IP_FW_NAT44_GLOBAL;
av++;
break;
} else
Modified: user/alc/PQ_LAUNDRY/secure/lib/libcrypt/crypt-blowfish.c
==============================================================================
--- user/alc/PQ_LAUNDRY/secure/lib/libcrypt/crypt-blowfish.c Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/secure/lib/libcrypt/crypt-blowfish.c Thu Aug 11 20:07:42 2016 (r303968)
@@ -75,8 +75,6 @@ __FBSDID("$FreeBSD$");
static void encode_base64(u_int8_t *, u_int8_t *, u_int16_t);
static void decode_base64(u_int8_t *, u_int16_t, const u_int8_t *);
-static char encrypted[_PASSWORD_LEN];
-
const static u_int8_t Base64Code[] =
"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
@@ -135,8 +133,8 @@ decode_base64(u_int8_t *buffer, u_int16_
/* We handle $Vers$log2(NumRounds)$salt+passwd$
i.e. $2$04$iwouldntknowwhattosayetKdJ6iFtacBqJdKe6aW7ou */
-char *
-crypt_blowfish(const char *key, const char *salt)
+int
+crypt_blowfish(const char *key, const char *salt, char *buffer)
{
blf_ctx state;
u_int32_t rounds, i, k;
@@ -157,10 +155,8 @@ crypt_blowfish(const char *key, const ch
/* Discard "$" identifier */
salt++;
- if (*salt > BCRYPT_VERSION) {
- /* How do I handle errors ? Return NULL */
- return NULL;
- }
+ if (*salt > BCRYPT_VERSION)
+ return (-1);
/* Check for minor versions */
if (salt[1] != '$') {
@@ -174,7 +170,7 @@ crypt_blowfish(const char *key, const ch
salt++;
break;
default:
- return NULL;
+ return (-1);
}
} else
minr = 0;
@@ -184,15 +180,15 @@ crypt_blowfish(const char *key, const ch
if (salt[2] != '$')
/* Out of sync with passwd entry */
- return NULL;
+ return (-1);
memcpy(arounds, salt, sizeof(arounds));
if (arounds[sizeof(arounds) - 1] != '$')
- return NULL;
+ return (-1);
arounds[sizeof(arounds) - 1] = 0;
logr = strtonum(arounds, BCRYPT_MINLOGROUNDS, 31, NULL);
if (logr == 0)
- return NULL;
+ return (-1);
/* Computer power doesn't increase linearly, 2^x should be fine */
rounds = 1U << logr;
@@ -201,7 +197,7 @@ crypt_blowfish(const char *key, const ch
}
if (strlen(salt) * 3 / 4 < BCRYPT_MAXSALT)
- return NULL;
+ return (-1);
/* We dont want the base64 salt but the raw data */
decode_base64(csalt, BCRYPT_MAXSALT, (const u_int8_t *) salt);
@@ -248,23 +244,23 @@ crypt_blowfish(const char *key, const ch
}
- i = 0;
- encrypted[i++] = '$';
- encrypted[i++] = BCRYPT_VERSION;
+ *buffer++ = '$';
+ *buffer++ = BCRYPT_VERSION;
if (minr)
- encrypted[i++] = minr;
- encrypted[i++] = '$';
+ *buffer++ = minr;
+ *buffer++ = '$';
- snprintf(encrypted + i, 4, "%2.2u$", logr);
+ snprintf(buffer, 4, "%2.2u$", logr);
+ buffer += 3;
- encode_base64((u_int8_t *) encrypted + i + 3, csalt, BCRYPT_MAXSALT);
- encode_base64((u_int8_t *) encrypted + strlen(encrypted), ciphertext,
- 4 * BCRYPT_BLOCKS - 1);
+ encode_base64((u_int8_t *)buffer, csalt, BCRYPT_MAXSALT);
+ buffer += strlen(buffer);
+ encode_base64((u_int8_t *)buffer, ciphertext, 4 * BCRYPT_BLOCKS - 1);
memset(&state, 0, sizeof(state));
memset(ciphertext, 0, sizeof(ciphertext));
memset(csalt, 0, sizeof(csalt));
memset(cdata, 0, sizeof(cdata));
- return encrypted;
+ return (0);
}
static void
Modified: user/alc/PQ_LAUNDRY/secure/lib/libcrypt/crypt-des.c
==============================================================================
--- user/alc/PQ_LAUNDRY/secure/lib/libcrypt/crypt-des.c Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/secure/lib/libcrypt/crypt-des.c Thu Aug 11 20:07:42 2016 (r303968)
@@ -588,13 +588,12 @@ des_cipher(const char *in, char *out, u_
return(retval);
}
-char *
-crypt_des(const char *key, const char *setting)
+int
+crypt_des(const char *key, const char *setting, char *buffer)
{
int i;
u_int32_t count, salt, l, r0, r1, keybuf[2];
- u_char *p, *q;
- static char output[21];
+ u_char *q;
if (!des_initialised)
des_init();
@@ -610,7 +609,7 @@ crypt_des(const char *key, const char *s
key++;
}
if (des_setkey((char *)keybuf))
- return(NULL);
+ return (-1);
if (*setting == _PASSWORD_EFMT1) {
/*
@@ -629,7 +628,7 @@ crypt_des(const char *key, const char *s
* Encrypt the key with itself.
*/
if (des_cipher((char *)keybuf, (char *)keybuf, 0L, 1))
- return(NULL);
+ return (-1);
/*
* And XOR with the next 8 characters of the key.
*/
@@ -638,19 +637,9 @@ crypt_des(const char *key, const char *s
*q++ ^= *key++ << 1;
if (des_setkey((char *)keybuf))
- return(NULL);
+ return (-1);
}
- strncpy(output, setting, 9);
-
- /*
- * Double check that we weren't given a short setting.
- * If we were, the above code will probably have created
- * wierd values for count and salt, but we don't really care.
- * Just make sure the output string doesn't have an extra
- * NUL in it.
- */
- output[9] = '\0';
- p = (u_char *)output + strlen(output);
+ buffer = stpncpy(buffer, setting, 9);
} else {
/*
* "old"-style:
@@ -662,43 +651,41 @@ crypt_des(const char *key, const char *s
salt = (ascii_to_bin(setting[1]) << 6)
| ascii_to_bin(setting[0]);
- output[0] = setting[0];
+ *buffer++ = setting[0];
/*
* If the encrypted password that the salt was extracted from
* is only 1 character long, the salt will be corrupted. We
* need to ensure that the output string doesn't have an extra
* NUL in it!
*/
- output[1] = setting[1] ? setting[1] : output[0];
-
- p = (u_char *)output + 2;
+ *buffer++ = setting[1] ? setting[1] : setting[0];
}
setup_salt(salt);
/*
* Do it.
*/
if (do_des(0L, 0L, &r0, &r1, (int)count))
- return(NULL);
+ return (-1);
/*
* Now encode the result...
*/
l = (r0 >> 8);
- *p++ = ascii64[(l >> 18) & 0x3f];
- *p++ = ascii64[(l >> 12) & 0x3f];
- *p++ = ascii64[(l >> 6) & 0x3f];
- *p++ = ascii64[l & 0x3f];
+ *buffer++ = ascii64[(l >> 18) & 0x3f];
+ *buffer++ = ascii64[(l >> 12) & 0x3f];
+ *buffer++ = ascii64[(l >> 6) & 0x3f];
+ *buffer++ = ascii64[l & 0x3f];
l = (r0 << 16) | ((r1 >> 16) & 0xffff);
- *p++ = ascii64[(l >> 18) & 0x3f];
- *p++ = ascii64[(l >> 12) & 0x3f];
- *p++ = ascii64[(l >> 6) & 0x3f];
- *p++ = ascii64[l & 0x3f];
+ *buffer++ = ascii64[(l >> 18) & 0x3f];
+ *buffer++ = ascii64[(l >> 12) & 0x3f];
+ *buffer++ = ascii64[(l >> 6) & 0x3f];
+ *buffer++ = ascii64[l & 0x3f];
l = r1 << 2;
- *p++ = ascii64[(l >> 12) & 0x3f];
- *p++ = ascii64[(l >> 6) & 0x3f];
- *p++ = ascii64[l & 0x3f];
- *p = 0;
+ *buffer++ = ascii64[(l >> 12) & 0x3f];
+ *buffer++ = ascii64[(l >> 6) & 0x3f];
+ *buffer++ = ascii64[l & 0x3f];
+ *buffer = '\0';
- return(output);
+ return (0);
}
Modified: user/alc/PQ_LAUNDRY/share/man/man4/pci.4
==============================================================================
--- user/alc/PQ_LAUNDRY/share/man/man4/pci.4 Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/share/man/man4/pci.4 Thu Aug 11 20:07:42 2016 (r303968)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 3, 2008
+.Dd August 9, 2016
.Dt PCI 4
.Os
.Sh NAME
@@ -229,7 +229,8 @@ The status tells the user the dispositio
The possible status values are:
.Bl -ohang
.It PCI_GETCONF_LAST_DEVICE
-This means that there are no more devices in the PCI device list after the
+This means that there are no more devices in the PCI device list matching
+the specified criteria after the
ones returned in the
.Va matches
buffer.
@@ -245,9 +246,7 @@ and
to zero to start over at the beginning of the list.
.It PCI_GETCONF_MORE_DEVS
This tells the user that his buffer was not large enough to hold all of the
-remaining devices in the device list that possibly match his criteria.
-It is possible for this status to be returned, even when none of the remaining
-devices in the list would match the user's criteria.
+remaining devices in the device list that match his criteria.
.It PCI_GETCONF_ERROR
This indicates a general error while servicing the user's request.
If the
Modified: user/alc/PQ_LAUNDRY/share/mk/bsd.README
==============================================================================
--- user/alc/PQ_LAUNDRY/share/mk/bsd.README Thu Aug 11 19:13:30 2016 (r303967)
+++ user/alc/PQ_LAUNDRY/share/mk/bsd.README Thu Aug 11 20:07:42 2016 (r303968)
@@ -331,6 +331,7 @@ PROGS_CXX PROG and PROGS_CXX in one Make
- DEBUG_FLAGS
- DPADD
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list