CVS commit: [netbsd-7] src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun Oct 19 09:14:51 UTC 2014
Modified Files:
src/usr.sbin/sysinst [netbsd-7]: menus.mi
Log Message:
Pull up following revision(s) (requested by snj in ticket #149):
usr.sbin/sysinst/menus.mi: revision 1.7
Make the option to abort pkgsrc fetching/extraction actually work.
Previously, if the network was not set up and you couldn't fetch
pkgsrc, you'd get stuck here, unable to make it back to the parent
menu.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 src/usr.sbin/sysinst/menus.mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/menus.mi
diff -u src/usr.sbin/sysinst/menus.mi:1.4 src/usr.sbin/sysinst/menus.mi:1.4.4.1
--- src/usr.sbin/sysinst/menus.mi:1.4 Wed Aug 6 10:03:49 2014
+++ src/usr.sbin/sysinst/menus.mi Sun Oct 19 09:14:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi,v 1.4 2014/08/06 10:03:49 martin Exp $ */
+/* $NetBSD: menus.mi,v 1.4.4.1 2014/10/19 09:14:51 martin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -593,7 +593,7 @@ menu pkgsrc, y=-4, x=0, w=70, no box, no
clean_xfer_dir ? MSG_Yes : MSG_No);},
action {process_menu(MENU_yesno, deconst(MSG_delete_xfer_file));
clean_xfer_dir = yesno; };
- option MSG_quit_pkgsrc, exit, action { yesno = 0;};
+ option MSG_quit_pkgsrc, exit, action { yesno = SET_SKIP;};
menu usersh, title MSG_User_shell, no clear;
option /bin/sh, exit, action { ushell = /bin/sh;};
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sun Oct 19 09:15:59 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #147 and #149 To generate a diff of this commit: cvs rdiff -u -r1.1.2.58 -r1.1.2.59 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.58 src/doc/CHANGES-7.0:1.1.2.59 --- src/doc/CHANGES-7.0:1.1.2.58 Sat Oct 18 14:06:58 2014 +++ src/doc/CHANGES-7.0 Sun Oct 19 09:15:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.58 2014/10/18 14:06:58 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.59 2014/10/19 09:15:59 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -1669,3 +1669,114 @@ sys/compat/freebsd/freebsd_sysctl.c 1.1 Do not access a userland pointer from kernel space directly, use copyin() instead. [maxv, ticket #146] + +crypto/external/bsd/openssl/dist/CHANGES 1.2 (patch) +crypto/external/bsd/openssl/dist/Configure 1.9 (patch) +crypto/external/bsd/openssl/dist/Makefile 1.3 (patch) +crypto/external/bsd/openssl/dist/NEWS 1.2 (patch) +crypto/external/bsd/openssl/dist/README 1.2 (patch) +crypto/external/bsd/openssl/dist/apps/makeapps.com 1.2 (patch) +crypto/external/bsd/openssl/dist/apps/s_client.c 1.7 (patch) +crypto/external/bsd/openssl/dist/crypto/LPdir_vms.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/LPdir_win.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/Makefile 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-x86_64.pl 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/asn1/a_strex.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-gcc.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c 1.7 (patch) +crypto/external/bsd/openssl/dist/crypto/bn/bn_nist.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/bn/exptest.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/constant_time_locl.h 1.1 (patch) +crypto/external/bsd/openssl/dist/crypto/crypto-lib.com 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/dsa/dsa_ameth.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/ebcdic.h 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/ec/ec.h 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/ec/ec2_smpl.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/ec/ec_ameth.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/ec/ec_asn1.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/ec/ecp_mont.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/ec/ecp_nist.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/ec/ecp_smpl.c 1.3 (patch) +crypto/external/bsd/openssl/dist/crypto/ec/ectest.c 1.6 (patch) +crypto/external/bsd/openssl/dist/crypto/err/openssl.ec 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/evp/Makefile 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c 1.5 (patch) +crypto/external/bsd/openssl/dist/crypto/evp/evp_enc.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/install-crypto.com 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/md5/asm/md5-x86_64.pl 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/modes/modes.h 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_vfy.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/opensslconf.h 1.7 (patch) +crypto/external/bsd/openssl/dist/crypto/opensslv.h 1.11 (patch) +crypto/external/bsd/openssl/dist/crypto/ossl_typ.h 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/pkcs7/pkcs7.h 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/pqueue/pqueue.h 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/rsa/Makefile 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/rsa/rsa.h 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/rsa/rsa_err.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/rsa/rsa_oaep.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/rsa/rsa_pk1.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/rsa/rsa_sign.c 1.2 (patch) +crypto/external/bsd/openssl/dist/crypto/stack/safestack.h 1.2 (patch) +crypto/external/bsd/openssl/dist/doc/apps/dgst.pod 1.2 (patch) +crypto/external/bsd/openssl/dist/doc/crypto/BIO_s_accept.pod 1.2 (patch) +crypto/external/bsd/openssl/dist/doc/crypto/EVP_DigestInit.pod 1.2 (patch) +crypto/external/bsd/openssl/dist/doc/crypto/EVP_DigestVerifyInit.pod 1.2 (patch) +crypto/external/bsd/openssl/dist/doc/crypto/EVP_EncryptInit.pod 1.2 (patch) +crypto/external/bsd/openssl/dist/doc/crypto/EVP_PKEY_set1_RSA.pod 1.2 (patch) +crypto/external/bsd/openssl/dist/doc/crypto/EVP_PKEY_sign.pod 1.2 (patch) +crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod 1.2 (patch) +crypto/external/bsd/openssl/dist/e_os.h 1.2 (patch) +crypto/external/bsd/openssl/dist/engines/makeengines.com 1.2 (patch)
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Sun Oct 19 09:39:33 UTC 2014
Modified Files:
src/sys/dev/ic: dwc_gmac_reg.h
Log Message:
Add more bits and comments, parts from jmcneill.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/dwc_gmac_reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_gmac_reg.h
diff -u src/sys/dev/ic/dwc_gmac_reg.h:1.6 src/sys/dev/ic/dwc_gmac_reg.h:1.7
--- src/sys/dev/ic/dwc_gmac_reg.h:1.6 Sat Oct 18 12:43:25 2014
+++ src/sys/dev/ic/dwc_gmac_reg.h Sun Oct 19 09:39:33 2014
@@ -45,10 +45,16 @@
#define AWIN_GMAC_MAC_CONF_FRAMEBURST __BIT(21)
#define AWIN_GMAC_MAC_CONF_MIISEL __BIT(15)
#define AWIN_GMAC_MAC_CONF_FES100 __BIT(14)
+#define AWIN_GMAC_MAC_CONF_DISABLERXOWN __BIT(13)
#define AWIN_GMAC_MAC_CONF_FULLDPLX __BIT(11)
#define AWIN_GMAC_MAC_CONF_TXENABLE __BIT(3)
#define AWIN_GMAC_MAC_CONF_RXENABLE __BIT(2)
+#define AWIN_GMAC_MAC_FFILT_PM __BIT(4) /* promiscious multicast */
+#define AWIN_GMAC_MAC_FFILT_HMC __BIT(2) /* multicast hash compare */
+#define AWIN_GMAC_MAC_FFILT_HUC __BIT(1) /* unicast hash compare */
+#define AWIN_GMAC_MAC_FFILT_PR __BIT(0) /* promiscious mode */
+
#define AWIN_GMAC_MAC_INT_LPI __BIT(10)
#define AWIN_GMAC_MAC_INT_TSI __BIT(9)
#define AWIN_GMAC_MAC_INT_ANEG __BIT(2)
@@ -69,7 +75,7 @@
#define AWIN_GMAC_DMA_CUR_RX_BUFADDR 0x1054
#define AWIN_GMAC_DMA_HWFEATURES 0x1058 /* not always implemented? */
-#define GMAC_MII_PHY_SHIFT 11
+#define GMAC_MII_PHY_SHIFT 11
#define GMAC_MII_PHY_MASK __BITS(15,11)
#define GMAC_MII_REG_SHIFT 6
#define GMAC_MII_REG_MASK __BITS(10,6)
@@ -92,33 +98,42 @@
#define GMAC_MII_CLK_DIV18 0xf
#define GMAC_MII_CLKMASK __BITS(5,2)
+#define GMAC_BUSMODE_FIXEDBURST __BIT(16)
+#define GMAC_BUSMODE_PRIORXTX __BITS(15,14)
+#define GMAC_BUSMODE_PRIORXTX_41 3
+#define GMAC_BUSMODE_PRIORXTX_31 2
+#define GMAC_BUSMODE_PRIORXTX_21 1
+#define GMAC_BUSMODE_PRIORXTX_11 0
+#define GMCA_BUSMODE_PBL __BITS(13,8) /* possible DMA
+ burst len */
#define GMAC_BUSMODE_RESET __BIT(0)
#define AWIN_GMAC_MII_IRQ __BIT(0)
-#define GMAC_DMA_OP_STOREFORWARD __BIT(21)
-#define GMAC_DMA_OP_FLUSHTX __BIT(20)
-#define GMAC_DMA_OP_TXSTART __BIT(13)
-#define GMAC_DMA_OP_TXSECONDFRAME __BIT(2)
-#define GMAC_DMA_OP_RXSTART __BIT(1)
-#define GMAC_DMA_INT_NIE __BIT(16) /* Normal/Summary */
-#define GMAC_DMA_INT_AIE __BIT(15) /* Abnormal/Summary */
+#define GMAC_DMA_OP_STOREFORWARD __BIT(21) /* start TX with when a
+ full frame is available */
+#define GMAC_DMA_OP_FLUSHTX __BIT(20) /* flush TX fifo */
+#define GMAC_DMA_OP_TXSTART __BIT(13) /* start TX DMA engine */
+#define GMAC_DMA_OP_RXSTART __BIT(1) /* start RX DMA engine */
+
+#define GMAC_DMA_INT_NIE __BIT(16) /* Normal/Summary */
+#define GMAC_DMA_INT_AIE __BIT(15) /* Abnormal/Summary */
#define GMAC_DMA_INT_ERE __BIT(14) /* Early receive */
#define GMAC_DMA_INT_FBE __BIT(13) /* Fatal bus error */
#define GMAC_DMA_INT_ETE __BIT(10) /* Early transmit */
-#define GMAC_DMA_INT_RWE __BIT(9) /* Receive watchdog */
-#define GMAC_DMA_INT_RSE __BIT(8) /* Receive stopped */
-#define GMAC_DMA_INT_RUE __BIT(7) /* Receive buffer unavailable */
-#define GMAC_DMA_INT_RIE __BIT(6) /* Receive interrupt */
-#define GMAC_DMA_INT_UNE __BIT(5) /* Tx underflow */
-#define GMAC_DMA_INT_OVE __BIT(4) /* Receive overflow */
-#define GMAC_DMA_INT_TJE __BIT(3) /* Transmit jabber */
-#define GMAC_DMA_INT_TUE __BIT(2) /* Transmit buffer unavailable */
-#define GMAC_DMA_INT_TSE __BIT(1) /* Transmit stopped */
-#define GMAC_DMA_INT_TIE __BIT(0) /* Transmit interrupt */
+#define GMAC_DMA_INT_RWE __BIT(9) /* Receive watchdog */
+#define GMAC_DMA_INT_RSE __BIT(8) /* Receive stopped */
+#define GMAC_DMA_INT_RUE __BIT(7) /* Receive buffer unavail. */
+#define GMAC_DMA_INT_RIE __BIT(6) /* Receive interrupt */
+#define GMAC_DMA_INT_UNE __BIT(5) /* Tx underflow */
+#define GMAC_DMA_INT_OVE __BIT(4) /* Receive overflow */
+#define GMAC_DMA_INT_TJE __BIT(3) /* Transmit jabber */
+#define GMAC_DMA_INT_TUE __BIT(2) /* Transmit buffer unavail. */
+#define GMAC_DMA_INT_TSE __BIT(1) /* Transmit stopped */
+#define GMAC_DMA_INT_TIE __BIT(0) /* Transmit interrupt */
-#define GMAC_DMA_INT_MASK __BITS(0,16) /* all possible intr bits */
+#define GMAC_DMA_INT_MASK __BITS(0,16) /* all possible intr bits */
struct dwc_gmac_dev_dmadesc {
uint32_t ddesc_status;
@@ -149,7 +164,7 @@ struct dwc_gmac_dev_dmadesc {
/* for TX descriptors */
#define DDESC_CNTL_TXINT __BIT(31)
-#define DDESC_CNTL_TXLAST __BIT(30)
+#define DDESC_CNTL_TXLAST __BIT(30)
#define DDESC_CNTL_TXFIRST __BIT(29)
#define DDESC_CNTL_TXCHECKINSCTRL __BIT(27)
#define DDESC_CNTL_TXCRCDIS __BIT(26)
@@ -157,7 +172,7 @@ struct dwc_gmac_dev_dmadesc {
#define DDESC_CNTL_TXCHAIN __BIT(24)
/* for RX descriptors */
CVS commit: [netbsd-7] src/sys/kern
Module Name:src
Committed By: martin
Date: Sun Oct 19 10:02:59 UTC 2014
Modified Files:
src/sys/kern [netbsd-7]: vfs_vnode.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #150):
sys/kern/vfs_vnode.c: revision 1.39
When creating a vnode with vcache_get() mark the vnode VI_CHANGING until
it is fully initialised. It may be on the specnode list before it is
fully initialised and revoking it then would panic.
Should prevent the panic from PR kern/49171 (panic when closing a pty).
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.2.1 src/sys/kern/vfs_vnode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.37 src/sys/kern/vfs_vnode.c:1.37.2.1
--- src/sys/kern/vfs_vnode.c:1.37 Sat Jul 5 09:33:15 2014
+++ src/sys/kern/vfs_vnode.c Sun Oct 19 10:02:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.37 2014/07/05 09:33:15 hannken Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.37.2.1 2014/10/19 10:02:59 martin Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_vnode.c,v 1.37 2014/07/05 09:33:15 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_vnode.c,v 1.37.2.1 2014/10/19 10:02:59 martin Exp $);
#define _VFS_VNODE_PRIVATE
@@ -1292,6 +1292,7 @@ again:
}
/* Load the fs node. Exclusive as new_node-vn_vnode is NULL. */
+ vp-v_iflag |= VI_CHANGING;
error = VFS_LOADVNODE(mp, vp, key, key_len, new_key);
if (error) {
mutex_enter(vcache.lock);
@@ -1319,6 +1320,10 @@ again:
new_node-vn_key.vk_key = new_key;
new_node-vn_vnode = vp;
mutex_exit(vcache.lock);
+ mutex_enter(vp-v_interlock);
+ vp-v_iflag = ~VI_CHANGING;
+ cv_broadcast(vp-v_cv);
+ mutex_exit(vp-v_interlock);
*vpp = vp;
return 0;
}
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sun Oct 19 10:04:00 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #150 To generate a diff of this commit: cvs rdiff -u -r1.1.2.59 -r1.1.2.60 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.59 src/doc/CHANGES-7.0:1.1.2.60 --- src/doc/CHANGES-7.0:1.1.2.59 Sun Oct 19 09:15:59 2014 +++ src/doc/CHANGES-7.0 Sun Oct 19 10:04:00 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.59 2014/10/19 09:15:59 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.60 2014/10/19 10:04:00 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -1780,3 +1780,11 @@ usr.sbin/sysinst/menus.mi 1.7 menu. [snj, ticket #149] +sys/kern/vfs_vnode.c1.39 + + When creating a vnode with vcache_get() mark the vnode VI_CHANGING + until it is fully initialised. It may be on the specnode list + before it is fully initialised and revoking it then would panic. + Should prevent the panic from PR kern/49171 (panic when closing a pty). + [hannken, ticket #150] +
CVS commit: src
Module Name:src
Committed By: justin
Date: Sun Oct 19 11:17:44 UTC 2014
Modified Files:
src/lib/libc/stdio: fseeko.c
src/tests/lib/libc/stdio: t_open_memstream.c
Log Message:
Add negative offset checks to fseeko
These were not strictly needed before, as lseek would error on negative
arguments, but having added open_memstream we have a virtual file pointer
that assumes that it gets sane values, so we get an assertion triggered
on a negative value. Best to check in one place rather than at all the
relevant points.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/stdio/fseeko.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/stdio/t_open_memstream.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdio/fseeko.c
diff -u src/lib/libc/stdio/fseeko.c:1.12 src/lib/libc/stdio/fseeko.c:1.13
--- src/lib/libc/stdio/fseeko.c:1.12 Tue Mar 27 15:05:42 2012
+++ src/lib/libc/stdio/fseeko.c Sun Oct 19 11:17:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fseeko.c,v 1.12 2012/03/27 15:05:42 christos Exp $ */
+/* $NetBSD: fseeko.c,v 1.13 2014/10/19 11:17:43 justin Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: fseeko.c,v 1.12 2012/03/27 15:05:42 christos Exp $);
+__RCSID($NetBSD: fseeko.c,v 1.13 2014/10/19 11:17:43 justin Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -115,11 +115,21 @@ fseeko(FILE *fp, off_t offset, int whenc
curoff += fp-_p - fp-_bf._base;
offset += curoff;
+ if (offset 0) {
+ errno = EINVAL;
+ FUNLOCKFILE(fp);
+ return -1;
+ }
whence = SEEK_SET;
havepos = 1;
break;
case SEEK_SET:
+ if (offset 0) {
+ errno = EINVAL;
+ FUNLOCKFILE(fp);
+ return -1;
+ }
case SEEK_END:
curoff = 0; /* XXX just to keep gcc quiet */
havepos = 0;
Index: src/tests/lib/libc/stdio/t_open_memstream.c
diff -u src/tests/lib/libc/stdio/t_open_memstream.c:1.1 src/tests/lib/libc/stdio/t_open_memstream.c:1.2
--- src/tests/lib/libc/stdio/t_open_memstream.c:1.1 Wed Oct 15 21:55:34 2014
+++ src/tests/lib/libc/stdio/t_open_memstream.c Sun Oct 19 11:17:43 2014
@@ -16,7 +16,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_open_memstream.c,v 1.1 2014/10/15 21:55:34 justin Exp $);
+__RCSID($NetBSD: t_open_memstream.c,v 1.2 2014/10/19 11:17:43 justin Exp $);
#include atf-c.h
#include err.h
@@ -53,6 +53,7 @@ ATF_TC_BODY(test_open_memstream, tc)
ATF_CHECK(fflush(fp) == 0);
ATF_CHECK(size == 0);
ATF_CHECK(buf != (char *)0xff);
+ ATF_CHECK(fseek(fp, -6, SEEK_SET) == -1);
ATF_CHECK(fseek(fp, OFFSET, SEEK_SET) == 0);
ATF_CHECK(fprintf(fp, hello) != EOF);
ATF_CHECK(fflush(fp) != EOF);
CVS commit: src/sys/dev/ic
Module Name:src Committed By: martin Date: Sun Oct 19 11:37:17 UTC 2014 Modified Files: src/sys/dev/ic: dwc_gmac_reg.h Log Message: Add more comments To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/dwc_gmac_reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/dwc_gmac_reg.h diff -u src/sys/dev/ic/dwc_gmac_reg.h:1.7 src/sys/dev/ic/dwc_gmac_reg.h:1.8 --- src/sys/dev/ic/dwc_gmac_reg.h:1.7 Sun Oct 19 09:39:33 2014 +++ src/sys/dev/ic/dwc_gmac_reg.h Sun Oct 19 11:37:17 2014 @@ -42,13 +42,16 @@ #define AWIN_GMAC_MAC_ADDR0LO 0x0044 #define AWIN_GMAC_MII_STATUS 0x00D8 -#define AWIN_GMAC_MAC_CONF_FRAMEBURST __BIT(21) -#define AWIN_GMAC_MAC_CONF_MIISEL __BIT(15) -#define AWIN_GMAC_MAC_CONF_FES100 __BIT(14) -#define AWIN_GMAC_MAC_CONF_DISABLERXOWN __BIT(13) -#define AWIN_GMAC_MAC_CONF_FULLDPLX __BIT(11) -#define AWIN_GMAC_MAC_CONF_TXENABLE __BIT(3) -#define AWIN_GMAC_MAC_CONF_RXENABLE __BIT(2) +#define AWIN_GMAC_MAC_CONF_FRAMEBURST __BIT(21) /* allow TX frameburst when + in half duplex mode */ +#define AWIN_GMAC_MAC_CONF_MIISEL __BIT(15) /* select MII phy */ +#define AWIN_GMAC_MAC_CONF_FES100 __BIT(14) /* 100 mbit mode */ +#define AWIN_GMAC_MAC_CONF_DISABLERXOWN __BIT(13) /* do not receive our own + TX frames in half duplex + mode */ +#define AWIN_GMAC_MAC_CONF_FULLDPLX __BIT(11) /* select full duplex */ +#define AWIN_GMAC_MAC_CONF_TXENABLE __BIT(3) /* enable TX dma engine */ +#define AWIN_GMAC_MAC_CONF_RXENABLE __BIT(2) /* enable RX dma engine */ #define AWIN_GMAC_MAC_FFILT_PM __BIT(4) /* promiscious multicast */ #define AWIN_GMAC_MAC_FFILT_HMC __BIT(2) /* multicast hash compare */
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Sun Oct 19 11:45:01 UTC 2014
Modified Files:
src/sys/dev/ic: dwc_gmac.c
Log Message:
Add more MAC filter setup, some DMA burst configuration (from jmcneill),
actually enable RX interrupts (spotted by jmcneill), add RX handling
code and debug code.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/dwc_gmac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.10 src/sys/dev/ic/dwc_gmac.c:1.11
--- src/sys/dev/ic/dwc_gmac.c:1.10 Mon Oct 13 09:07:26 2014
+++ src/sys/dev/ic/dwc_gmac.c Sun Oct 19 11:45:01 2014
@@ -39,7 +39,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.10 2014/10/13 09:07:26 martin Exp $);
+__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.11 2014/10/19 11:45:01 martin Exp $);
/* #define DWC_GMAC_DEBUG 1 */
@@ -98,7 +98,7 @@ static void dwc_gmac_rx_intr(struct dwc_
-#define GMAC_DEF_DMA_INT_MASK (GMAC_DMA_INT_TIE| \
+#define GMAC_DEF_DMA_INT_MASK (GMAC_DMA_INT_TIE|GMAC_DMA_INT_RIE| \
GMAC_DMA_INT_NIE|GMAC_DMA_INT_AIE| \
GMAC_DMA_INT_FBE|GMAC_DMA_INT_UNE)
@@ -116,6 +116,7 @@ static void dwc_gmac_rx_intr(struct dwc_
#ifdef DWC_GMAC_DEBUG
static void dwc_gmac_dump_dma(struct dwc_gmac_softc *sc);
static void dwc_gmac_dump_tx_desc(struct dwc_gmac_softc *sc);
+static void dwc_gmac_dump_rx_desc(struct dwc_gmac_softc *sc);
static void dwc_dump_and_abort(struct dwc_gmac_softc *sc, const char *msg);
static void dwc_dump_status(struct dwc_gmac_softc *sc);
#endif
@@ -389,7 +390,8 @@ dwc_gmac_alloc_rx_ring(struct dwc_gmac_s
desc-ddesc_next = htole32(ring-r_physaddr
+ next * sizeof(*desc));
desc-ddesc_cntl = htole32(
- __SHIFTIN(AWGE_MAX_PACKET,DDESC_CNTL_SIZE1MASK));
+ __SHIFTIN(AWGE_MAX_PACKET,DDESC_CNTL_SIZE1MASK) |
+ DDESC_CNTL_RXCHAIN | DDESC_CNTL_RXINT);
desc-ddesc_status = htole32(DDESC_STATUS_OWNEDBYDEV);
}
@@ -425,6 +427,9 @@ dwc_gmac_reset_rx_ring(struct dwc_gmac_s
BUS_DMASYNC_PREWRITE);
ring-r_cur = ring-r_next = 0;
+ /* reset DMA address to start of ring */
+ bus_space_write_4(sc-sc_bst, sc-sc_bsh, AWIN_GMAC_DMA_RX_ADDR,
+ sc-sc_rxq.r_physaddr);
}
static int
@@ -654,8 +659,10 @@ dwc_gmac_miibus_statchg(struct ifnet *if
conf = bus_space_read_4(sc-sc_bst, sc-sc_bsh, AWIN_GMAC_MAC_CONF);
conf = ~(AWIN_GMAC_MAC_CONF_FES100|AWIN_GMAC_MAC_CONF_MIISEL
|AWIN_GMAC_MAC_CONF_FULLDPLX);
- conf |= AWIN_GMAC_MAC_CONF_FRAMEBURST | AWIN_GMAC_MAC_CONF_TXENABLE
- | AWIN_GMAC_MAC_CONF_RXENABLE;
+ conf |= AWIN_GMAC_MAC_CONF_FRAMEBURST
+ | AWIN_GMAC_MAC_CONF_DISABLERXOWN
+ | AWIN_GMAC_MAC_CONF_RXENABLE
+ | AWIN_GMAC_MAC_CONF_TXENABLE;
switch (IFM_SUBTYPE(mii-mii_media_active)) {
case IFM_10_T:
break;
@@ -689,6 +696,21 @@ dwc_gmac_init(struct ifnet *ifp)
dwc_gmac_stop(ifp, 0);
/*
+ * Configure DMA burst/transfer mode and RX/TX priorities.
+ * XXX - the GMAC_BUSMODE_PRIORXTX bits are undocumented.
+ */
+ bus_space_write_4(sc-sc_bst, sc-sc_bsh, AWIN_GMAC_DMA_BUSMODE,
+ GMAC_BUSMODE_FIXEDBURST |
+ __SHIFTIN(GMAC_BUSMODE_PRIORXTX_41, GMAC_BUSMODE_PRIORXTX) |
+ __SHIFTIN(8, GMCA_BUSMODE_PBL));
+
+ /*
+ * Set up address filter (XXX for testing only: promiscous)
+ */
+ bus_space_write_4(sc-sc_bst, sc-sc_bsh, AWIN_GMAC_MAC_FFILT,
+ AWIN_GMAC_MAC_FFILT_PR);
+
+ /*
* Set up dma pointer for RX and TX ring
*/
bus_space_write_4(sc-sc_bst, sc-sc_bsh, AWIN_GMAC_DMA_RX_ADDR,
@@ -700,7 +722,8 @@ dwc_gmac_init(struct ifnet *ifp)
* Start RX/TX part
*/
bus_space_write_4(sc-sc_bst, sc-sc_bsh,
- AWIN_GMAC_DMA_OPMODE, GMAC_DMA_OP_RXSTART|GMAC_DMA_OP_TXSTART);
+ AWIN_GMAC_DMA_OPMODE, GMAC_DMA_OP_RXSTART | GMAC_DMA_OP_TXSTART |
+ GMAC_DMA_OP_STOREFORWARD);
ifp-if_flags |= IFF_RUNNING;
ifp-if_flags = ~IFF_OACTIVE;
@@ -846,7 +869,6 @@ dwc_gmac_queue(struct dwc_gmac_softc *sc
static int
dwc_gmac_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
- // struct dwc_gmac_softc *sc = ifp-if_softc;
struct ifaddr *ifa = (struct ifaddr *)data;
int s, error = 0;
@@ -865,6 +887,43 @@ dwc_gmac_ioctl(struct ifnet *ifp, u_long
default:
break;
}
+ break;
+
+ case SIOCSIFFLAGS:
+ if ((error = ifioctl_common(ifp, cmd, data)) != 0)
+ break;
+
+ switch (ifp-if_flags (IFF_UP|IFF_RUNNING)) {
+ case IFF_RUNNING:
+ /*
+ * If interface is marked down and it is running, then
+ * stop it.
+ */
+ dwc_gmac_stop(ifp, 0);
+ ifp-if_flags = ~IFF_RUNNING;
+ break;
+ case IFF_UP:
+ /*
+ * If interface is marked up and it is stopped, then
+ * start it.
+ */
+ error = dwc_gmac_init(ifp);
+ break;
+ case IFF_UP|IFF_RUNNING:
+ /*
+ * If setting debug or promiscuous mode, do not reset
+ * the chip; for everything else, call dwc_gmac_init()
+ * which will trigger a reset.
+ */
+
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: jmcneill
Date: Sun Oct 19 13:04:24 UTC 2014
Modified Files:
src/sys/dev/ic: dwc_gmac.c
Log Message:
fix inverted logic with AWIN_GMAC_MAC_CONF_MIISEL bit; my cubieboard2 can talk
to the network now!
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/dwc_gmac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.11 src/sys/dev/ic/dwc_gmac.c:1.12
--- src/sys/dev/ic/dwc_gmac.c:1.11 Sun Oct 19 11:45:01 2014
+++ src/sys/dev/ic/dwc_gmac.c Sun Oct 19 13:04:24 2014
@@ -39,7 +39,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.11 2014/10/19 11:45:01 martin Exp $);
+__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.12 2014/10/19 13:04:24 jmcneill Exp $);
/* #define DWC_GMAC_DEBUG 1 */
@@ -665,12 +665,13 @@ dwc_gmac_miibus_statchg(struct ifnet *if
| AWIN_GMAC_MAC_CONF_TXENABLE;
switch (IFM_SUBTYPE(mii-mii_media_active)) {
case IFM_10_T:
+ conf |= AWIN_GMAC_MAC_CONF_MIISEL;
break;
case IFM_100_TX:
- conf |= AWIN_GMAC_MAC_CONF_FES100;
+ conf |= AWIN_GMAC_MAC_CONF_FES100 |
+ AWIN_GMAC_MAC_CONF_MIISEL;
break;
case IFM_1000_T:
- conf |= AWIN_GMAC_MAC_CONF_MIISEL;
break;
}
if (IFM_OPTIONS(mii-mii_media_active) IFM_FDX)
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: jmcneill
Date: Sun Oct 19 13:15:23 UTC 2014
Modified Files:
src/sys/dev/ic: dwc_gmac.c
Log Message:
only set PR bit in frame filter if IFF_PROMISC is set, and set PM bit if
IFF_ALLMULTI is set
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/dwc_gmac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.12 src/sys/dev/ic/dwc_gmac.c:1.13
--- src/sys/dev/ic/dwc_gmac.c:1.12 Sun Oct 19 13:04:24 2014
+++ src/sys/dev/ic/dwc_gmac.c Sun Oct 19 13:15:23 2014
@@ -39,7 +39,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.12 2014/10/19 13:04:24 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.13 2014/10/19 13:15:23 jmcneill Exp $);
/* #define DWC_GMAC_DEBUG 1 */
@@ -690,6 +690,7 @@ static int
dwc_gmac_init(struct ifnet *ifp)
{
struct dwc_gmac_softc *sc = ifp-if_softc;
+ uint32_t ffilt;
if (ifp-if_flags IFF_RUNNING)
return 0;
@@ -706,10 +707,14 @@ dwc_gmac_init(struct ifnet *ifp)
__SHIFTIN(8, GMCA_BUSMODE_PBL));
/*
- * Set up address filter (XXX for testing only: promiscous)
+ * Set up address filter
*/
- bus_space_write_4(sc-sc_bst, sc-sc_bsh, AWIN_GMAC_MAC_FFILT,
- AWIN_GMAC_MAC_FFILT_PR);
+ ffilt = 0;
+ if (ifp-if_flags IFF_PROMISC)
+ ffilt |= AWIN_GMAC_MAC_FFILT_PR;
+ else if (ifp-if_flags IFF_ALLMULTI)
+ ffilt |= AWIN_GMAC_MAC_FFILT_PM;
+ bus_space_write_4(sc-sc_bst, sc-sc_bsh, AWIN_GMAC_MAC_FFILT, ffilt);
/*
* Set up dma pointer for RX and TX ring
CVS commit: src/external/bsd/wpa/dist/wpa_supplicant
Module Name:src
Committed By: joerg
Date: Sun Oct 19 14:13:02 UTC 2014
Modified Files:
src/external/bsd/wpa/dist/wpa_supplicant: ctrl_iface.c events.c
wpa_supplicant.c
Log Message:
Fix format strings to match argument types.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
src/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/bsd/wpa/dist/wpa_supplicant/events.c \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c
diff -u src/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c:1.1.1.5 src/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c:1.2
--- src/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c:1.1.1.5 Thu Oct 16 19:16:02 2014
+++ src/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c Sun Oct 19 14:13:01 2014
@@ -5814,9 +5814,10 @@ static int wpas_ctrl_radio_work_show(str
int ret;
os_reltime_sub(now, work-time, diff);
- ret = os_snprintf(pos, end - pos, %s@%s:%u:%u:%ld.%06ld\n,
+ ret = os_snprintf(pos, end - pos, %s@%s:%u:%u:%jd.%06ld\n,
work-type, work-wpa_s-ifname, work-freq,
- work-started, diff.sec, diff.usec);
+ work-started, (intmax_t)diff.sec,
+ (long)diff.usec);
if (ret 0 || ret = end - pos)
break;
pos += ret;
Index: src/external/bsd/wpa/dist/wpa_supplicant/events.c
diff -u src/external/bsd/wpa/dist/wpa_supplicant/events.c:1.1.1.6 src/external/bsd/wpa/dist/wpa_supplicant/events.c:1.2
--- src/external/bsd/wpa/dist/wpa_supplicant/events.c:1.1.1.6 Thu Oct 16 19:16:03 2014
+++ src/external/bsd/wpa/dist/wpa_supplicant/events.c Sun Oct 19 14:13:01 2014
@@ -2990,8 +2990,8 @@ void wpa_supplicant_event(void *ctx, enu
os_reltime_sub(wpa_s-scan_start_time,
wpa_s-scan_trigger_time, diff);
- wpa_dbg(wpa_s, MSG_DEBUG, Own scan request started a scan in %ld.%06ld seconds,
-diff.sec, diff.usec);
+ wpa_dbg(wpa_s, MSG_DEBUG, Own scan request started a scan in %jd.%06ld seconds,
+(intmax_t)diff.sec, (long)diff.usec);
wpa_s-own_scan_requested = 0;
wpa_s-own_scan_running = 1;
if (wpa_s-last_scan_req == MANUAL_SCAN_REQ
@@ -3016,8 +3016,8 @@ void wpa_supplicant_event(void *ctx, enu
os_reltime_sub(now, wpa_s-scan_start_time, diff);
wpa_s-scan_start_time.sec = 0;
wpa_s-scan_start_time.usec = 0;
- wpa_dbg(wpa_s, MSG_DEBUG, Scan completed in %ld.%06ld seconds,
-diff.sec, diff.usec);
+ wpa_dbg(wpa_s, MSG_DEBUG, Scan completed in %jd.%06ld seconds,
+(intmax_t)diff.sec, (long)diff.usec);
}
wpa_supplicant_event_scan_results(wpa_s, data);
wpa_s-own_scan_running = 0;
Index: src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c
diff -u src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c:1.1.1.6 src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c:1.2
--- src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c:1.1.1.6 Thu Oct 16 19:16:02 2014
+++ src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c Sun Oct 19 14:13:01 2014
@@ -3405,8 +3405,8 @@ static void radio_start_next_work(void *
os_get_reltime(now);
os_reltime_sub(now, work-time, diff);
- wpa_dbg(work-wpa_s, MSG_DEBUG, Starting radio work '%s'@%p after %ld.%06ld second wait,
- work-type, work, diff.sec, diff.usec);
+ wpa_dbg(work-wpa_s, MSG_DEBUG, Starting radio work '%s'@%p after %jd.%06ld second wait,
+ work-type, work, (intmax_t)diff.sec, (long)diff.usec);
work-started = 1;
work-time = now;
work-cb(work, 0);
@@ -3555,9 +3555,9 @@ void radio_work_done(struct wpa_radio_wo
os_get_reltime(now);
os_reltime_sub(now, work-time, diff);
- wpa_dbg(wpa_s, MSG_DEBUG, Radio work '%s'@%p %s in %ld.%06ld seconds,
+ wpa_dbg(wpa_s, MSG_DEBUG, Radio work '%s'@%p %s in %jd.%06ld seconds,
work-type, work, started ? done : canceled,
- diff.sec, diff.usec);
+ (intmax_t)diff.sec, (long)diff.usec);
radio_work_free(work);
if (started)
radio_work_check_next(wpa_s);
CVS commit: [netbsd-7] src/sys
Module Name:src
Committed By: martin
Date: Sun Oct 19 15:22:00 UTC 2014
Modified Files:
src/sys/arch/arm/broadcom [netbsd-7]: bcm2835_vcaudio.c
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm [netbsd-7]:
vchiq_shim.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #151):
sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_shim.c: revision
1.5
sys/arch/arm/broadcom/bcm2835_vcaudio.c: revision 1.4
sys/arch/arm/broadcom/bcm2835_vcaudio.c: revision 1.5
sys/arch/arm/broadcom/bcm2835_vcaudio.c: revision 1.6
sys/arch/arm/broadcom/bcm2835_vcaudio.c: revision 1.7
use a fixed frequency (48kHz) and configure the audio server at attach time,
instead of at the beginning of playback
improved playback error handling, and get rid of junk+silence insertion at the
beginning of playback
expose vchi_get_peer_version
capture peer version; if less than 2, bail out as bulk mode is not supported.
report the peer version with audioctl version
Some improvements that make playback mostly reliable for me - the final
piece of the jigaw is probably in vchiq:
- prefill vchiq with a number (currently 2) blocks of audio before
starting
- use a kthread as workqueue isn't suited to our usage.
- don't drain on stopping as for some reason it leaves data behind.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.4.1 src/sys/arch/arm/broadcom/bcm2835_vcaudio.c
cvs rdiff -u -r1.4 -r1.4.2.1 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_shim.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm2835_vcaudio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.3 src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.3.4.1
--- src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.3 Mon May 5 08:13:31 2014
+++ src/sys/arch/arm/broadcom/bcm2835_vcaudio.c Sun Oct 19 15:22:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_vcaudio.c,v 1.3 2014/05/05 08:13:31 skrll Exp $ */
+/* $NetBSD: bcm2835_vcaudio.c,v 1.3.4.1 2014/10/19 15:22:00 martin Exp $ */
/*-
* Copyright (c) 2013 Jared D. McNeill jmcne...@invisible.ca
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_vcaudio.c,v 1.3 2014/05/05 08:13:31 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_vcaudio.c,v 1.3.4.1 2014/10/19 15:22:00 martin Exp $);
#include sys/param.h
#include sys/types.h
@@ -40,7 +40,6 @@ __KERNEL_RCSID(0, $NetBSD: bcm2835_vcau
#include sys/conf.h
#include sys/bus.h
#include sys/kmem.h
-#include sys/workqueue.h
#include sys/audioio.h
#include dev/audio_if.h
@@ -68,16 +67,33 @@ enum vcaudio_dest {
VCAUDIO_DEST_HDMI = 2,
};
-struct vcaudio_work {
- struct work vw_wk;
-};
+
+/*
+ * Standard message size is 4000 bytes and VCHIQ can accept 16 messages.
+ *
+ * 4000 bytes of 16bit 48kHz stereo is approximately 21ms.
+ *
+ * We get complete messages at ~10ms intervals.
+ *
+ * Setting blocksize to 2 x 4000 means that we send approx 42ms of audio. We
+ * prefill by two blocks before starting audio meaning we have 83ms of latency.
+ */
+
+#define VCAUDIO_MSGSIZE 4000
+#define VCAUDIO_NUMMSGS 2
+#define VCAUDIO_BLOCKSIZE (VCAUDIO_MSGSIZE * VCAUDIO_NUMMSGS)
+#define VCAUDIO_BUFFERSIZE 128000
+#define VCAUDIO_PREFILLCOUNT 2
struct vcaudio_softc {
device_t sc_dev;
device_t sc_audiodev;
+ lwp_t*sc_lwp;
+
kmutex_t sc_lock;
kmutex_t sc_intr_lock;
+ kcondvar_t sc_datacv;
kmutex_t sc_msglock;
kcondvar_t sc_msgcv;
@@ -89,7 +105,9 @@ struct vcaudio_softc {
void*sc_pintarg;
audio_params_t sc_pparam;
boolsc_started;
- intsc_pbytes;
+ intsc_pblkcnt; // prefill block count
+ intsc_abytes; // available bytes
+ intsc_pbytes; // played bytes
off_tsc_ppos;
void*sc_pstart;
void*sc_pend;
@@ -102,8 +120,7 @@ struct vcaudio_softc {
VCHI_CONNECTION_T sc_connection;
VCHI_SERVICE_HANDLE_T sc_service;
- struct workqueue *sc_wq;
- struct vcaudio_work sc_work;
+ shortsc_peer_version;
intsc_volume;
enum vcaudio_dest sc_dest;
@@ -116,18 +133,17 @@ static void vcaudio_childdet(device_t, d
static int vcaudio_init(struct vcaudio_softc *);
static void vcaudio_service_callback(void *,
- const VCHI_CALLBACK_REASON_T,
- void *);
-static int vcaudio_msg_sync(struct vcaudio_softc *, VC_AUDIO_MSG_T *, size_t);
-static void vcaudio_worker(struct work *, void *);
+const VCHI_CALLBACK_REASON_T, void *);
+static int vcaudio_msg_sync(struct vcaudio_softc *, VC_AUDIO_MSG_T *,
+size_t);
+static void vcaudio_worker(void *);
static int vcaudio_open(void *, int);
static void vcaudio_close(void *);
static int vcaudio_query_encoding(void *, struct audio_encoding *);
static int vcaudio_set_params(void *, int, int,
- audio_params_t *, audio_params_t *,
- stream_filter_list_t *,
-
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sun Oct 19 15:24:07 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #148 and #151 To generate a diff of this commit: cvs rdiff -u -r1.1.2.60 -r1.1.2.61 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.60 src/doc/CHANGES-7.0:1.1.2.61 --- src/doc/CHANGES-7.0:1.1.2.60 Sun Oct 19 10:04:00 2014 +++ src/doc/CHANGES-7.0 Sun Oct 19 15:24:07 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.60 2014/10/19 10:04:00 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.61 2014/10/19 15:24:07 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -1788,3 +1788,21 @@ sys/kern/vfs_vnode.c1.39 Should prevent the panic from PR kern/49171 (panic when closing a pty). [hannken, ticket #150] + +sys/compat/svr4/svr4_stat.c 1.70 +sys/dev/dm/dm_target_snapshot.c 1.17 +sys/dev/if_ndis/if_ndis_pci.c 1.20 +sys/fs/smbfs/smbfs_smb.c 1.45 +sys/ufs/ext2fs/ext2fs_readwrite.c 1.65 + + Various fixes: two memory leaks, a typo, a dead compiler condition and + unused macros, respectively in if_ndis and dm, smbfs, svr4 and ext2fs. + [maxv, ticket #148] + + +sys/arch/arm/broadcom/bcm2835_vcaudio.c 1.4-1.7 +sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_shim.c 1.5 + + Various audio fixes for RPi. + [skrll, ticket #151] +
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Sun Oct 19 15:27:33 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: BPI Log Message: More stuff works To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/BPI Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/BPI diff -u src/sys/arch/evbarm/conf/BPI:1.3 src/sys/arch/evbarm/conf/BPI:1.4 --- src/sys/arch/evbarm/conf/BPI:1.3 Sat Oct 11 11:55:07 2014 +++ src/sys/arch/evbarm/conf/BPI Sun Oct 19 15:27:32 2014 @@ -1,5 +1,5 @@ # -# $NetBSD: BPI,v 1.3 2014/10/11 11:55:07 uebayasi Exp $ +# $NetBSD: BPI,v 1.4 2014/10/19 15:27:32 skrll Exp $ # # BPI -- Banana Pi - an Allwinner A20 Eval Board Kernel # @@ -87,20 +87,20 @@ options NFS_BOOT_RWSIZE=1024 options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries #options COMPAT_43 # 4.3BSD compatibility. -options COMPAT_70 # NetBSD 7.0 compatibility. -options COMPAT_60 # NetBSD 6.0 compatibility. -options COMPAT_50 # NetBSD 5.0 compatibility. -options COMPAT_40 # NetBSD 4.0 compatibility. -options COMPAT_30 # NetBSD 3.0 compatibility. -#options COMPAT_20 # NetBSD 2.0 compatibility. -#options COMPAT_16 # NetBSD 1.6 compatibility. -#options COMPAT_15 # NetBSD 1.5 compatibility. -#options COMPAT_14 # NetBSD 1.4 compatibility. -#options COMPAT_13 # NetBSD 1.3 compatibility. -#options COMPAT_12 # NetBSD 1.2 compatibility. -#options COMPAT_11 # NetBSD 1.1 compatibility. -#options COMPAT_10 # NetBSD 1.0 compatibility. -#options COMPAT_09 # NetBSD 0.9 compatibility. +#options COMPAT_09 # NetBSD 0.9, +#options COMPAT_10 # NetBSD 1.0, +#options COMPAT_11 # NetBSD 1.1, +#options COMPAT_12 # NetBSD 1.2, +#options COMPAT_13 # NetBSD 1.3, +#options COMPAT_14 # NetBSD 1.4, +#options COMPAT_15 # NetBSD 1.5, +#options COMPAT_16 # NetBSD 1.6, +#options COMPAT_20 # NetBSD 2.0, +options COMPAT_30 # NetBSD 3.0, +options COMPAT_40 # NetBSD 4.0, +options COMPAT_50 # NetBSD 5.0, +options COMPAT_60 # NetBSD 6.0, and +options COMPAT_70 # NetBSD 7.0 binary compatibility. #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. #options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. @@ -131,6 +131,11 @@ options KTRACE # system call tracing, #options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) +# Alternate buffer queue strategies for better responsiveness under high +# disk I/O load. +#options BUFQ_READPRIO +options BUFQ_PRIOCSCAN + # Development and Debugging options #options PERFCTRS # performance counters @@ -224,6 +229,7 @@ gpio* at awingpio? awiniic0 at awinio? port 0 #awiniic* at awinio? port ? iic* at awiniic? +axp20x0 at iic0 addr 0x34 # AXP209 Power Management Unit # On-board 16550 UARTs com0 at awinio? port 0 # UART0 (console) @@ -275,6 +281,10 @@ ehci* at awinusb? usb* at ohci? usb* at ehci? +# USB OTG +motg0 at awinio0 +usb* at motg? + # SATA ahcisata* at awinio0 atabus* at ata? @@ -290,6 +300,7 @@ include dev/usb/usbdevices.config midi* at midibus? rlphy* at mii? phy ? +rgephy* at mii? phy ? ukphy* at mii? phy ? # Pseudo-Devices
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: jmcneill
Date: Sun Oct 19 15:37:25 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_reg.h
Log Message:
add A31 GMAC module base and clk reg offset
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/arm/allwinner/awin_reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_reg.h
diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.37 src/sys/arch/arm/allwinner/awin_reg.h:1.38
--- src/sys/arch/arm/allwinner/awin_reg.h:1.37 Wed Oct 15 23:28:37 2014
+++ src/sys/arch/arm/allwinner/awin_reg.h Sun Oct 19 15:37:25 2014
@@ -1700,6 +1700,7 @@ struct awin_mmc_idma_descriptor {
#define AWIN_A31_USB1_OFFSET 0x0001a000 /* EHCI0/OHCI0 */
#define AWIN_A31_USB2_OFFSET 0x0001b000 /* EHCI1/OHCI1 */
#define AWIN_A31_USB3_OFFSET 0x0001c000 /* OHCI2 */
+#define AWIN_A31_GMAC_OFFSET 0x0003 /* GMAC */
#define AWIN_A31_PRCM_OFFSET 0x00301400 /* PRCM */
#define AWIN_A31_CPUCFG_OFFSET 0x00301C00
#define AWIN_A31_RTC_OFFSET 0x0030 /* RTC */
@@ -1720,6 +1721,7 @@ struct awin_mmc_idma_descriptor {
#define AWIN_A31_CPU_AXI_CFG_REG 0x0050
+#define AWIN_A31_GMAC_CLK_REG 0x00D0
#define AWIN_A31_AHB_RESET0_REG 0x02C0
#define AWIN_A31_AHB_RESET1_REG 0x02C4
#define AWIN_A31_AHB_RESET2_REG 0x02C8
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: jmcneill
Date: Sun Oct 19 15:38:54 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_io.c
Log Message:
different offset for A31 GMAC
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/allwinner/awin_io.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_io.c
diff -u src/sys/arch/arm/allwinner/awin_io.c:1.21 src/sys/arch/arm/allwinner/awin_io.c:1.22
--- src/sys/arch/arm/allwinner/awin_io.c:1.21 Thu Oct 16 00:03:48 2014
+++ src/sys/arch/arm/allwinner/awin_io.c Sun Oct 19 15:38:54 2014
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_io.c,v 1.21 2014/10/16 00:03:48 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_io.c,v 1.22 2014/10/19 15:38:54 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -140,7 +140,7 @@ static const struct awin_locators awin_l
{ spi, OFFANDSIZE(SPI3), 3, AWIN_IRQ_SPI3, AANY },
{ awe, OFFANDSIZE(EMAC), NOPORT, AWIN_IRQ_EMAC, A10|A20 },
{ awge, OFFANDSIZE(GMAC), NOPORT, AWIN_IRQ_GMAC, A20 },
- { awge, OFFANDSIZE(GMAC), NOPORT, AWIN_A31_IRQ_GMAC, A31 },
+ { awge, OFFANDSIZE(A31_GMAC), NOPORT, AWIN_A31_IRQ_GMAC, A31 },
{ awincrypto, OFFANDSIZE(SS), NOPORT, AWIN_IRQ_SS, AANY },
{ awinac, OFFANDSIZE(AC), NOPORT, AWIN_IRQ_AC, A10|A20 },
{ awinac, OFFANDSIZE(AC), NOPORT, AWIN_A31_IRQ_AC, A31 },
CVS commit: src/sys/arch
Module Name:src Committed By: joerg Date: Sun Oct 19 15:41:05 UTC 2014 Modified Files: src/sys/arch/amd64/include: Makefile.inc src/sys/arch/i386/include: Makefile.inc Log Message: Disable SSE and AVX for kernel modules too. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amd64/include/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/include/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/include/Makefile.inc diff -u src/sys/arch/amd64/include/Makefile.inc:1.4 src/sys/arch/amd64/include/Makefile.inc:1.5 --- src/sys/arch/amd64/include/Makefile.inc:1.4 Mon Jun 11 15:18:05 2012 +++ src/sys/arch/amd64/include/Makefile.inc Sun Oct 19 15:41:05 2014 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile.inc,v 1.4 2012/06/11 15:18:05 chs Exp $ +# $NetBSD: Makefile.inc,v 1.5 2014/10/19 15:41:05 joerg Exp $ -CFLAGS+= -mno-red-zone +CFLAGS+= -mno-red-zone -mno-mmx -mno-sse -mno-avx +CFLAGS+= -msoft-float # this should really be !(RUMPKERNEL PIC) .if !defined(RUMPKERNEL) Index: src/sys/arch/i386/include/Makefile.inc diff -u src/sys/arch/i386/include/Makefile.inc:1.2 src/sys/arch/i386/include/Makefile.inc:1.3 --- src/sys/arch/i386/include/Makefile.inc:1.2 Sat May 24 18:39:04 2014 +++ src/sys/arch/i386/include/Makefile.inc Sun Oct 19 15:41:05 2014 @@ -1,4 +1,7 @@ -# $NetBSD: Makefile.inc,v 1.2 2014/05/24 18:39:04 jakllsch Exp $ +# $NetBSD: Makefile.inc,v 1.3 2014/10/19 15:41:05 joerg Exp $ + +CFLAGS+= -msoft-float +CFLAGS+= -mno-mmx -mno-sse -mno-avx # this should really be !(RUMPKERNEL PIC) .if !defined(RUMPKERNEL)
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: jmcneill
Date: Sun Oct 19 16:09:28 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_gige.c
Log Message:
add some A31 initialization and a new phy-type of gmii
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/allwinner/awin_gige.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_gige.c
diff -u src/sys/arch/arm/allwinner/awin_gige.c:1.13 src/sys/arch/arm/allwinner/awin_gige.c:1.14
--- src/sys/arch/arm/allwinner/awin_gige.c:1.13 Sat Oct 18 12:45:25 2014
+++ src/sys/arch/arm/allwinner/awin_gige.c Sun Oct 19 16:09:28 2014
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_gige.c,v 1.13 2014/10/18 12:45:25 martin Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_gige.c,v 1.14 2014/10/19 16:09:28 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -65,6 +65,11 @@ static const struct awin_gpio_pinset awi
'A', AWIN_PIO_PA_GMAC_FUNC, AWIN_PIO_PA_GMAC_PINS,
};
+static const struct awin_gpio_pinset awin_gige_gpio_pinset_a31 = {
+ 'A', AWIN_A31_PIO_PA_GMAC_FUNC, AWIN_A31_PIO_PA_GMAC_PINS,
+};
+
+
CFATTACH_DECL_NEW(awin_gige, sizeof(struct awin_gige_softc),
awin_gige_match, awin_gige_attach, NULL, NULL);
@@ -72,6 +77,9 @@ static int
awin_gige_match(device_t parent, cfdata_t cf, void *aux)
{
struct awinio_attach_args * const aio = aux;
+ const struct awin_gpio_pinset *pinset =
+ awin_chip_id() == AWIN_CHIP_ID_A31 ?
+ awin_gige_gpio_pinset_a31 : awin_gige_gpio_pinset;
#ifdef DIAGNOSTIC
const struct awin_locators * const loc = aio-aio_loc;
#endif
@@ -82,7 +90,7 @@ awin_gige_match(device_t parent, cfdata_
KASSERT(cf-cf_loc[AWINIOCF_PORT] == AWINIOCF_PORT_DEFAULT
|| cf-cf_loc[AWINIOCF_PORT] == loc-loc_port);
- if (!awin_gpio_pinset_available(awin_gige_gpio_pinset))
+ if (!awin_gpio_pinset_available(pinset))
return 0;
return 1;
@@ -94,13 +102,16 @@ awin_gige_attach(device_t parent, device
struct awin_gige_softc * const sc = device_private(self);
struct awinio_attach_args * const aio = aux;
const struct awin_locators * const loc = aio-aio_loc;
+ const struct awin_gpio_pinset *pinset =
+ awin_chip_id() == AWIN_CHIP_ID_A31 ?
+ awin_gige_gpio_pinset_a31 : awin_gige_gpio_pinset;
prop_dictionary_t cfg = device_properties(self);
uint32_t clkreg;
const char *phy_type, *pin_name;
sc-sc_core.sc_dev = self;
- awin_gpio_pinset_acquire(awin_gige_gpio_pinset);
+ awin_gpio_pinset_acquire(pinset);
sc-sc_core.sc_bst = aio-aio_core_bst;
sc-sc_core.sc_dmat = aio-aio_dmat;
@@ -139,19 +150,36 @@ awin_gige_attach(device_t parent, device
AWIN_AHB_GATING1_REG, AWIN_AHB_GATING1_GMAC, 0);
/*
+ * Soft reset
+ */
+ if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+ awin_reg_set_clear(aio-aio_core_bst, aio-aio_ccm_bsh,
+ AWIN_A31_AHB_RESET0_REG, AWIN_A31_AHB_RESET0_GMAC_RST, 0);
+ }
+
+ /*
* PHY clock setup
*/
if (!prop_dictionary_get_cstring_nocopy(cfg, phy-type, phy_type))
phy_type = rgmii;
if (strcmp(phy_type, rgmii) == 0) {
clkreg = AWIN_GMAC_CLK_PIT | AWIN_GMAC_CLK_TCS_INT_RGMII;
+ } else if (strcmp(phy_type, gmii) == 0) {
+ clkreg = AWIN_GMAC_CLK_TCS_INT_RGMII;
} else if (strcmp(phy_type, mii) == 0) {
clkreg = AWIN_GMAC_CLK_TCS_MII;
} else {
panic(unknown phy type '%s', phy_type);
}
- awin_reg_set_clear(aio-aio_core_bst, aio-aio_ccm_bsh,
- AWIN_GMAC_CLK_REG, clkreg, AWIN_GMAC_CLK_PIT|AWIN_GMAC_CLK_TCS);
+ if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+ awin_reg_set_clear(aio-aio_core_bst, aio-aio_ccm_bsh,
+ AWIN_A31_GMAC_CLK_REG, clkreg,
+ AWIN_GMAC_CLK_PIT|AWIN_GMAC_CLK_TCS);
+ } else {
+ awin_reg_set_clear(aio-aio_core_bst, aio-aio_ccm_bsh,
+ AWIN_GMAC_CLK_REG, clkreg,
+ AWIN_GMAC_CLK_PIT|AWIN_GMAC_CLK_TCS);
+ }
dwc_gmac_attach(sc-sc_core, GMAC_MII_CLK_150_250M_DIV102);
}
CVS commit: [netbsd-7] src/sys/arch
Module Name:src Committed By: martin Date: Sun Oct 19 16:11:06 UTC 2014 Modified Files: src/sys/arch/amd64/include [netbsd-7]: Makefile.inc src/sys/arch/i386/include [netbsd-7]: Makefile.inc Log Message: Pull up following revision(s) (requested by joerg in ticket #152): sys/arch/amd64/include/Makefile.inc: revision 1.5 sys/arch/i386/include/Makefile.inc: revision 1.3 Disable SSE and AVX for kernel modules too. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.14.1 src/sys/arch/amd64/include/Makefile.inc cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/arch/i386/include/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/include/Makefile.inc diff -u src/sys/arch/amd64/include/Makefile.inc:1.4 src/sys/arch/amd64/include/Makefile.inc:1.4.14.1 --- src/sys/arch/amd64/include/Makefile.inc:1.4 Mon Jun 11 15:18:05 2012 +++ src/sys/arch/amd64/include/Makefile.inc Sun Oct 19 16:11:06 2014 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile.inc,v 1.4 2012/06/11 15:18:05 chs Exp $ +# $NetBSD: Makefile.inc,v 1.4.14.1 2014/10/19 16:11:06 martin Exp $ -CFLAGS+= -mno-red-zone +CFLAGS+= -mno-red-zone -mno-mmx -mno-sse -mno-avx +CFLAGS+= -msoft-float # this should really be !(RUMPKERNEL PIC) .if !defined(RUMPKERNEL) Index: src/sys/arch/i386/include/Makefile.inc diff -u src/sys/arch/i386/include/Makefile.inc:1.2 src/sys/arch/i386/include/Makefile.inc:1.2.2.1 --- src/sys/arch/i386/include/Makefile.inc:1.2 Sat May 24 18:39:04 2014 +++ src/sys/arch/i386/include/Makefile.inc Sun Oct 19 16:11:06 2014 @@ -1,4 +1,7 @@ -# $NetBSD: Makefile.inc,v 1.2 2014/05/24 18:39:04 jakllsch Exp $ +# $NetBSD: Makefile.inc,v 1.2.2.1 2014/10/19 16:11:06 martin Exp $ + +CFLAGS+= -msoft-float +CFLAGS+= -mno-mmx -mno-sse -mno-avx # this should really be !(RUMPKERNEL PIC) .if !defined(RUMPKERNEL)
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sun Oct 19 16:12:22 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #152 To generate a diff of this commit: cvs rdiff -u -r1.1.2.61 -r1.1.2.62 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.61 src/doc/CHANGES-7.0:1.1.2.62 --- src/doc/CHANGES-7.0:1.1.2.61 Sun Oct 19 15:24:07 2014 +++ src/doc/CHANGES-7.0 Sun Oct 19 16:12:22 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.61 2014/10/19 15:24:07 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.62 2014/10/19 16:12:22 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -1806,3 +1806,9 @@ sys/external/bsd/vchiq/dist/interface/vc Various audio fixes for RPi. [skrll, ticket #151] +sys/arch/amd64/include/Makefile.inc 1.5 +sys/arch/i386/include/Makefile.inc 1.3 + + Disable SSE and AVX for kernel modules. + [joerg, ticket #152] +
CVS import: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Sun Oct 19 16:28:40 UTC 2014 Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3513 Log Message: Changes since OpenSSH 6.6 = Potentially-incompatible changes * sshd(8): The default set of ciphers and MACs has been altered to remove unsafe algorithms. In particular, CBC ciphers and arcfour* are disabled by default. The full set of algorithms remains available if configured explicitly via the Ciphers and MACs sshd_config options. * sshd(8): Support for tcpwrappers/libwrap has been removed. * OpenSSH 6.5 and 6.6 have a bug that causes ~0.2% of connections using the curve25519-sha...@libssh.org KEX exchange method to fail when connecting with something that implements the specification correctly. OpenSSH 6.7 disables this KEX method when speaking to one of the affected versions. New Features * Major internal refactoring to begin to make part of OpenSSH usable as a library. So far the wire parsing, key handling and KRL code has been refactored. Please note that we do not consider the API stable yet, nor do we offer the library in separable form. * ssh(1), sshd(8): Add support for Unix domain socket forwarding. A remote TCP port may be forwarded to a local Unix domain socket and vice versa or both ends may be a Unix domain socket. * ssh(1), ssh-keygen(1): Add support for SSHFP DNS records for ED25519 key types. * sftp(1): Allow resumption of interrupted uploads. * ssh(1): When rekeying, skip file/DNS lookups of the hostkey if it is the same as the one sent during initial key exchange; bz#2154 * sshd(8): Allow explicit ::1 and 127.0.0.1 forwarding bind addresses when GatewayPorts=no; allows client to choose address family; bz# * sshd(8): Add a sshd_config PermitUserRC option to control whether ~/.ssh/rc is executed, mirroring the no-user-rc authorized_keys option; bz#2160 * ssh(1): Add a %C escape sequence for LocalCommand and ControlPath that expands to a unique identifer based on a hash of the tuple of (local host, remote user, hostname, port). Helps avoid exceeding miserly pathname limits for Unix domain sockets in multiplexing control paths; bz#2220 * sshd(8): Make the Too many authentication failures message include the user, source address, port and protocol in a format similar to the authentication success / failure messages; bz#2199 * Added unit and fuzz tests for refactored code. These are run automatically in portable OpenSSH via the make tests target. Bugfixes * sshd(8): Fix remote forwarding with the same listen port but different listen address. * ssh(1): Fix inverted test that caused PKCS#11 keys that were explicitly listed in ssh_config or on the commandline not to be preferred. * ssh-keygen(1): Fix bug in KRL generation: multiple consecutive revoked certificate serial number ranges could be serialised to an invalid format. Readers of a broken KRL caused by this bug will fail closed, so no should-have-been-revoked key will be accepted. * ssh(1): Reflect stdio-forward (ssh -W host:port ...) failures in exit status. Previously we were always returning 0; bz#2255 * ssh(1), ssh-keygen(1): Make Ed25519 keys' title fit properly in the randomart border; bz#2247 * ssh-agent(1): Only cleanup agent socket in the main agent process and not in any subprocesses it may have started (e.g. forked askpass). Fixes agent sockets being zapped when askpass processes fatal(); bz#2236 * ssh-add(1): Make stdout line-buffered; saves partial output getting lost when ssh-add fatal()s part-way through (e.g. when listing keys from an agent that supports key types that ssh-add doesn't); bz#2234 * ssh-keygen(1): When hashing or removing hosts, don't choke on @revoked markers and don't remove @cert-authority markers; bz#2241 * ssh(1): Don't fatal when hostname canonicalisation fails and a ProxyCommand is in use; continue and allow the ProxyCommand to connect anyway (e.g. to a host with a name outside the DNS behind a bastion) * scp(1): When copying local-remote fails during read, don't send uninitialised heap to the remote end. * sftp(1): Fix fatal el_insertstr failed errors when tab-completing filenames with a single quote char somewhere in the string; bz#2238 * ssh-keyscan(1): Scan for Ed25519 keys by default. * ssh(1): When using VerifyHostKeyDNS with a DNSSEC resolver, down- convert any certificate keys to plain keys and attempt SSHFP resolution. Prevents a server from skipping SSHFP lookup and forcing a new-hostkey dialog by offering only certificate keys. * sshd(8): Avoid crash at exit via NULL pointer reference; bz#2225 * Fix some strict-alignment errors. Portable OpenSSH * Portable OpenSSH now supports building against libressl-portable. * Portable OpenSSH now
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Sun Oct 19 16:31:47 UTC 2014
Added Files:
src/crypto/external/bsd/openssh/dist: bcrypt_pbkdf.c blf.h blowfish.c
Log Message:
add new files
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssh/dist/bcrypt_pbkdf.c \
src/crypto/external/bsd/openssh/dist/blf.h \
src/crypto/external/bsd/openssh/dist/blowfish.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/crypto/external/bsd/openssh/dist/bcrypt_pbkdf.c
diff -u /dev/null src/crypto/external/bsd/openssh/dist/bcrypt_pbkdf.c:1.1
--- /dev/null Sun Oct 19 12:31:47 2014
+++ src/crypto/external/bsd/openssh/dist/bcrypt_pbkdf.c Sun Oct 19 12:31:47 2014
@@ -0,0 +1,174 @@
+/* $OpenBSD: bcrypt_pbkdf.c,v 1.4 2013/07/29 00:55:53 tedu Exp $ */
+/*
+ * Copyright (c) 2013 Ted Unangst t...@openbsd.org
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include includes.h
+__RCSID($NetBSD: bcrypt_pbkdf.c,v 1.1 2014/10/19 16:31:47 christos Exp $);
+
+#ifndef HAVE_BCRYPT_PBKDF
+
+#include sys/types.h
+#include sys/param.h
+
+#ifdef HAVE_STDLIB_H
+# include stdlib.h
+#endif
+#include string.h
+
+#ifdef HAVE_BLF_H
+# include blf.h
+#endif
+
+#include crypto_api.h
+#include stdio.h
+#include time.h
+#include misc.h
+#define SHA512_DIGEST_LENGTH crypto_hash_sha512_BYTES
+
+/*
+ * pkcs #5 pbkdf2 implementation using the bcrypt hash
+ *
+ * The bcrypt hash function is derived from the bcrypt password hashing
+ * function with the following modifications:
+ * 1. The input password and salt are preprocessed with SHA512.
+ * 2. The output length is expanded to 256 bits.
+ * 3. Subsequently the magic string to be encrypted is lengthened and modifed
+ *to OxychromaticBlowfishSwatDynamite
+ * 4. The hash function is defined to perform 64 rounds of initial state
+ *expansion. (More rounds are performed by iterating the hash.)
+ *
+ * Note that this implementation pulls the SHA512 operations into the caller
+ * as a performance optimization.
+ *
+ * One modification from official pbkdf2. Instead of outputting key material
+ * linearly, we mix it. pbkdf2 has a known weakness where if one uses it to
+ * generate (i.e.) 512 bits of key material for use as two 256 bit keys, an
+ * attacker can merely run once through the outer loop below, but the user
+ * always runs it twice. Shuffling output bytes requires computing the
+ * entirety of the key material to assemble any subkey. This is something a
+ * wise caller could do; we just do it for you.
+ */
+
+#define BCRYPT_BLOCKS 8
+#define BCRYPT_HASHSIZE (BCRYPT_BLOCKS * 4)
+
+static void
+bcrypt_hash(u_int8_t *sha2pass, u_int8_t *sha2salt, u_int8_t *out)
+{
+ blf_ctx state;
+ u_int8_t ciphertext[BCRYPT_HASHSIZE] =
+ OxychromaticBlowfishSwatDynamite;
+ uint32_t cdata[BCRYPT_BLOCKS];
+ int i;
+ uint16_t j;
+ size_t shalen = SHA512_DIGEST_LENGTH;
+
+ /* key expansion */
+ Blowfish_initstate(state);
+ Blowfish_expandstate(state, sha2salt, shalen, sha2pass, shalen);
+ for (i = 0; i 64; i++) {
+ Blowfish_expand0state(state, sha2salt, shalen);
+ Blowfish_expand0state(state, sha2pass, shalen);
+ }
+
+ /* encryption */
+ j = 0;
+ for (i = 0; i BCRYPT_BLOCKS; i++)
+ cdata[i] = Blowfish_stream2word(ciphertext, sizeof(ciphertext),
+ j);
+ for (i = 0; i 64; i++)
+ blf_enc(state, cdata, sizeof(cdata) / sizeof(uint64_t));
+
+ /* copy out */
+ for (i = 0; i BCRYPT_BLOCKS; i++) {
+ out[4 * i + 3] = (cdata[i] 24) 0xff;
+ out[4 * i + 2] = (cdata[i] 16) 0xff;
+ out[4 * i + 1] = (cdata[i] 8) 0xff;
+ out[4 * i + 0] = cdata[i] 0xff;
+ }
+
+ /* zap */
+ memset(ciphertext, 0, sizeof(ciphertext));
+ memset(cdata, 0, sizeof(cdata));
+ memset(state, 0, sizeof(state));
+}
+
+int
+bcrypt_pbkdf(const char *pass, size_t passlen, const u_int8_t *salt, size_t saltlen,
+u_int8_t *key, size_t keylen, unsigned int rounds)
+{
+ u_int8_t sha2pass[SHA512_DIGEST_LENGTH];
+ u_int8_t sha2salt[SHA512_DIGEST_LENGTH];
+ u_int8_t out[BCRYPT_HASHSIZE];
+ u_int8_t tmpout[BCRYPT_HASHSIZE];
+ u_int8_t *countsalt;
+ size_t i, j, amt, stride;
+ uint32_t count;
+
+ /* nothing crazy */
+ if (rounds 1)
+ return -1;
+ if (passlen == 0 || saltlen == 0 || keylen == 0 ||
+
CVS commit: src/etc/rc.d
Module Name:src
Committed By: christos
Date: Sun Oct 19 16:33:01 UTC 2014
Modified Files:
src/etc/rc.d: sshd
Log Message:
Add new keytype, replace duplicated code with loop
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/etc/rc.d/sshd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/sshd
diff -u src/etc/rc.d/sshd:1.22 src/etc/rc.d/sshd:1.23
--- src/etc/rc.d/sshd:1.22 Thu Feb 7 14:32:19 2013
+++ src/etc/rc.d/sshd Sun Oct 19 12:33:01 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: sshd,v 1.22 2013/02/07 19:32:19 christos Exp $
+# $NetBSD: sshd,v 1.23 2014/10/19 16:33:01 christos Exp $
#
# PROVIDE: sshd
@@ -17,44 +17,31 @@ extra_commands=keygen reload
sshd_keygen()
{
- (
+(
+ keygen=/usr/bin/ssh-keygen
umask 022
- if [ -f /etc/ssh/ssh_host_key ]; then
- echo You already have an RSA host key \
- in /etc/ssh/ssh_host_key
- echo Skipping protocol version 1 RSA Key Generation
- else
- /usr/bin/ssh-keygen -t rsa1 ${ssh_keygen_flags} \
- -f /etc/ssh/ssh_host_key -N ''
- fi
-
- if [ -f /etc/ssh/ssh_host_dsa_key ]; then
- echo You already have a DSA host key \
- in /etc/ssh/ssh_host_dsa_key
- echo Skipping protocol version 2 DSA Key Generation
- else
- /usr/bin/ssh-keygen -t dsa -b 1024 \
- -f /etc/ssh/ssh_host_dsa_key -N ''
- fi
-
- if [ -f /etc/ssh/ssh_host_ecdsa_key ]; then
- echo You already have a ECDSA host key \
- in /etc/ssh/ssh_host_ecdsa_key
- echo Skipping protocol version 1 ECDSA Key Generation
- else
- /usr/bin/ssh-keygen -t ecdsa -b 521 \
- -f /etc/ssh/ssh_host_ecdsa_key -N ''
- fi
-
- if [ -f /etc/ssh/ssh_host_rsa_key ]; then
- echo You already have a RSA host key \
- in /etc/ssh/ssh_host_rsa_key
- echo Skipping protocol version 2 RSA Key Generation
- else
- /usr/bin/ssh-keygen -t rsa ${ssh_keygen_flags} \
- -f /etc/ssh/ssh_host_rsa_key -N ''
- fi
- )
+ while read type bits filename version name; do
+ f=/etc/ssh/$filename
+ if [ -f $f ]; then
+ echo You already have an $name host key in $f
+ echo Skipping protocol version $version $name \
+ Key Generation
+ else
+ case ${bits} in
+ -1) bitarg=;;
+ 0) bitarg=${ssh_keygen_flags};;
+ *) bitarg=-b ${bits};;
+ esac
+ ${keygen} -t ${type} ${bitarg} -f ${f} -N ''
+ fi
+ done _EOF
+rsa1 0 ssh_host_key 1 RSA
+dsa 1024 ssh_host_dsa_key 2 DSA
+ecdsa 521 ssh_host_ecdsa_key 1 ECDSA
+ed25519 -1 ssh_host_ed25519_key 1 ED25519
+rsa 0 ssh_host_rsa_key 2 RSA
+_EOF
+)
}
sshd_precmd()
@@ -62,6 +49,7 @@ sshd_precmd()
if [ ! -f /etc/ssh/ssh_host_key -o \
! -f /etc/ssh/ssh_host_dsa_key -o \
! -f /etc/ssh/ssh_host_ecdsa_key -o \
+ ! -f /etc/ssh/ssh_host_ed25519_key -o \
! -f /etc/ssh/ssh_host_rsa_key ]; then
run_rc_command keygen
fi
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sun Oct 19 16:38:21 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new OpenSSH To generate a diff of this commit: cvs rdiff -u -r1.1159 -r1.1160 src/doc/3RDPARTY cvs rdiff -u -r1.1993 -r1.1994 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1159 src/doc/3RDPARTY:1.1160 --- src/doc/3RDPARTY:1.1159 Fri Oct 17 19:56:47 2014 +++ src/doc/3RDPARTY Sun Oct 19 12:38:21 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1159 2014/10/17 23:56:47 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1160 2014/10/19 16:38:21 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -971,8 +971,8 @@ Notes: Patch applied after OpenSSH import. Package: OpenSSH -Version: 6.4 -Current Vers: 6.4 / portable 6.4p1 +Version: 6.7 +Current Vers: 6.7 / portable 6.7p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Home Page: http://www.openssh.com/portable.html Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1993 src/doc/CHANGES:1.1994 --- src/doc/CHANGES:1.1993 Fri Oct 17 19:56:47 2014 +++ src/doc/CHANGES Sun Oct 19 12:38:21 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1993 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1994 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -62,3 +62,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: file(1): Upgraded to 5.20. [christos 20141010] wpa: Import wpa_supplicant and hostapd 2.3. [christos 20141016] dhcpcd(8): Import dhcpcd-6.5.1. [roy 20141018] + OpenSSH: Imported 6.7. [christos 20141018]
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sun Oct 19 16:35:09 UTC 2014 Modified Files: src/distrib/sets/lists/base: ad.aarch64 ad.arm ad.mips ad.powerpc ad.riscv md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/debug: ad.aarch64 ad.arm ad.mips ad.powerpc ad.riscv md.amd64 md.sparc64 shl.mi Log Message: bump libssh To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/base/ad.aarch64 cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/base/ad.powerpc cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/base/ad.riscv cvs rdiff -u -r1.250 -r1.251 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.238 -r1.239 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.719 -r1.720 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/debug/ad.aarch64 cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug/ad.riscv cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.aarch64 diff -u src/distrib/sets/lists/base/ad.aarch64:1.10 src/distrib/sets/lists/base/ad.aarch64:1.11 --- src/distrib/sets/lists/base/ad.aarch64:1.10 Sun Oct 12 20:46:28 2014 +++ src/distrib/sets/lists/base/ad.aarch64 Sun Oct 19 12:35:09 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.10 2014/10/13 00:46:28 christos Exp $ +# $NetBSD: ad.aarch64,v 1.11 2014/10/19 16:35:09 christos Exp $ ./lib/eabi base-compat-shlib compat ./lib/eabi/npf base-npf-shlib compat ./lib/eabi/npf/ext_log.so base-npf-shlib compat,pic @@ -293,8 +293,8 @@ ./usr/lib/eabi/libsl.so.5.0 base-compat-shlib compat,pic,kerberos ./usr/lib/eabi/libsqlite3.so.1 base-compat-shlib compat,pic ./usr/lib/eabi/libsqlite3.so.1.2 base-compat-shlib compat,pic -./usr/lib/eabi/libssh.so.22 base-compat-shlib compat,pic,crypto -./usr/lib/eabi/libssh.so.22.0 base-compat-shlib compat,pic,crypto +./usr/lib/eabi/libssh.so.23 base-compat-shlib compat,pic,crypto +./usr/lib/eabi/libssh.so.23.0 base-compat-shlib compat,pic,crypto ./usr/lib/eabi/libssl.so.10 base-compat-shlib compat,pic,crypto ./usr/lib/eabi/libssl.so.10.4 base-compat-shlib compat,pic,crypto ./usr/lib/eabi/libstdc++.so.7 base-compat-shlib compat,pic,cxx,gcccmds,libstdcxx @@ -607,8 +607,8 @@ ./usr/lib/eabihf/libsl.so.5.0 base-compat-shlib compat,pic,kerberos ./usr/lib/eabihf/libsqlite3.so.1 base-compat-shlib compat,pic ./usr/lib/eabihf/libsqlite3.so.1.2 base-compat-shlib compat,pic -./usr/lib/eabihf/libssh.so.22 base-compat-shlib compat,pic,crypto -./usr/lib/eabihf/libssh.so.22.0 base-compat-shlib compat,pic,crypto +./usr/lib/eabihf/libssh.so.23 base-compat-shlib compat,pic,crypto +./usr/lib/eabihf/libssh.so.23.0 base-compat-shlib compat,pic,crypto ./usr/lib/eabihf/libssl.so.10 base-compat-shlib compat,pic,crypto ./usr/lib/eabihf/libssl.so.10.4 base-compat-shlib compat,pic,crypto ./usr/lib/eabihf/libstdc++.so.7 base-compat-shlib compat,pic,cxx,gcccmds,libstdcxx @@ -919,8 +919,8 @@ ./usr/lib/oabi/libsl.so.5.0 base-compat-shlib compat,pic,kerberos ./usr/lib/oabi/libsqlite3.so.1 base-compat-shlib compat,pic ./usr/lib/oabi/libsqlite3.so.1.2 base-compat-shlib compat,pic -./usr/lib/oabi/libssh.so.22 base-compat-shlib compat,pic,crypto -./usr/lib/oabi/libssh.so.22.0 base-compat-shlib compat,pic,crypto +./usr/lib/oabi/libssh.so.23 base-compat-shlib compat,pic,crypto +./usr/lib/oabi/libssh.so.23.0 base-compat-shlib compat,pic,crypto ./usr/lib/oabi/libssl.so.10 base-compat-shlib compat,pic,crypto ./usr/lib/oabi/libssl.so.10.4 base-compat-shlib compat,pic,crypto ./usr/lib/oabi/libstdc++.so.7 base-compat-shlib compat,pic,cxx,gcccmds,libstdcxx Index: src/distrib/sets/lists/base/ad.arm diff -u src/distrib/sets/lists/base/ad.arm:1.59 src/distrib/sets/lists/base/ad.arm:1.60 --- src/distrib/sets/lists/base/ad.arm:1.59 Sun Oct 12 20:46:28 2014 +++ src/distrib/sets/lists/base/ad.arm Sun Oct 19 12:35:09 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.59 2014/10/13 00:46:28 christos Exp $ +# $NetBSD: ad.arm,v 1.60 2014/10/19 16:35:09 christos Exp $ ./lib/oabi base-compat-shlib compat ./lib/oabi/npf base-npf-shlib compat ./lib/oabi/npf/ext_log.so base-npf-shlib compat,pic @@ -300,8 +300,8 @@ ./usr/lib/oabi/libsqlite3.so.1.2 base-compat-shlib compat,pic ./usr/lib/oabi/libss.so.6 base-compat-shlib obsolete
CVS commit: src/lib/libc/gen
Module Name:src Committed By: njoly Date: Sun Oct 19 16:47:51 UTC 2014 Modified Files: src/lib/libc/gen: utime.3 Log Message: Do not use hard-coded values with ENAMETOOLONG, use symbolic constants instead. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/lib/libc/gen/utime.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/utime.3 diff -u src/lib/libc/gen/utime.3:1.21 src/lib/libc/gen/utime.3:1.22 --- src/lib/libc/gen/utime.3:1.21 Thu Apr 29 17:07:00 2010 +++ src/lib/libc/gen/utime.3 Sun Oct 19 16:47:51 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: utime.3,v 1.21 2010/04/29 17:07:00 jruoho Exp $ +.\ $NetBSD: utime.3,v 1.22 2014/10/19 16:47:51 njoly Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -111,8 +111,12 @@ An I/O error occurred while reading or w .It Bq Er ELOOP Too many symbolic links were encountered in translating the pathname. .It Bq Er ENAMETOOLONG -A component of a pathname exceeded 255 characters, -or an entire path name exceeded 1023 characters. +A component of a pathname exceeded +.Brq Dv NAME_MAX +characters, +or an entire path name exceeded +.Brq Dv PATH_MAX +characters. .It Bq Er ENOENT The named file does not exist. .It Bq Er ENOTDIR
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: jmcneill
Date: Sun Oct 19 17:01:40 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_gige.c
Log Message:
use correct gating reg on A31
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/allwinner/awin_gige.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_gige.c
diff -u src/sys/arch/arm/allwinner/awin_gige.c:1.14 src/sys/arch/arm/allwinner/awin_gige.c:1.15
--- src/sys/arch/arm/allwinner/awin_gige.c:1.14 Sun Oct 19 16:09:28 2014
+++ src/sys/arch/arm/allwinner/awin_gige.c Sun Oct 19 17:01:40 2014
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_gige.c,v 1.14 2014/10/19 16:09:28 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_gige.c,v 1.15 2014/10/19 17:01:40 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -146,8 +146,13 @@ awin_gige_attach(device_t parent, device
/*
* Enable GMAC clock
*/
- awin_reg_set_clear(aio-aio_core_bst, aio-aio_ccm_bsh,
- AWIN_AHB_GATING1_REG, AWIN_AHB_GATING1_GMAC, 0);
+ if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+ awin_reg_set_clear(aio-aio_core_bst, aio-aio_ccm_bsh,
+ AWIN_AHB_GATING0_REG, AWIN_A31_AHB_GATING0_GMAC, 0);
+ } else {
+ awin_reg_set_clear(aio-aio_core_bst, aio-aio_ccm_bsh,
+ AWIN_AHB_GATING1_REG, AWIN_AHB_GATING1_GMAC, 0);
+ }
/*
* Soft reset
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: maxv
Date: Sun Oct 19 17:33:59 UTC 2014
Modified Files:
src/sys/compat/linux/common: linux_uselib.c
Log Message:
Resource leak.
Found by my code scanner.
Tested by njoly@; ok njoly@ rmind@ on tech-kern@.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/compat/linux/common/linux_uselib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_uselib.c
diff -u src/sys/compat/linux/common/linux_uselib.c:1.30 src/sys/compat/linux/common/linux_uselib.c:1.31
--- src/sys/compat/linux/common/linux_uselib.c:1.30 Fri Aug 28 01:39:03 2009
+++ src/sys/compat/linux/common/linux_uselib.c Sun Oct 19 17:33:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_uselib.c,v 1.30 2009/08/28 01:39:03 dholland Exp $ */
+/* $NetBSD: linux_uselib.c,v 1.31 2014/10/19 17:33:58 maxv Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_uselib.c,v 1.30 2009/08/28 01:39:03 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_uselib.c,v 1.31 2014/10/19 17:33:58 maxv Exp $);
#include sys/param.h
#include sys/systm.h
@@ -103,17 +103,18 @@ linux_sys_uselib(struct lwp *l, const st
if ((error = vn_rdwr(UIO_READ, vp, (void *) hdr, LINUX_AOUT_HDR_SIZE,
0, UIO_SYSSPACE, IO_NODELOCKED, l-l_cred,
rem, NULL))) {
- vrele(vp);
- return error;
+ goto out;
}
if (rem != 0) {
- vrele(vp);
- return ENOEXEC;
+ error = ENOEXEC;
+ goto out;
}
- if (LINUX_N_MACHTYPE(hdr) != LINUX_MID_MACHINE)
- return ENOEXEC;
+ if (LINUX_N_MACHTYPE(hdr) != LINUX_MID_MACHINE) {
+ error = ENOEXEC;
+ goto out;
+ }
magic = LINUX_N_MAGIC(hdr);
taddr = hdr.a_entry (~(PAGE_SIZE - 1));
@@ -123,7 +124,7 @@ linux_sys_uselib(struct lwp *l, const st
error = vn_marktext(vp);
if (error)
- return (error);
+ goto out;
vcset.evs_cnt = 0;
vcset.evs_used = 0;
@@ -150,7 +151,7 @@ linux_sys_uselib(struct lwp *l, const st
kill_vmcmds(vcset);
+out:
vrele(vp);
-
return error;
}
CVS commit: [netbsd-6-0] src/sys/compat/freebsd
Module Name:src Committed By: snj Date: Sun Oct 19 19:36:59 UTC 2014 Modified Files: src/sys/compat/freebsd [netbsd-6-0]: freebsd_sysctl.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1168): sys/compat/freebsd/freebsd_sysctl.c: revision 1.17 I'm not sure reading from an unsanitized userland pointer is a good idea. Some users might be tempted to give 0x01, in which case the kernel will crash. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.15.28.1 src/sys/compat/freebsd/freebsd_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/freebsd/freebsd_sysctl.c diff -u src/sys/compat/freebsd/freebsd_sysctl.c:1.15 src/sys/compat/freebsd/freebsd_sysctl.c:1.15.28.1 --- src/sys/compat/freebsd/freebsd_sysctl.c:1.15 Wed Nov 19 18:36:02 2008 +++ src/sys/compat/freebsd/freebsd_sysctl.c Sun Oct 19 19:36:59 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_sysctl.c,v 1.15 2008/11/19 18:36:02 ad Exp $ */ +/* $NetBSD: freebsd_sysctl.c,v 1.15.28.1 2014/10/19 19:36:59 snj Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: freebsd_sysctl.c,v 1.15 2008/11/19 18:36:02 ad Exp $); +__KERNEL_RCSID(0, $NetBSD: freebsd_sysctl.c,v 1.15.28.1 2014/10/19 19:36:59 snj Exp $); #include sys/param.h #include sys/systm.h @@ -95,7 +95,7 @@ freebsd_sys_sysctl(struct lwp *l, const } */ int error; int name[CTL_MAXNAME]; - size_t newlen, *oldlenp; + size_t newlen, *oldlenp, oldlen; u_int namelen; void *new, *old; @@ -146,9 +146,14 @@ freebsd_sys_sysctl(struct lwp *l, const old = SCARG(uap, old); oldlenp = SCARG(uap, oldlenp); - if (old == NULL || oldlenp == NULL || *oldlenp sizeof(int)) + if (old == NULL || oldlenp == NULL) return(EINVAL); + if ((error = copyin(oldlenp, oldlen, sizeof(oldlen + return (error); + if (oldlen sizeof(int)) + return (EINVAL); + if ((locnew = (char *) malloc(newlen + 1, M_TEMP, M_WAITOK)) == NULL) return(ENOMEM); @@ -168,11 +173,11 @@ freebsd_sys_sysctl(struct lwp *l, const oidlen *= sizeof(int); error = copyout(oid, SCARG(uap, old), -MIN(oidlen, *SCARG(uap, oldlenp))); +MIN(oidlen, oldlen)); if (error) return(error); ktrmibio(-1, UIO_READ, SCARG(uap, old), - MIN(oidlen, *SCARG(uap, oldlenp)), 0); + MIN(oidlen, oldlen), 0); error = copyout(oidlen, SCARG(uap, oldlenp), sizeof(u_int));
CVS commit: [netbsd-6-1] src/sys/compat/freebsd
Module Name:src Committed By: snj Date: Sun Oct 19 19:40:55 UTC 2014 Modified Files: src/sys/compat/freebsd [netbsd-6-1]: freebsd_sysctl.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1168): sys/compat/freebsd/freebsd_sysctl.c: revision 1.17 I'm not sure reading from an unsanitized userland pointer is a good idea. Some users might be tempted to give 0x01, in which case the kernel will crash. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.15.36.1 src/sys/compat/freebsd/freebsd_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/freebsd/freebsd_sysctl.c diff -u src/sys/compat/freebsd/freebsd_sysctl.c:1.15 src/sys/compat/freebsd/freebsd_sysctl.c:1.15.36.1 --- src/sys/compat/freebsd/freebsd_sysctl.c:1.15 Wed Nov 19 18:36:02 2008 +++ src/sys/compat/freebsd/freebsd_sysctl.c Sun Oct 19 19:40:55 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_sysctl.c,v 1.15 2008/11/19 18:36:02 ad Exp $ */ +/* $NetBSD: freebsd_sysctl.c,v 1.15.36.1 2014/10/19 19:40:55 snj Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: freebsd_sysctl.c,v 1.15 2008/11/19 18:36:02 ad Exp $); +__KERNEL_RCSID(0, $NetBSD: freebsd_sysctl.c,v 1.15.36.1 2014/10/19 19:40:55 snj Exp $); #include sys/param.h #include sys/systm.h @@ -95,7 +95,7 @@ freebsd_sys_sysctl(struct lwp *l, const } */ int error; int name[CTL_MAXNAME]; - size_t newlen, *oldlenp; + size_t newlen, *oldlenp, oldlen; u_int namelen; void *new, *old; @@ -146,9 +146,14 @@ freebsd_sys_sysctl(struct lwp *l, const old = SCARG(uap, old); oldlenp = SCARG(uap, oldlenp); - if (old == NULL || oldlenp == NULL || *oldlenp sizeof(int)) + if (old == NULL || oldlenp == NULL) return(EINVAL); + if ((error = copyin(oldlenp, oldlen, sizeof(oldlen + return (error); + if (oldlen sizeof(int)) + return (EINVAL); + if ((locnew = (char *) malloc(newlen + 1, M_TEMP, M_WAITOK)) == NULL) return(ENOMEM); @@ -168,11 +173,11 @@ freebsd_sys_sysctl(struct lwp *l, const oidlen *= sizeof(int); error = copyout(oid, SCARG(uap, old), -MIN(oidlen, *SCARG(uap, oldlenp))); +MIN(oidlen, oldlen)); if (error) return(error); ktrmibio(-1, UIO_READ, SCARG(uap, old), - MIN(oidlen, *SCARG(uap, oldlenp)), 0); + MIN(oidlen, oldlen), 0); error = copyout(oidlen, SCARG(uap, oldlenp), sizeof(u_int));
CVS commit: [netbsd-6] src/sys/compat/freebsd
Module Name:src Committed By: snj Date: Sun Oct 19 19:42:01 UTC 2014 Modified Files: src/sys/compat/freebsd [netbsd-6]: freebsd_sysctl.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1168): sys/compat/freebsd/freebsd_sysctl.c: revision 1.17 I'm not sure reading from an unsanitized userland pointer is a good idea. Some users might be tempted to give 0x01, in which case the kernel will crash. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.15.22.1 src/sys/compat/freebsd/freebsd_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/freebsd/freebsd_sysctl.c diff -u src/sys/compat/freebsd/freebsd_sysctl.c:1.15 src/sys/compat/freebsd/freebsd_sysctl.c:1.15.22.1 --- src/sys/compat/freebsd/freebsd_sysctl.c:1.15 Wed Nov 19 18:36:02 2008 +++ src/sys/compat/freebsd/freebsd_sysctl.c Sun Oct 19 19:42:01 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_sysctl.c,v 1.15 2008/11/19 18:36:02 ad Exp $ */ +/* $NetBSD: freebsd_sysctl.c,v 1.15.22.1 2014/10/19 19:42:01 snj Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: freebsd_sysctl.c,v 1.15 2008/11/19 18:36:02 ad Exp $); +__KERNEL_RCSID(0, $NetBSD: freebsd_sysctl.c,v 1.15.22.1 2014/10/19 19:42:01 snj Exp $); #include sys/param.h #include sys/systm.h @@ -95,7 +95,7 @@ freebsd_sys_sysctl(struct lwp *l, const } */ int error; int name[CTL_MAXNAME]; - size_t newlen, *oldlenp; + size_t newlen, *oldlenp, oldlen; u_int namelen; void *new, *old; @@ -146,9 +146,14 @@ freebsd_sys_sysctl(struct lwp *l, const old = SCARG(uap, old); oldlenp = SCARG(uap, oldlenp); - if (old == NULL || oldlenp == NULL || *oldlenp sizeof(int)) + if (old == NULL || oldlenp == NULL) return(EINVAL); + if ((error = copyin(oldlenp, oldlen, sizeof(oldlen + return (error); + if (oldlen sizeof(int)) + return (EINVAL); + if ((locnew = (char *) malloc(newlen + 1, M_TEMP, M_WAITOK)) == NULL) return(ENOMEM); @@ -168,11 +173,11 @@ freebsd_sys_sysctl(struct lwp *l, const oidlen *= sizeof(int); error = copyout(oid, SCARG(uap, old), -MIN(oidlen, *SCARG(uap, oldlenp))); +MIN(oidlen, oldlen)); if (error) return(error); ktrmibio(-1, UIO_READ, SCARG(uap, old), - MIN(oidlen, *SCARG(uap, oldlenp)), 0); + MIN(oidlen, oldlen), 0); error = copyout(oidlen, SCARG(uap, oldlenp), sizeof(u_int));
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: snj Date: Sun Oct 19 19:46:56 UTC 2014 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: ticket 1168 To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/doc/CHANGES-6.0.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.7 diff -u src/doc/CHANGES-6.0.7:1.1.2.1 src/doc/CHANGES-6.0.7:1.1.2.2 --- src/doc/CHANGES-6.0.7:1.1.2.1 Mon Sep 29 18:48:10 2014 +++ src/doc/CHANGES-6.0.7 Sun Oct 19 19:46:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.7,v 1.1.2.1 2014/09/29 18:48:10 snj Exp $ +# $NetBSD: CHANGES-6.0.7,v 1.1.2.2 2014/10/19 19:46:56 snj Exp $ A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7 release: @@ -8,6 +8,12 @@ doc/README.filespatched by hand gnu/usr.bin/groff/tmac/mdoc.local patched by hand sys/sys/param.h patched by hand - Welcome to 6.0.5_PATCH. + Welcome to 6.0.6_PATCH. [snj] +sys/compat/freebsd/freebsd_sysctl.c 1.17 + + Do not access a userland pointer from kernel space directly, use +copyin() instead, avoiding a crash. + [maxv, ticket #1168] +
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: snj Date: Sun Oct 19 19:46:44 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: ticket 1168 To generate a diff of this commit: cvs rdiff -u -r1.1.2.135 -r1.1.2.136 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.135 src/doc/CHANGES-6.2:1.1.2.136 --- src/doc/CHANGES-6.2:1.1.2.135 Tue Sep 30 00:30:00 2014 +++ src/doc/CHANGES-6.2 Sun Oct 19 19:46:44 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.135 2014/09/30 00:30:00 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.136 2014/10/19 19:46:44 snj Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -3815,3 +3815,10 @@ share/man/man9/iic.91.10 Correct return type of iic_release_bus. [riastradh, ticket #1130] + +sys/compat/freebsd/freebsd_sysctl.c 1.17 + + Do not access a userland pointer from kernel space directly, use + copyin() instead, avoiding a crash. + [maxv, ticket #1168] +
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: snj Date: Sun Oct 19 19:47:09 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: ticket 1168 To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/doc/CHANGES-6.1.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.6 diff -u src/doc/CHANGES-6.1.6:1.1.2.1 src/doc/CHANGES-6.1.6:1.1.2.2 --- src/doc/CHANGES-6.1.6:1.1.2.1 Mon Sep 29 18:44:42 2014 +++ src/doc/CHANGES-6.1.6 Sun Oct 19 19:47:09 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.1 2014/09/29 18:44:42 snj Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.2 2014/10/19 19:47:09 snj Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -11,3 +11,9 @@ sys/sys/param.h patched by hand Welcome to 6.1.5_PATCH. [snj] +sys/compat/freebsd/freebsd_sysctl.c 1.17 + + Do not access a userland pointer from kernel space directly, use + copyin() instead, avoiding a crash. + [maxv, ticket #1168] +
CVS commit: [netbsd-5] src/crypto/dist/openssl
Module Name:src Committed By: snj Date: Sun Oct 19 20:04:09 UTC 2014 Modified Files: src/crypto/dist/openssl/apps [netbsd-5]: s_client.c src/crypto/dist/openssl/crypto [netbsd-5]: LPdir_vms.c LPdir_win.c Makefile src/crypto/dist/openssl/crypto/bn [netbsd-5]: bn_exp.c exptest.c src/crypto/dist/openssl/crypto/bn/asm [netbsd-5]: x86_64-gcc.c src/crypto/dist/openssl/crypto/dsa [netbsd-5]: dsa_ameth.c src/crypto/dist/openssl/crypto/ec [netbsd-5]: ec.h ec_ameth.c ec_asn1.c ec_key.c ecp_smpl.c src/crypto/dist/openssl/crypto/err [netbsd-5]: openssl.ec src/crypto/dist/openssl/crypto/evp [netbsd-5]: Makefile evp_enc.c src/crypto/dist/openssl/crypto/pkcs7 [netbsd-5]: pkcs7.h src/crypto/dist/openssl/crypto/rsa [netbsd-5]: Makefile rsa.h rsa_err.c rsa_oaep.c rsa_pk1.c rsa_sign.c src/crypto/dist/openssl/doc/apps [netbsd-5]: s_client.pod src/crypto/dist/openssl/doc/crypto [netbsd-5]: BIO_s_accept.pod EVP_DigestInit.pod EVP_DigestVerifyInit.pod EVP_EncryptInit.pod EVP_PKEY_set1_RSA.pod EVP_PKEY_sign.pod src/crypto/dist/openssl/doc/ssl [netbsd-5]: SSL_CTX_set_mode.pod SSL_CTX_set_tmp_dh_callback.pod src/crypto/dist/openssl/ssl [netbsd-5]: Makefile s23_clnt.c s23_srvr.c s2_lib.c s3_clnt.c s3_enc.c s3_lib.c s3_pkt.c s3_srvr.c ssl-lib.com ssl.h ssl3.h ssl_err.c ssl_lib.c t1_enc.c t1_lib.c tls1.h src/crypto/dist/openssl/test [netbsd-5]: Makefile Log Message: Apply patch (requested by spz in ticket #1927): Apply OpenSSL security fixes derived from the diff between OpenSSL 1.0.0n and 1.0.0o, fixing CVE-2014-3567, CVE-2014-3568, and adding POODLE mitigation via support for TLS_FALLBACK_SCSV. To generate a diff of this commit: cvs rdiff -u -r1.1.1.11 -r1.1.1.11.4.1 \ src/crypto/dist/openssl/apps/s_client.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.26.1 \ src/crypto/dist/openssl/crypto/LPdir_vms.c cvs rdiff -u -r1.1.1.2 -r1.1.1.2.4.1 \ src/crypto/dist/openssl/crypto/LPdir_win.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.4.1 src/crypto/dist/openssl/crypto/Makefile cvs rdiff -u -r1.3 -r1.3.4.1 src/crypto/dist/openssl/crypto/bn/bn_exp.c cvs rdiff -u -r1.4 -r1.4.4.1 src/crypto/dist/openssl/crypto/bn/exptest.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.24.1 \ src/crypto/dist/openssl/crypto/bn/asm/x86_64-gcc.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 \ src/crypto/dist/openssl/crypto/dsa/dsa_ameth.c cvs rdiff -u -r1.6 -r1.6.4.1 src/crypto/dist/openssl/crypto/ec/ec.h cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 \ src/crypto/dist/openssl/crypto/ec/ec_ameth.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.18.1 \ src/crypto/dist/openssl/crypto/ec/ec_asn1.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.26.1 \ src/crypto/dist/openssl/crypto/ec/ec_key.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.26.1 \ src/crypto/dist/openssl/crypto/ec/ecp_smpl.c cvs rdiff -u -r1.1.1.7 -r1.1.1.7.4.1 \ src/crypto/dist/openssl/crypto/err/openssl.ec cvs rdiff -u -r1.1.1.5 -r1.1.1.5.4.1 \ src/crypto/dist/openssl/crypto/evp/Makefile cvs rdiff -u -r1.1.1.8 -r1.1.1.8.18.1 \ src/crypto/dist/openssl/crypto/evp/evp_enc.c cvs rdiff -u -r1.8 -r1.8.4.1 src/crypto/dist/openssl/crypto/pkcs7/pkcs7.h cvs rdiff -u -r1.1.1.4 -r1.1.1.4.4.1 \ src/crypto/dist/openssl/crypto/rsa/Makefile cvs rdiff -u -r1.14 -r1.14.4.1 src/crypto/dist/openssl/crypto/rsa/rsa.h cvs rdiff -u -r1.7 -r1.7.4.1 src/crypto/dist/openssl/crypto/rsa/rsa_err.c cvs rdiff -u -r1.1.1.7 -r1.1.1.7.26.1 \ src/crypto/dist/openssl/crypto/rsa/rsa_oaep.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.38.1 \ src/crypto/dist/openssl/crypto/rsa/rsa_pk1.c cvs rdiff -u -r1.5 -r1.5.4.1 src/crypto/dist/openssl/crypto/rsa/rsa_sign.c cvs rdiff -u -r1.8 -r1.8.4.1 src/crypto/dist/openssl/doc/apps/s_client.pod cvs rdiff -u -r1.1.1.2 -r1.1.1.2.38.1 \ src/crypto/dist/openssl/doc/crypto/BIO_s_accept.pod cvs rdiff -u -r1.6 -r1.6.26.1 \ src/crypto/dist/openssl/doc/crypto/EVP_DigestInit.pod \ src/crypto/dist/openssl/doc/crypto/EVP_EncryptInit.pod cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 \ src/crypto/dist/openssl/doc/crypto/EVP_DigestVerifyInit.pod \ src/crypto/dist/openssl/doc/crypto/EVP_PKEY_sign.pod cvs rdiff -u -r1.1.1.1 -r1.1.1.1.38.1 \ src/crypto/dist/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod cvs rdiff -u -r1.1.1.2 -r1.1.1.2.38.1 \ src/crypto/dist/openssl/doc/ssl/SSL_CTX_set_mode.pod cvs rdiff -u -r1.1.1.1 -r1.1.1.1.38.1 \ src/crypto/dist/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod cvs rdiff -u -r1.3 -r1.3.4.1 src/crypto/dist/openssl/ssl/Makefile cvs rdiff -u -r1.1.1.10 -r1.1.1.10.4.1 src/crypto/dist/openssl/ssl/s23_clnt.c cvs rdiff -u -r1.6.4.1 -r1.6.4.2 src/crypto/dist/openssl/ssl/s23_srvr.c cvs rdiff -u -r1.12 -r1.12.4.1 src/crypto/dist/openssl/ssl/s2_lib.c cvs rdiff -u -r1.12.4.5 -r1.12.4.6 src/crypto/dist/openssl/ssl/s3_clnt.c cvs rdiff -u -r1.1.1.12.4.2 -r1.1.1.12.4.3 \
CVS commit: [netbsd-5] src/crypto/dist/openssl
Module Name:src
Committed By: snj
Date: Sun Oct 19 20:05:07 UTC 2014
Added Files:
src/crypto/dist/openssl/crypto [netbsd-5]: constant_time_locl.h
constant_time_test.c
src/crypto/dist/openssl/doc/crypto [netbsd-5]: CMS_add1_signer.pod
src/crypto/dist/openssl/test [netbsd-5]: constant_time_test.c
Log Message:
Apply patch (requested by spz in ticket #1927):
Apply OpenSSL security fixes derived from the diff between
OpenSSL 1.0.0n and 1.0.0o, fixing CVE-2014-3567, CVE-2014-3568,
and adding POODLE mitigation via support for TLS_FALLBACK_SCSV.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 \
src/crypto/dist/openssl/crypto/constant_time_locl.h \
src/crypto/dist/openssl/crypto/constant_time_test.c
cvs rdiff -u -r0 -r1.1.2.1 \
src/crypto/dist/openssl/doc/crypto/CMS_add1_signer.pod
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/dist/openssl/test/constant_time_test.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/crypto/dist/openssl/crypto/constant_time_locl.h
diff -u /dev/null src/crypto/dist/openssl/crypto/constant_time_locl.h:1.1.2.1
--- /dev/null Sun Oct 19 20:05:07 2014
+++ src/crypto/dist/openssl/crypto/constant_time_locl.h Sun Oct 19 20:05:07 2014
@@ -0,0 +1,216 @@
+/* crypto/constant_time_locl.h */
+/*
+ * Utilities for constant-time cryptography.
+ *
+ * Author: Emilia Kasper (emi...@openssl.org)
+ * Based on previous work by Bodo Moeller, Emilia Kasper, Adam Langley
+ * (Google).
+ *
+ * Copyright (c) 2014 The OpenSSL Project. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *must display the following acknowledgement:
+ *This product includes cryptographic software written by
+ * Eric Young (e...@cryptsoft.com)
+ *The word 'cryptographic' can be left out if the rouines from the library
+ *being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *the apps directory (application code) you must include an acknowledgement:
+ *This product includes software written by Tim Hudson (t...@cryptsoft.com)
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed. i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#ifndef HEADER_CONSTANT_TIME_LOCL_H
+#define HEADER_CONSTANT_TIME_LOCL_H
+
+#include e_os.h /* For 'inline' */
+
+#ifdef __cplusplus
+extern C {
+#endif
+
+/*
+ * The boolean methods return a bitmask of all ones (0xff...f) for true
+ * and 0 for false. This is useful for choosing a value based on the result
+ * of a conditional in constant time. For example,
+ *
+ * if (a b) {
+ * c = a;
+ * } else {
+ * c = b;
+ * }
+ *
+ * can be written as
+ *
+ * unsigned int lt = constant_time_lt(a, b);
+ * c = constant_time_select(lt, a, b);
+ */
+
+/*
+ * Returns the given value with the MSB copied to all the other
+ * bits. Uses the fact that arithmetic shift shifts-in the sign bit.
+ * However, this is not ensured by the C standard so you may need to
+ * replace this with something else on odd CPUs.
+ */
+static inline unsigned int constant_time_msb(unsigned int a);
+
+/*
+ * Returns 0xff..f if a b and 0 otherwise.
+ */
+static inline unsigned int constant_time_lt(unsigned int a, unsigned int b);
+/* Convenience method for getting an 8-bit mask. */
+static inline unsigned char constant_time_lt_8(unsigned int a, unsigned
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Sun Oct 19 20:09:14 UTC 2014 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: 1927 To generate a diff of this commit: cvs rdiff -u -r1.1.2.71 -r1.1.2.72 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.71 src/doc/CHANGES-5.3:1.1.2.72 --- src/doc/CHANGES-5.3:1.1.2.71 Wed Sep 3 02:16:50 2014 +++ src/doc/CHANGES-5.3 Sun Oct 19 20:09:14 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.71 2014/09/03 02:16:50 msaitoh Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.72 2014/10/19 20:09:14 snj Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -1031,3 +1031,64 @@ UPDATING 1.209 via patch Note shared objects extension change, and stalled files. [tls, ticket #1339] + +crypto/dist/openssl/apps/s_client.c patch +crypto/dist/openssl/crypto/LPdir_vms.c patch +crypto/dist/openssl/crypto/LPdir_win.c patch +crypto/dist/openssl/crypto/Makefile patch +crypto/dist/openssl/crypto/constant_time_locl.h patch +crypto/dist/openssl/crypto/constant_time_test.c patch +crypto/dist/openssl/crypto/bn/bn_exp.c patch +crypto/dist/openssl/crypto/bn/exptest.c patch +crypto/dist/openssl/crypto/bn/asm/x86_64-gcc.c patch +crypto/dist/openssl/crypto/dsa/dsa_ameth.c patch +crypto/dist/openssl/crypto/ec/ec.h patch +crypto/dist/openssl/crypto/ec/ec_ameth.c patch +crypto/dist/openssl/crypto/ec/ec_asn1.c patch +crypto/dist/openssl/crypto/ec/ec_key.c patch +crypto/dist/openssl/crypto/ec/ecp_smpl.c patch +crypto/dist/openssl/crypto/err/openssl.ec patch +crypto/dist/openssl/crypto/evp/Makefile patch +crypto/dist/openssl/crypto/evp/evp_enc.c patch +crypto/dist/openssl/crypto/pkcs7/pkcs7.h patch +crypto/dist/openssl/crypto/rsa/Makefile patch +crypto/dist/openssl/crypto/rsa/rsa.h patch +crypto/dist/openssl/crypto/rsa/rsa_err.c patch +crypto/dist/openssl/crypto/rsa/rsa_oaep.c patch +crypto/dist/openssl/crypto/rsa/rsa_pk1.c patch +crypto/dist/openssl/crypto/rsa/rsa_sign.c patch +crypto/dist/openssl/doc/apps/s_client.pod patch +crypto/dist/openssl/doc/crypto/BIO_s_accept.pod patch +crypto/dist/openssl/doc/crypto/CMS_add1_signer.pod patch +crypto/dist/openssl/doc/crypto/EVP_DigestInit.pod patch +crypto/dist/openssl/doc/crypto/EVP_DigestVerifyInit.pod patch +crypto/dist/openssl/doc/crypto/EVP_EncryptInit.pod patch +crypto/dist/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod patch +crypto/dist/openssl/doc/crypto/EVP_PKEY_sign.pod patch +crypto/dist/openssl/doc/ssl/SSL_CTX_set_mode.pod patch +crypto/dist/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod patch +crypto/dist/openssl/ssl/Makefile patch +crypto/dist/openssl/ssl/s23_clnt.c patch +crypto/dist/openssl/ssl/s23_srvr.c patch +crypto/dist/openssl/ssl/s2_lib.c patch +crypto/dist/openssl/ssl/s3_clnt.c patch +crypto/dist/openssl/ssl/s3_enc.c patch +crypto/dist/openssl/ssl/s3_lib.c patch +crypto/dist/openssl/ssl/s3_pkt.c patch +crypto/dist/openssl/ssl/s3_srvr.c patch +crypto/dist/openssl/ssl/ssl-lib.com patch +crypto/dist/openssl/ssl/ssl.h patch +crypto/dist/openssl/ssl/ssl3.h patch +crypto/dist/openssl/ssl/ssl_err.c patch +crypto/dist/openssl/ssl/ssl_lib.c patch +crypto/dist/openssl/ssl/t1_enc.c patch +crypto/dist/openssl/ssl/t1_lib.c patch +crypto/dist/openssl/ssl/tls1.h patch +crypto/dist/openssl/test/Makefile patch +crypto/dist/openssl/test/constant_time_test.c patch + + OpenSSL security fixes derived from the diff between + OpenSSL 1.0.0n and 1.0.0o, fixing CVE-2014-3567, CVE-2014-3568, + and adding POODLE mitigation via support for TLS_FALLBACK_SCSV. + [spz, ticket #1927] +
CVS commit: [netbsd-5-1] src/crypto/dist/openssl
Module Name:src Committed By: snj Date: Sun Oct 19 20:10:12 UTC 2014 Modified Files: src/crypto/dist/openssl/apps [netbsd-5-1]: s_client.c src/crypto/dist/openssl/crypto [netbsd-5-1]: LPdir_vms.c LPdir_win.c Makefile src/crypto/dist/openssl/crypto/bn [netbsd-5-1]: bn_exp.c exptest.c src/crypto/dist/openssl/crypto/bn/asm [netbsd-5-1]: x86_64-gcc.c src/crypto/dist/openssl/crypto/dsa [netbsd-5-1]: dsa_ameth.c src/crypto/dist/openssl/crypto/ec [netbsd-5-1]: ec.h ec_ameth.c ec_asn1.c ec_key.c ecp_smpl.c src/crypto/dist/openssl/crypto/err [netbsd-5-1]: openssl.ec src/crypto/dist/openssl/crypto/evp [netbsd-5-1]: Makefile evp_enc.c src/crypto/dist/openssl/crypto/pkcs7 [netbsd-5-1]: pkcs7.h src/crypto/dist/openssl/crypto/rsa [netbsd-5-1]: Makefile rsa.h rsa_err.c rsa_oaep.c rsa_pk1.c rsa_sign.c src/crypto/dist/openssl/doc/apps [netbsd-5-1]: s_client.pod src/crypto/dist/openssl/doc/crypto [netbsd-5-1]: BIO_s_accept.pod EVP_DigestInit.pod EVP_DigestVerifyInit.pod EVP_EncryptInit.pod EVP_PKEY_set1_RSA.pod EVP_PKEY_sign.pod src/crypto/dist/openssl/doc/ssl [netbsd-5-1]: SSL_CTX_set_mode.pod SSL_CTX_set_tmp_dh_callback.pod src/crypto/dist/openssl/ssl [netbsd-5-1]: Makefile s23_clnt.c s23_srvr.c s2_lib.c s3_clnt.c s3_enc.c s3_lib.c s3_pkt.c s3_srvr.c ssl-lib.com ssl.h ssl3.h ssl_err.c ssl_lib.c t1_enc.c t1_lib.c tls1.h src/crypto/dist/openssl/test [netbsd-5-1]: Makefile Added Files: src/crypto/dist/openssl/crypto [netbsd-5-1]: constant_time_locl.h constant_time_test.c src/crypto/dist/openssl/doc/crypto [netbsd-5-1]: CMS_add1_signer.pod src/crypto/dist/openssl/test [netbsd-5-1]: constant_time_test.c Log Message: Apply patch (requested by spz in ticket #1927): Apply OpenSSL security fixes derived from the diff between OpenSSL 1.0.0n and 1.0.0o, fixing CVE-2014-3567, CVE-2014-3568, and adding POODLE mitigation via support for TLS_FALLBACK_SCSV. To generate a diff of this commit: cvs rdiff -u -r1.1.1.11 -r1.1.1.11.12.1 \ src/crypto/dist/openssl/apps/s_client.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.34.1 \ src/crypto/dist/openssl/crypto/LPdir_vms.c cvs rdiff -u -r1.1.1.2 -r1.1.1.2.12.1 \ src/crypto/dist/openssl/crypto/LPdir_win.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.12.1 src/crypto/dist/openssl/crypto/Makefile cvs rdiff -u -r0 -r1.1.4.2 \ src/crypto/dist/openssl/crypto/constant_time_locl.h \ src/crypto/dist/openssl/crypto/constant_time_test.c cvs rdiff -u -r1.3 -r1.3.12.1 src/crypto/dist/openssl/crypto/bn/bn_exp.c cvs rdiff -u -r1.4 -r1.4.12.1 src/crypto/dist/openssl/crypto/bn/exptest.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.32.1 \ src/crypto/dist/openssl/crypto/bn/asm/x86_64-gcc.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.16.1 \ src/crypto/dist/openssl/crypto/dsa/dsa_ameth.c cvs rdiff -u -r1.6 -r1.6.12.1 src/crypto/dist/openssl/crypto/ec/ec.h cvs rdiff -u -r1.1.1.1 -r1.1.1.1.16.1 \ src/crypto/dist/openssl/crypto/ec/ec_ameth.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.26.1 \ src/crypto/dist/openssl/crypto/ec/ec_asn1.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.34.1 \ src/crypto/dist/openssl/crypto/ec/ec_key.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.34.1 \ src/crypto/dist/openssl/crypto/ec/ecp_smpl.c cvs rdiff -u -r1.1.1.7 -r1.1.1.7.12.1 \ src/crypto/dist/openssl/crypto/err/openssl.ec cvs rdiff -u -r1.1.1.5 -r1.1.1.5.12.1 \ src/crypto/dist/openssl/crypto/evp/Makefile cvs rdiff -u -r1.1.1.8 -r1.1.1.8.26.1 \ src/crypto/dist/openssl/crypto/evp/evp_enc.c cvs rdiff -u -r1.8 -r1.8.12.1 src/crypto/dist/openssl/crypto/pkcs7/pkcs7.h cvs rdiff -u -r1.1.1.4 -r1.1.1.4.12.1 \ src/crypto/dist/openssl/crypto/rsa/Makefile cvs rdiff -u -r1.14 -r1.14.12.1 src/crypto/dist/openssl/crypto/rsa/rsa.h cvs rdiff -u -r1.7 -r1.7.12.1 src/crypto/dist/openssl/crypto/rsa/rsa_err.c cvs rdiff -u -r1.1.1.7 -r1.1.1.7.34.1 \ src/crypto/dist/openssl/crypto/rsa/rsa_oaep.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.46.1 \ src/crypto/dist/openssl/crypto/rsa/rsa_pk1.c cvs rdiff -u -r1.5 -r1.5.12.1 src/crypto/dist/openssl/crypto/rsa/rsa_sign.c cvs rdiff -u -r1.8 -r1.8.12.1 src/crypto/dist/openssl/doc/apps/s_client.pod cvs rdiff -u -r1.1.1.2 -r1.1.1.2.46.1 \ src/crypto/dist/openssl/doc/crypto/BIO_s_accept.pod cvs rdiff -u -r0 -r1.1.4.2 \ src/crypto/dist/openssl/doc/crypto/CMS_add1_signer.pod cvs rdiff -u -r1.6 -r1.6.34.1 \ src/crypto/dist/openssl/doc/crypto/EVP_DigestInit.pod \ src/crypto/dist/openssl/doc/crypto/EVP_EncryptInit.pod cvs rdiff -u -r1.1.1.1 -r1.1.1.1.16.1 \ src/crypto/dist/openssl/doc/crypto/EVP_DigestVerifyInit.pod \ src/crypto/dist/openssl/doc/crypto/EVP_PKEY_sign.pod cvs rdiff -u -r1.1.1.1 -r1.1.1.1.46.1 \ src/crypto/dist/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod cvs rdiff -u -r1.1.1.2 -r1.1.1.2.46.1 \
CVS commit: [netbsd-5-2] src/crypto/dist/openssl
Module Name:src Committed By: snj Date: Sun Oct 19 20:11:09 UTC 2014 Modified Files: src/crypto/dist/openssl/apps [netbsd-5-2]: s_client.c src/crypto/dist/openssl/crypto [netbsd-5-2]: LPdir_vms.c LPdir_win.c Makefile src/crypto/dist/openssl/crypto/bn [netbsd-5-2]: bn_exp.c exptest.c src/crypto/dist/openssl/crypto/bn/asm [netbsd-5-2]: x86_64-gcc.c src/crypto/dist/openssl/crypto/dsa [netbsd-5-2]: dsa_ameth.c src/crypto/dist/openssl/crypto/ec [netbsd-5-2]: ec.h ec_ameth.c ec_asn1.c ec_key.c ecp_smpl.c src/crypto/dist/openssl/crypto/err [netbsd-5-2]: openssl.ec src/crypto/dist/openssl/crypto/evp [netbsd-5-2]: Makefile evp_enc.c src/crypto/dist/openssl/crypto/pkcs7 [netbsd-5-2]: pkcs7.h src/crypto/dist/openssl/crypto/rsa [netbsd-5-2]: Makefile rsa.h rsa_err.c rsa_oaep.c rsa_pk1.c rsa_sign.c src/crypto/dist/openssl/doc/apps [netbsd-5-2]: s_client.pod src/crypto/dist/openssl/doc/crypto [netbsd-5-2]: BIO_s_accept.pod EVP_DigestInit.pod EVP_DigestVerifyInit.pod EVP_EncryptInit.pod EVP_PKEY_set1_RSA.pod EVP_PKEY_sign.pod src/crypto/dist/openssl/doc/ssl [netbsd-5-2]: SSL_CTX_set_mode.pod SSL_CTX_set_tmp_dh_callback.pod src/crypto/dist/openssl/ssl [netbsd-5-2]: Makefile s23_clnt.c s23_srvr.c s2_lib.c s3_clnt.c s3_enc.c s3_lib.c s3_pkt.c s3_srvr.c ssl-lib.com ssl.h ssl3.h ssl_err.c ssl_lib.c t1_enc.c t1_lib.c tls1.h src/crypto/dist/openssl/test [netbsd-5-2]: Makefile Added Files: src/crypto/dist/openssl/crypto [netbsd-5-2]: constant_time_locl.h constant_time_test.c src/crypto/dist/openssl/doc/crypto [netbsd-5-2]: CMS_add1_signer.pod src/crypto/dist/openssl/test [netbsd-5-2]: constant_time_test.c Log Message: Apply patch (requested by spz in ticket #1927): Apply OpenSSL security fixes derived from the diff between OpenSSL 1.0.0n and 1.0.0o, fixing CVE-2014-3567, CVE-2014-3568, and adding POODLE mitigation via support for TLS_FALLBACK_SCSV. To generate a diff of this commit: cvs rdiff -u -r1.1.1.11 -r1.1.1.11.2.1 \ src/crypto/dist/openssl/apps/s_client.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.38.1 \ src/crypto/dist/openssl/crypto/LPdir_vms.c cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \ src/crypto/dist/openssl/crypto/LPdir_win.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 src/crypto/dist/openssl/crypto/Makefile cvs rdiff -u -r0 -r1.1.6.2 \ src/crypto/dist/openssl/crypto/constant_time_locl.h \ src/crypto/dist/openssl/crypto/constant_time_test.c cvs rdiff -u -r1.3 -r1.3.2.1 src/crypto/dist/openssl/crypto/bn/bn_exp.c cvs rdiff -u -r1.4 -r1.4.2.1 src/crypto/dist/openssl/crypto/bn/exptest.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.36.1 \ src/crypto/dist/openssl/crypto/bn/asm/x86_64-gcc.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \ src/crypto/dist/openssl/crypto/dsa/dsa_ameth.c cvs rdiff -u -r1.6 -r1.6.2.1 src/crypto/dist/openssl/crypto/ec/ec.h cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \ src/crypto/dist/openssl/crypto/ec/ec_ameth.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.30.1 \ src/crypto/dist/openssl/crypto/ec/ec_asn1.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.38.1 \ src/crypto/dist/openssl/crypto/ec/ec_key.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.38.1 \ src/crypto/dist/openssl/crypto/ec/ecp_smpl.c cvs rdiff -u -r1.1.1.7 -r1.1.1.7.2.1 \ src/crypto/dist/openssl/crypto/err/openssl.ec cvs rdiff -u -r1.1.1.5 -r1.1.1.5.2.1 \ src/crypto/dist/openssl/crypto/evp/Makefile cvs rdiff -u -r1.1.1.8 -r1.1.1.8.30.1 \ src/crypto/dist/openssl/crypto/evp/evp_enc.c cvs rdiff -u -r1.8 -r1.8.2.1 src/crypto/dist/openssl/crypto/pkcs7/pkcs7.h cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \ src/crypto/dist/openssl/crypto/rsa/Makefile cvs rdiff -u -r1.14 -r1.14.2.1 src/crypto/dist/openssl/crypto/rsa/rsa.h cvs rdiff -u -r1.7 -r1.7.2.1 src/crypto/dist/openssl/crypto/rsa/rsa_err.c cvs rdiff -u -r1.1.1.7 -r1.1.1.7.38.1 \ src/crypto/dist/openssl/crypto/rsa/rsa_oaep.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.50.1 \ src/crypto/dist/openssl/crypto/rsa/rsa_pk1.c cvs rdiff -u -r1.5 -r1.5.2.1 src/crypto/dist/openssl/crypto/rsa/rsa_sign.c cvs rdiff -u -r1.8 -r1.8.2.1 src/crypto/dist/openssl/doc/apps/s_client.pod cvs rdiff -u -r1.1.1.2 -r1.1.1.2.50.1 \ src/crypto/dist/openssl/doc/crypto/BIO_s_accept.pod cvs rdiff -u -r0 -r1.1.6.2 \ src/crypto/dist/openssl/doc/crypto/CMS_add1_signer.pod cvs rdiff -u -r1.6 -r1.6.38.1 \ src/crypto/dist/openssl/doc/crypto/EVP_DigestInit.pod \ src/crypto/dist/openssl/doc/crypto/EVP_EncryptInit.pod cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \ src/crypto/dist/openssl/doc/crypto/EVP_DigestVerifyInit.pod \ src/crypto/dist/openssl/doc/crypto/EVP_PKEY_sign.pod cvs rdiff -u -r1.1.1.1 -r1.1.1.1.50.1 \ src/crypto/dist/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod cvs rdiff -u -r1.1.1.2 -r1.1.1.2.50.1 \
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: snj Date: Sun Oct 19 20:10:28 UTC 2014 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.5 Log Message: 1927 To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-5.1.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1.5 diff -u src/doc/CHANGES-5.1.5:1.1.2.18 src/doc/CHANGES-5.1.5:1.1.2.19 --- src/doc/CHANGES-5.1.5:1.1.2.18 Wed Aug 27 13:46:54 2014 +++ src/doc/CHANGES-5.1.5 Sun Oct 19 20:10:28 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.5,v 1.1.2.18 2014/08/27 13:46:54 msaitoh Exp $ +# $NetBSD: CHANGES-5.1.5,v 1.1.2.19 2014/10/19 20:10:28 snj Exp $ A complete list of changes from the NetBSD 5.1.4 release to the NetBSD 5.1.5 release: @@ -267,3 +267,64 @@ sys/netinet6/ip6_output.c 1.158 via pa Fix a memory leak in calling setsockopt() on an INET6 socket. [maxv ticket #1920] + +crypto/dist/openssl/apps/s_client.c patch +crypto/dist/openssl/crypto/LPdir_vms.c patch +crypto/dist/openssl/crypto/LPdir_win.c patch +crypto/dist/openssl/crypto/Makefile patch +crypto/dist/openssl/crypto/constant_time_locl.h patch +crypto/dist/openssl/crypto/constant_time_test.c patch +crypto/dist/openssl/crypto/bn/bn_exp.c patch +crypto/dist/openssl/crypto/bn/exptest.c patch +crypto/dist/openssl/crypto/bn/asm/x86_64-gcc.c patch +crypto/dist/openssl/crypto/dsa/dsa_ameth.c patch +crypto/dist/openssl/crypto/ec/ec.h patch +crypto/dist/openssl/crypto/ec/ec_ameth.c patch +crypto/dist/openssl/crypto/ec/ec_asn1.c patch +crypto/dist/openssl/crypto/ec/ec_key.c patch +crypto/dist/openssl/crypto/ec/ecp_smpl.c patch +crypto/dist/openssl/crypto/err/openssl.ec patch +crypto/dist/openssl/crypto/evp/Makefile patch +crypto/dist/openssl/crypto/evp/evp_enc.c patch +crypto/dist/openssl/crypto/pkcs7/pkcs7.h patch +crypto/dist/openssl/crypto/rsa/Makefile patch +crypto/dist/openssl/crypto/rsa/rsa.h patch +crypto/dist/openssl/crypto/rsa/rsa_err.c patch +crypto/dist/openssl/crypto/rsa/rsa_oaep.c patch +crypto/dist/openssl/crypto/rsa/rsa_pk1.c patch +crypto/dist/openssl/crypto/rsa/rsa_sign.c patch +crypto/dist/openssl/doc/apps/s_client.pod patch +crypto/dist/openssl/doc/crypto/BIO_s_accept.pod patch +crypto/dist/openssl/doc/crypto/CMS_add1_signer.pod patch +crypto/dist/openssl/doc/crypto/EVP_DigestInit.pod patch +crypto/dist/openssl/doc/crypto/EVP_DigestVerifyInit.pod patch +crypto/dist/openssl/doc/crypto/EVP_EncryptInit.pod patch +crypto/dist/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod patch +crypto/dist/openssl/doc/crypto/EVP_PKEY_sign.pod patch +crypto/dist/openssl/doc/ssl/SSL_CTX_set_mode.pod patch +crypto/dist/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod patch +crypto/dist/openssl/ssl/Makefile patch +crypto/dist/openssl/ssl/s23_clnt.c patch +crypto/dist/openssl/ssl/s23_srvr.c patch +crypto/dist/openssl/ssl/s2_lib.c patch +crypto/dist/openssl/ssl/s3_clnt.c patch +crypto/dist/openssl/ssl/s3_enc.c patch +crypto/dist/openssl/ssl/s3_lib.c patch +crypto/dist/openssl/ssl/s3_pkt.c patch +crypto/dist/openssl/ssl/s3_srvr.c patch +crypto/dist/openssl/ssl/ssl-lib.com patch +crypto/dist/openssl/ssl/ssl.h patch +crypto/dist/openssl/ssl/ssl3.h patch +crypto/dist/openssl/ssl/ssl_err.c patch +crypto/dist/openssl/ssl/ssl_lib.c patch +crypto/dist/openssl/ssl/t1_enc.c patch +crypto/dist/openssl/ssl/t1_lib.c patch +crypto/dist/openssl/ssl/tls1.h patch +crypto/dist/openssl/test/Makefile patch +crypto/dist/openssl/test/constant_time_test.c patch + + OpenSSL security fixes derived from the diff between + OpenSSL 1.0.0n and 1.0.0o, fixing CVE-2014-3567, CVE-2014-3568, + and adding POODLE mitigation via support for TLS_FALLBACK_SCSV. + [spz, ticket #1927] +
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: snj Date: Sun Oct 19 20:11:59 UTC 2014 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.3 Log Message: 1927 To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-5.2.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2.3 diff -u src/doc/CHANGES-5.2.3:1.1.2.19 src/doc/CHANGES-5.2.3:1.1.2.20 --- src/doc/CHANGES-5.2.3:1.1.2.19 Wed Aug 27 13:46:40 2014 +++ src/doc/CHANGES-5.2.3 Sun Oct 19 20:11:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.3,v 1.1.2.19 2014/08/27 13:46:40 msaitoh Exp $ +# $NetBSD: CHANGES-5.2.3,v 1.1.2.20 2014/10/19 20:11:59 snj Exp $ A complete list of changes from the NetBSD 5.2.2 release to the NetBSD 5.2.3 release: @@ -267,3 +267,64 @@ sys/netinet6/ip6_output.c 1.158 via pa Fix a memory leak in calling setsockopt() on an INET6 socket. [maxv ticket #1920] + +crypto/dist/openssl/apps/s_client.c patch +crypto/dist/openssl/crypto/LPdir_vms.c patch +crypto/dist/openssl/crypto/LPdir_win.c patch +crypto/dist/openssl/crypto/Makefile patch +crypto/dist/openssl/crypto/constant_time_locl.h patch +crypto/dist/openssl/crypto/constant_time_test.c patch +crypto/dist/openssl/crypto/bn/bn_exp.c patch +crypto/dist/openssl/crypto/bn/exptest.c patch +crypto/dist/openssl/crypto/bn/asm/x86_64-gcc.c patch +crypto/dist/openssl/crypto/dsa/dsa_ameth.c patch +crypto/dist/openssl/crypto/ec/ec.h patch +crypto/dist/openssl/crypto/ec/ec_ameth.c patch +crypto/dist/openssl/crypto/ec/ec_asn1.c patch +crypto/dist/openssl/crypto/ec/ec_key.c patch +crypto/dist/openssl/crypto/ec/ecp_smpl.c patch +crypto/dist/openssl/crypto/err/openssl.ec patch +crypto/dist/openssl/crypto/evp/Makefile patch +crypto/dist/openssl/crypto/evp/evp_enc.c patch +crypto/dist/openssl/crypto/pkcs7/pkcs7.h patch +crypto/dist/openssl/crypto/rsa/Makefile patch +crypto/dist/openssl/crypto/rsa/rsa.h patch +crypto/dist/openssl/crypto/rsa/rsa_err.c patch +crypto/dist/openssl/crypto/rsa/rsa_oaep.c patch +crypto/dist/openssl/crypto/rsa/rsa_pk1.c patch +crypto/dist/openssl/crypto/rsa/rsa_sign.c patch +crypto/dist/openssl/doc/apps/s_client.pod patch +crypto/dist/openssl/doc/crypto/BIO_s_accept.pod patch +crypto/dist/openssl/doc/crypto/CMS_add1_signer.pod patch +crypto/dist/openssl/doc/crypto/EVP_DigestInit.pod patch +crypto/dist/openssl/doc/crypto/EVP_DigestVerifyInit.pod patch +crypto/dist/openssl/doc/crypto/EVP_EncryptInit.pod patch +crypto/dist/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod patch +crypto/dist/openssl/doc/crypto/EVP_PKEY_sign.pod patch +crypto/dist/openssl/doc/ssl/SSL_CTX_set_mode.pod patch +crypto/dist/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod patch +crypto/dist/openssl/ssl/Makefile patch +crypto/dist/openssl/ssl/s23_clnt.c patch +crypto/dist/openssl/ssl/s23_srvr.c patch +crypto/dist/openssl/ssl/s2_lib.c patch +crypto/dist/openssl/ssl/s3_clnt.c patch +crypto/dist/openssl/ssl/s3_enc.c patch +crypto/dist/openssl/ssl/s3_lib.c patch +crypto/dist/openssl/ssl/s3_pkt.c patch +crypto/dist/openssl/ssl/s3_srvr.c patch +crypto/dist/openssl/ssl/ssl-lib.com patch +crypto/dist/openssl/ssl/ssl.h patch +crypto/dist/openssl/ssl/ssl3.h patch +crypto/dist/openssl/ssl/ssl_err.c patch +crypto/dist/openssl/ssl/ssl_lib.c patch +crypto/dist/openssl/ssl/t1_enc.c patch +crypto/dist/openssl/ssl/t1_lib.c patch +crypto/dist/openssl/ssl/tls1.h patch +crypto/dist/openssl/test/Makefile patch +crypto/dist/openssl/test/constant_time_test.c patch + + OpenSSL security fixes derived from the diff between + OpenSSL 1.0.0n and 1.0.0o, fixing CVE-2014-3567, CVE-2014-3568, + and adding POODLE mitigation via support for TLS_FALLBACK_SCSV. + [spz, ticket #1927] +
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: jmcneill
Date: Sun Oct 19 22:31:33 UTC 2014
Modified Files:
src/sys/dev/ic: dwc_gmac.c
Log Message:
if we read an insane mac address from the chip, dont attach
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/dwc_gmac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.13 src/sys/dev/ic/dwc_gmac.c:1.14
--- src/sys/dev/ic/dwc_gmac.c:1.13 Sun Oct 19 13:15:23 2014
+++ src/sys/dev/ic/dwc_gmac.c Sun Oct 19 22:31:33 2014
@@ -39,7 +39,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.13 2014/10/19 13:15:23 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.14 2014/10/19 22:31:33 jmcneill Exp $);
/* #define DWC_GMAC_DEBUG 1 */
@@ -153,6 +153,13 @@ dwc_gmac_attach(struct dwc_gmac_softc *s
AWIN_GMAC_MAC_ADDR0LO);
machi = bus_space_read_4(sc-sc_bst, sc-sc_bsh,
AWIN_GMAC_MAC_ADDR0HI);
+
+ if (maclo == 0x (machi 0x) == 0x) {
+ aprint_error_dev(sc-sc_dev,
+ couldn't read MAC address\n);
+ return;
+ }
+
enaddr[0] = maclo 0x0ff;
enaddr[1] = (maclo 8) 0x0ff;
enaddr[2] = (maclo 16) 0x0ff;
CVS commit: src/sys/arch/evbarm/awin
Module Name:src
Committed By: jmcneill
Date: Sun Oct 19 22:34:55 UTC 2014
Modified Files:
src/sys/arch/evbarm/awin: awin_machdep.c
Log Message:
allow awge mac address to be overriden by uEnv bootargs; set
awge0.mac-address=XX:XX:XX:XX:XX:XX
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/awin/awin_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/awin/awin_machdep.c
diff -u src/sys/arch/evbarm/awin/awin_machdep.c:1.17 src/sys/arch/evbarm/awin/awin_machdep.c:1.18
--- src/sys/arch/evbarm/awin/awin_machdep.c:1.17 Sat Oct 18 12:36:39 2014
+++ src/sys/arch/evbarm/awin/awin_machdep.c Sun Oct 19 22:34:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_machdep.c,v 1.17 2014/10/18 12:36:39 jmcneill Exp $ */
+/* $NetBSD: awin_machdep.c,v 1.18 2014/10/19 22:34:55 jmcneill Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: awin_machdep.c,v 1.17 2014/10/18 12:36:39 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: awin_machdep.c,v 1.18 2014/10/19 22:34:55 jmcneill Exp $);
#include opt_machdep.h
#include opt_ddb.h
@@ -678,6 +678,24 @@ awin_device_register(device_t self, void
}
if (device_is_a(self, awge)) {
+ /*
+ * Get the GMAC MAC address from cmdline.
+ */
+ uint8_t enaddr[ETHER_ADDR_LEN];
+ char argname[strlen(awge?.mac-address) + 1];
+ char *mac_addr;
+ snprintf(argname, sizeof(argname), %s.mac-address,
+ device_xname(self));
+ if (get_bootconf_option(boot_args, argname,
+ BOOTOPT_TYPE_STRING, mac_addr)
+ ether_aton_r(enaddr, sizeof(enaddr), mac_addr) == 0) {
+ prop_data_t pd;
+ pd = prop_data_create_data(enaddr, sizeof(enaddr));
+ KASSERT(pd != NULL);
+ prop_dictionary_set(dict, mac-address, pd);
+ prop_object_release(pd);
+ }
+
#if AWIN_board == AWIN_cubieboard
if (awin_chip_id() == AWIN_CHIP_ID_A20) {
/* Cubieboard2 uses GMAC with a 100Mbit PHY */
CVS commit: src/sys/arch/evbarm/awin
Module Name:src Committed By: jmcneill Date: Sun Oct 19 22:37:08 UTC 2014 Modified Files: src/sys/arch/evbarm/awin: awin_machdep.c Log Message: add some hummingbird A31 motg pins To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/awin/awin_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/awin/awin_machdep.c diff -u src/sys/arch/evbarm/awin/awin_machdep.c:1.18 src/sys/arch/evbarm/awin/awin_machdep.c:1.19 --- src/sys/arch/evbarm/awin/awin_machdep.c:1.18 Sun Oct 19 22:34:55 2014 +++ src/sys/arch/evbarm/awin/awin_machdep.c Sun Oct 19 22:37:08 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: awin_machdep.c,v 1.18 2014/10/19 22:34:55 jmcneill Exp $ */ +/* $NetBSD: awin_machdep.c,v 1.19 2014/10/19 22:37:08 jmcneill Exp $ */ /* * Machine dependent functions for kernel setup for TI OSK5912 board. @@ -125,7 +125,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: awin_machdep.c,v 1.18 2014/10/19 22:34:55 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: awin_machdep.c,v 1.19 2014/10/19 22:37:08 jmcneill Exp $); #include opt_machdep.h #include opt_ddb.h @@ -601,6 +601,10 @@ awin_device_register(device_t self, void } #endif #if AWIN_board == AWIN_hummingbird_a31 + prop_dictionary_set_cstring(dict, usb0iddet, PA15); + prop_dictionary_set_cstring(dict, usb0vbusdet, PA16); + prop_dictionary_set_cstring(dict, usb0drv, PA17); + prop_dictionary_set_cstring(dict, usb0restrict, PA18); prop_dictionary_set_cstring(dict, usb1drv, PH27); prop_dictionary_set_cstring(dict, usb1restrict, PH26); prop_dictionary_set_cstring(dict, usb2drv, PH24);
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sun Oct 19 22:38:01 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: HUMMINGBIRD_A31 Log Message: enable awge To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/HUMMINGBIRD_A31 diff -u src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.10 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.11 --- src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.10 Tue Oct 14 22:43:33 2014 +++ src/sys/arch/evbarm/conf/HUMMINGBIRD_A31 Sun Oct 19 22:38:00 2014 @@ -1,4 +1,4 @@ -# $NetBSD: HUMMINGBIRD_A31,v 1.10 2014/10/14 22:43:33 jmcneill Exp $ +# $NetBSD: HUMMINGBIRD_A31,v 1.11 2014/10/19 22:38:00 jmcneill Exp $ # # HUMMINGBIRD_A31 - Merrii Hummingbird A31 # @@ -227,8 +227,8 @@ awinrtc* at awinio? awinac0 at awinio0 audio0 at awinac0 -# 10/100/1000 Ethernet (A10/A20) -#awge0 at awinio0 port ? +# GMAC Ethernet +awge0 at awinio0 port ? # On-board USB awinusb0 at awinio0 port 0
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: jmcneill
Date: Sun Oct 19 23:18:22 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_io.c
Log Message:
add SDMMC1 SDMMC2 and SDMM3 for A31
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/allwinner/awin_io.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_io.c
diff -u src/sys/arch/arm/allwinner/awin_io.c:1.22 src/sys/arch/arm/allwinner/awin_io.c:1.23
--- src/sys/arch/arm/allwinner/awin_io.c:1.22 Sun Oct 19 15:38:54 2014
+++ src/sys/arch/arm/allwinner/awin_io.c Sun Oct 19 23:18:22 2014
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_io.c,v 1.22 2014/10/19 15:38:54 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_io.c,v 1.23 2014/10/19 23:18:22 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -123,6 +123,9 @@ static const struct awin_locators awin_l
{ awinmmc, OFFANDSIZE(SDMMC3), 3, AWIN_IRQ_SDMMC3, A10|A20 },
{ awinmmc, OFFANDSIZE(SDMMC1), 4, AWIN_IRQ_SDMMC1, A10|A20 },
{ awinmmc, OFFANDSIZE(SDMMC0), 0, AWIN_A31_IRQ_SDMMC0, A31 },
+ { awinmmc, OFFANDSIZE(SDMMC1), 1, AWIN_A31_IRQ_SDMMC1, A31 },
+ { awinmmc, OFFANDSIZE(SDMMC2), 2, AWIN_A31_IRQ_SDMMC2, A31 },
+ { awinmmc, OFFANDSIZE(SDMMC3), 3, AWIN_A31_IRQ_SDMMC3, A31 },
{ ahcisata, OFFANDSIZE(SATA), NOPORT, AWIN_IRQ_SATA, A10|A20 },
{ awiniic, OFFANDSIZE(TWI0), 0, AWIN_IRQ_TWI0, A10|A20 },
{ awiniic, OFFANDSIZE(TWI1), 1, AWIN_IRQ_TWI1, A10|A20 },
CVS commit: src/crypto/external/bsd/openssh
Module Name:src
Committed By: christos
Date: Mon Oct 20 03:05:13 UTC 2014
Modified Files:
src/crypto/external/bsd/openssh/dist: auth.h compat.c mac.c
monitor_wrap.c monitor_wrap.h packet.c sshconnect2.c umac.c
src/crypto/external/bsd/openssh/lib: Makefile
Added Files:
src/crypto/external/bsd/openssh/dist: umac128.c
Log Message:
- remove some more jpake remnants.
- try to fix umac; probably still broken on hosts that require strict
alignment, but it is still a start.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/auth.h
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/compat.c
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/mac.c \
src/crypto/external/bsd/openssh/dist/monitor_wrap.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/monitor_wrap.h
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/umac.c
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssh/dist/umac128.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/auth.h
diff -u src/crypto/external/bsd/openssh/dist/auth.h:1.8 src/crypto/external/bsd/openssh/dist/auth.h:1.9
--- src/crypto/external/bsd/openssh/dist/auth.h:1.8 Sun Oct 19 12:30:58 2014
+++ src/crypto/external/bsd/openssh/dist/auth.h Sun Oct 19 23:05:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: auth.h,v 1.8 2014/10/19 16:30:58 christos Exp $ */
+/* $NetBSD: auth.h,v 1.9 2014/10/20 03:05:13 christos Exp $ */
/* $OpenBSD: auth.h,v 1.78 2014/07/03 11:16:55 djm Exp $ */
/*
@@ -62,7 +62,6 @@ struct Authctxt {
char *style;
void *kbdintctxt;
char *info; /* Extra info for next auth_log */
- void *jpake_ctx;
#ifdef BSD_AUTH
auth_session_t *as;
#endif
Index: src/crypto/external/bsd/openssh/dist/compat.c
diff -u src/crypto/external/bsd/openssh/dist/compat.c:1.7 src/crypto/external/bsd/openssh/dist/compat.c:1.8
--- src/crypto/external/bsd/openssh/dist/compat.c:1.7 Sun Oct 19 12:30:58 2014
+++ src/crypto/external/bsd/openssh/dist/compat.c Sun Oct 19 23:05:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.7 2014/10/19 16:30:58 christos Exp $ */
+/* $NetBSD: compat.c,v 1.8 2014/10/20 03:05:13 christos Exp $ */
/* $OpenBSD: compat.c,v 1.85 2014/04/20 02:49:32 djm Exp $ */
/*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include includes.h
-__RCSID($NetBSD: compat.c,v 1.7 2014/10/19 16:30:58 christos Exp $);
+__RCSID($NetBSD: compat.c,v 1.8 2014/10/20 03:05:13 christos Exp $);
#include sys/types.h
#include stdlib.h
@@ -179,6 +179,7 @@ compat_datafellows(const char *version)
if (match_pattern_list(version, check[i].pat,
strlen(check[i].pat), 0) == 1) {
datafellows = check[i].bugs;
+ /* Check to see if the remote side is OpenSSH and not HPN */
if(strstr(version,OpenSSH) != NULL)
{
if (strstr(version,hpn) == NULL)
Index: src/crypto/external/bsd/openssh/dist/mac.c
diff -u src/crypto/external/bsd/openssh/dist/mac.c:1.9 src/crypto/external/bsd/openssh/dist/mac.c:1.10
--- src/crypto/external/bsd/openssh/dist/mac.c:1.9 Sun Oct 19 12:30:58 2014
+++ src/crypto/external/bsd/openssh/dist/mac.c Sun Oct 19 23:05:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mac.c,v 1.9 2014/10/19 16:30:58 christos Exp $ */
+/* $NetBSD: mac.c,v 1.10 2014/10/20 03:05:13 christos Exp $ */
/* $OpenBSD: mac.c,v 1.30 2014/04/30 19:07:48 naddy Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include includes.h
-__RCSID($NetBSD: mac.c,v 1.9 2014/10/19 16:30:58 christos Exp $);
+__RCSID($NetBSD: mac.c,v 1.10 2014/10/20 03:05:13 christos Exp $);
#include sys/types.h
#include openssl/hmac.h
@@ -153,14 +153,12 @@ mac_init(Mac *mac)
ssh_hmac_init(mac-hmac_ctx, mac-key, mac-key_len) 0)
return -1;
return 0;
-#ifdef UMAC_HAS_BEEN_UNBROKEN
case SSH_UMAC:
mac-umac_ctx = umac_new(mac-key);
return 0;
case SSH_UMAC128:
mac-umac_ctx = umac128_new(mac-key);
return 0;
-#endif
default:
return -1;
}
@@ -174,9 +172,7 @@ mac_compute(Mac *mac, u_int32_t seqno, u
u_int64_t for_align;
} u;
u_char b[4];
-#ifdef UMAC_HAS_BEEN_UNBROKEN
u_char nonce[8];
-#endif
if (mac-mac_len sizeof(u))
fatal(mac_compute: mac too long %u %zu,
@@ -192,7 +188,6 @@ mac_compute(Mac *mac, u_int32_t seqno, u
ssh_hmac_final(mac-hmac_ctx, u.m, sizeof(u.m)) 0)
fatal(ssh_hmac failed);
break;
-#ifdef UMAC_HAS_BEEN_UNBROKEN
case SSH_UMAC:
put_u64(nonce, seqno);
umac_update(mac-umac_ctx, data, datalen);
@@ -203,7 +198,6 @@ mac_compute(Mac *mac, u_int32_t seqno, u
