CVS commit: othersrc/crypto/external/bsd/sharedkey
Module Name:othersrc Committed By: agc Date: Mon Mar 21 07:10:45 UTC 2011 Update of /cvsroot/othersrc/crypto/external/bsd/sharedkey In directory ivanova.netbsd.org:/tmp/cvs-serv15677 Log Message: Initial import, into othersrc/crypto, of sharedkey, a library and utility which generates a one-time key (by default RSA 2048bit), which is used to encrypt a secret to be shared between a number of people. The secret is encrypted to the generated, one-time key. That key is then distributed using lib(3). All encryption and decryption are accomplished via libnetpgp(3). The secret can be recovered by presenting a threshold of shares, and using that to recover the secret key, which can then be used to decrypt the original secret. The key can optionally be further protected by a passphrase, which is set at one-time-key generation time. The net effect is to introduce a gate to recovery - with a passphrase, secret recovery can be gated through an individual who knows the passphrase - this protects against collusion to recover the secret behind everyone's backs. At the same time, normal passphrase propagation rules apply, and there is a potential for a Single Point of Failure. There are a number of use cases for this functionality, which is a generalised and much more flexible form of encryption to a number of users. Shares can be distributed in non-uniform amounts, for example, so that more important players in the group can receive more than one share. Ad-hoc user groups can be established. Shares can be encrypted to other user's keys, and protected in transit that way. Shares can be encrypted to the distributor's key before encrypting to the recipient's key - this will protect against collusion and accidental exposure of the secret, but again introduces a SPoF. Backups can be generated which can be recovered only when a quorum of known and authorised keys have authorised it. There are many other use cases for this - they are left as an exercise for the reader. The original public key is kept around to provide information on the encrypted secret - who, when, how many shares, quorum, etc. If this is deemed to be sensitive, this information can be redacted by using the -a switch (to anonymize the public key). There are still some loose ends to this code, but it is functional at the present time. Further review is welcomed and encouraged. A worked example, taken from the regression test for sharedkey(1) distributes the /etc/group file on a machine to 3 shares, of which 2 make a quorum. The group file is then recovered by using two of the generated shares: % make t cd /usr/othersrc/crypto/external/bsd/sharedkey/sharedkey make t make split rm -rf /tmp/share.* /tmp/recover.* ./sharedkey -t 2/3 /etc/group Generating a one-time key /tmp/share.14828a/pubring.gpg: No such file or directory Can't read pubring /tmp/share.14828a/pubring.gpg Can't read pub keyring signature 2048/RSA (Encrypt or Sign) 5eb658fbc4e0c0fc 2011-03-20 Key fingerprint: 1878 2f43 ff3b 0792 2f1c bacc 5eb6 58fb c4e0 c0fc uid /etc/group shared 2/3 by agc Sun Mar 20 03:48:28 2011 netpgp: generated keys in directory /tmp/share.14828a/5eb658fbc4e0c0fc Enter passphrase for 5eb658fbc4e0c0fc: Repeat passphrase for 5eb658fbc4e0c0fc: Shared secrets are in: /tmp/share.14828a tar tvzf /tmp/share.*/share000.tar.gz drwx-- 2 agc wheel 0 Mar 20 03:48 share000 lrwxr-xr-x 1 agc wheel 0 Mar 20 03:48 share000/keyid - 5eb658fbc4e0c0fc -rw-r--r-- 1 agc wheel609 Mar 20 03:48 share000/secret.gpg -rw-r--r-- 1 agc wheel617 Mar 20 03:48 share000/pubring.gpg -rw-r--r-- 1 agc wheel 1323 Mar 20 03:48 share000/secring.gpg.share tar: ustar vol 1, 5 files, 10240 bytes read, 0 bytes written in 1 secs (10240 bytes/sec) ls -laR /tmp/share.* total 18 drwx-- 2 agc wheel 512 Mar 20 03:48 . drwxrwxrwt 5 root wheel 512 Mar 20 03:48 .. -rw-r--r-- 1 agc wheel 617 Mar 20 03:48 pubring.gpg -rw--- 1 agc wheel 2908 Mar 20 03:48 share000.tar.gz -rw--- 1 agc wheel 2908 Mar 20 03:48 share001.tar.gz -rw--- 1 agc wheel 2910 Mar 20 03:48 share002.tar.gz make join ./sharedkey -o group.recover -r /tmp/share.*/share002.tar.gz /tmp/share.*/share000.tar.gz Error: Format error (ptag bit not set) signature 2048/RSA (Encrypt or Sign) 5eb658fbc4e0c0fc 2011-03-20 Key fingerprint: 1878 2f43 ff3b 0792 2f1c bacc 5eb6 58fb c4e0 c0fc uid /etc/group shared 2/3 by agc Sun Mar 20 03:48:28 2011 netpgp passphrase: % Status: Vendor Tag: CROOKS Release Tags: sharedkey-base N othersrc/crypto/external/bsd/sharedkey/Makefile N othersrc/crypto/external/bsd/sharedkey/mkdist N othersrc/crypto/external/bsd/sharedkey/Makefile.inc N othersrc/crypto/external/bsd/sharedkey/dist/Makefile.am N othersrc/crypto/external/bsd/sharedkey/dist/TODO N othersrc/crypto/external/bsd/sharedkey/dist/aclocal.m4 N
CVS commit: othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey
Module Name:othersrc Committed By: agc Date: Mon Mar 21 07:15:33 UTC 2011 Modified Files: othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey: sharedkey.1 Log Message: update names and locations to reflect current use. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1 diff -u othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1:1.1.1.1 othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1:1.2 --- othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1:1.1.1.1 Mon Mar 21 07:10:42 2011 +++ othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1 Mon Mar 21 07:15:33 2011 @@ -1,6 +1,6 @@ -.\ $NetBSD: sharedkey.1,v 1.1.1.1 2011/03/21 07:10:42 agc Exp $ +.\ $NetBSD: sharedkey.1,v 1.2 2011/03/21 07:15:33 agc Exp $ .\ -.\ Copyright (c) 2010 Alistair Crooks a...@netbsd.org +.\ Copyright (c) 2010,2011 Alistair Crooks a...@netbsd.org .\ All rights reserved. .\ .\ Redistribution and use in source and binary forms, with or without @@ -23,11 +23,11 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 13, 2010 -.Dt OTK 1 +.Dd March 20, 2011 +.Dt SHAREDKEY 1 .Os .Sh NAME -.Nm otk +.Nm sharedkey .Nd secret-sharing and recovery utility using one-time RSA keys .Sh SYNOPSIS .Nm @@ -61,13 +61,12 @@ .Nm command is used to recover a secret which has been shared using -.Xr otk 1 , -using a one-time RSA key generated by -.Xr netpgpkeys 1 , -encrypted using -.Xr netpgp 1 , +.Nm +using a one-time RSA key generated and +encrypted by +.Xr libnetpgp 3 , and then split into shares using -.Xr threshold 1 . +.Xr lib 3 . Only the .Dv threshold number of shares is needed to recover the secret, @@ -137,21 +136,21 @@ .Pa /etc/group into 3 separate shares, of which 2 are needed to reconstruct the original file. .Bd -literal -% otk -t 2/3 /etc/group +% sharedkey -t 2/3 /etc/group Generating a one-time key signature 2048/RSA (Encrypt or Sign) db2d87129df8ca38 2010-11-23 Key fingerprint: c632 7068 8809 2dad 15f3 f84b db2d 8712 9df8 ca38 uid /etc/group shared 2/3 by agc Mon Nov 22 16:46:27 PST 2010 Enter passphrase for db2d87129df8ca38: Repeat passphrase for db2d87129df8ca38: -Shared secrets are in: /tmp/otk.008847aa -% ls -l /tmp/otk.008847aa +Shared secrets are in: /tmp/share.008847aa +% ls -l /tmp/share.008847aa total 14 -rw-r--r-- 1 agc wheel 621 Nov 22 16:46 pubring.gpg -rw-r--r-- 1 agc wheel 2947 Nov 22 16:46 share000.tar.gz -rw-r--r-- 1 agc wheel 2948 Nov 22 16:46 share001.tar.gz -rw-r--r-- 1 agc wheel 2955 Nov 22 16:46 share002.tar.gz -% tar tvzf /tmp/otk.008847aa/share000.tar.gz +% tar tvzf /tmp/share.008847aa/share000.tar.gz drwxr-xr-x 2 agc wheel 0 Nov 22 16:46 share000 lrwxr-xr-x 1 agc wheel 0 Nov 22 16:46 share000/keyid - db2d87129df8ca38 -rw--- 1 agc wheel625 Nov 22 16:46 share000/group.gpg @@ -159,7 +158,7 @@ -rw-r--r-- 1 agc wheel621 Nov 22 16:46 share000/pubring.gpg -rw-r--r-- 1 agc wheel 1316 Nov 22 16:46 share000/secring.gpg.000 tar: ustar vol 1, 6 files, 10240 bytes read, 0 bytes written in 1 secs (10240 bytes/sec) -% netpgpkeys -l --homedir /tmp/otk.008847aa +% netpgpkeys -l --homedir /tmp/share.008847aa 1 key found signature 2048/RSA (Encrypt or Sign) db2d87129df8ca38 2010-11-23 Key fingerprint: c632 7068 8809 2dad 15f3 f84b db2d 8712 9df8 ca38 @@ -169,8 +168,8 @@ .Pp Two of the shares can then be used to recover the secret in the following way: .Bd -literal -% otk -r -o group.recover /tmp/otk.008847aa/share000.tar.gz /tmp/otk.008847aa/share001.tar.gz -Creating file /tmp/otkrecover.008981aa/db2d87129df8ca38/secring.gpg from files: +% sharedkey -r -o group.recover /tmp/share.008847aa/share000.tar.gz /tmp/share.008847aa/share001.tar.gz +Creating file /tmp/recover.008981aa/db2d87129df8ca38/secring.gpg from files: signature 2048/RSA (Encrypt or Sign) db2d87129df8ca38 2010-11-23 Key fingerprint: c632 7068 8809 2dad 15f3 f84b db2d 8712 9df8 ca38 uid /etc/group shared 2/3 by agc Mon Nov 22 16:46:27 PST 2010 @@ -190,7 +189,7 @@ .Sh SEE ALSO .Xr tar 1 , .Xr libnetpgp 3 , -.Xr libotk 3 +.Xr lib 3 .Sh HISTORY The .Nm
CVS commit: src/lib/libc/gdtoa
Module Name:src
Committed By: christos
Date: Mon Mar 21 12:53:51 UTC 2011
Modified Files:
src/lib/libc/gdtoa: g__fmt.c strtod.c strtodg.c
Log Message:
more de-linting.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/lib/libc/gdtoa/g__fmt.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/gdtoa/strtod.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/gdtoa/strtodg.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/gdtoa/g__fmt.c
diff -u src/lib/libc/gdtoa/g__fmt.c:1.1.1.2 src/lib/libc/gdtoa/g__fmt.c:1.2
--- src/lib/libc/gdtoa/g__fmt.c:1.1.1.2 Sat Mar 19 12:26:37 2011
+++ src/lib/libc/gdtoa/g__fmt.c Mon Mar 21 08:53:50 2011
@@ -56,7 +56,7 @@
if (!(s0 = decimalpoint_cache)) {
s0 = localeconv()-decimal_point;
dlen = strlen(s0);
- if ((decimalpoint_cache = (char*)MALLOC(strlen(s0) + 1))) {
+ if ((decimalpoint_cache = MALLOC(strlen(s0) + 1)) != NULL) {
strcpy(decimalpoint_cache, s0);
s0 = decimalpoint_cache;
}
Index: src/lib/libc/gdtoa/strtod.c
diff -u src/lib/libc/gdtoa/strtod.c:1.6 src/lib/libc/gdtoa/strtod.c:1.7
--- src/lib/libc/gdtoa/strtod.c:1.6 Sun Mar 20 19:15:35 2011
+++ src/lib/libc/gdtoa/strtod.c Mon Mar 21 08:53:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: strtod.c,v 1.6 2011/03/20 23:15:35 christos Exp $ */
+/* $NetBSD: strtod.c,v 1.7 2011/03/21 12:53:50 christos Exp $ */
/
@@ -122,7 +122,7 @@
static int dplen;
if (!(s0 = decimalpoint_cache)) {
s0 = localeconv()-decimal_point;
- if ((decimalpoint_cache = MALLOC(strlen(s0) + 1))) {
+ if ((decimalpoint_cache = MALLOC(strlen(s0) + 1)) != NULL) {
strcpy(decimalpoint_cache, s0);
s0 = decimalpoint_cache;
}
Index: src/lib/libc/gdtoa/strtodg.c
diff -u src/lib/libc/gdtoa/strtodg.c:1.7 src/lib/libc/gdtoa/strtodg.c:1.8
--- src/lib/libc/gdtoa/strtodg.c:1.7 Sun Mar 20 19:15:35 2011
+++ src/lib/libc/gdtoa/strtodg.c Mon Mar 21 08:53:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: strtodg.c,v 1.7 2011/03/20 23:15:35 christos Exp $ */
+/* $NetBSD: strtodg.c,v 1.8 2011/03/21 12:53:50 christos Exp $ */
/
@@ -349,7 +349,7 @@
static int dplen;
if (!(s0 = decimalpoint_cache)) {
s0 = localeconv()-decimal_point;
- if ((decimalpoint_cache = MALLOC(strlen(s0) + 1))) {
+ if ((decimalpoint_cache = MALLOC(strlen(s0) + 1)) != NULL) {
strcpy(decimalpoint_cache, s0);
s0 = decimalpoint_cache;
}
@@ -640,7 +640,7 @@
e2 += ((word0(rv) Exp_mask) Exp_shift1) - Bias;
word0(rv) = ~Exp_mask;
word0(rv) |= Bias Exp_shift1;
- for(j = 0; e1 0; j++, e1 = 1)
+ for(j = 0; e1 0; j++, e1 = (unsigned int)e1 1)
if (e1 1)
dval(rv) *= bigtens[j];
}
@@ -651,7 +651,6 @@
dval(rv) /= tens[i];
if (e1 = ~15) {
e1 = (unsigned int)e1 4;
- e1 = 4;
while(e1 = (1 (n_bigtens-1))) {
e2 += ((word0(rv) Exp_mask)
Exp_shift1) - Bias;
@@ -663,7 +662,7 @@
e2 += ((word0(rv) Exp_mask) Exp_shift1) - Bias;
word0(rv) = ~Exp_mask;
word0(rv) |= Bias Exp_shift1;
- for(j = 0; e1 0; j++, e1 = 1)
+ for(j = 0; e1 0; j++, e1 = (unsigned int)e1 1)
if (e1 1)
dval(rv) *= tinytens[j];
}
@@ -1073,10 +1072,10 @@
irv = STRTOG_Normal | STRTOG_Inexlo;
*expt = fpi-emax;
b = bits;
- be = b + ((fpi-nbits + 31) 5);
+ be = b + ((unsigned int)(fpi-nbits + 31) 5);
while(b be)
- *b++ = -1;
- if ((j = fpi-nbits 0x1f))
+ *b++ = (unsigned int)-1;
+ if ((j = fpi-nbits 0x1f) != 0)
*--be = (32 - j);
goto ret;
huge:
CVS commit: othersrc/crypto/external/bsd
Module Name:othersrc Committed By: wiz Date: Mon Mar 21 14:44:48 UTC 2011 Modified Files: othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey: sharedkey.1 othersrc/crypto/external/bsd//dist/src/lib: lib.3 othersrc/crypto/external/bsd//dist/src/: .1 Log Message: Whitespace nits, use \- for a minus sign. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1 cvs rdiff -u -r1.1.1.1 -r1.2 \ othersrc/crypto/external/bsd//dist/src/lib/lib.3 cvs rdiff -u -r1.1.1.1 -r1.2 \ othersrc/crypto/external/bsd//dist/src//.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1 diff -u othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1:1.2 othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1:1.3 --- othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1:1.2 Mon Mar 21 07:15:33 2011 +++ othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1 Mon Mar 21 14:44:47 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: sharedkey.1,v 1.2 2011/03/21 07:15:33 agc Exp $ +.\ $NetBSD: sharedkey.1,v 1.3 2011/03/21 14:44:47 wiz Exp $ .\ .\ Copyright (c) 2010,2011 Alistair Crooks a...@netbsd.org .\ All rights reserved. @@ -138,11 +138,11 @@ .Bd -literal % sharedkey -t 2/3 /etc/group Generating a one-time key -signature 2048/RSA (Encrypt or Sign) db2d87129df8ca38 2010-11-23 -Key fingerprint: c632 7068 8809 2dad 15f3 f84b db2d 8712 9df8 ca38 +signature 2048/RSA (Encrypt or Sign) db2d87129df8ca38 2010-11-23 +Key fingerprint: c632 7068 8809 2dad 15f3 f84b db2d 8712 9df8 ca38 uid /etc/group shared 2/3 by agc Mon Nov 22 16:46:27 PST 2010 -Enter passphrase for db2d87129df8ca38: -Repeat passphrase for db2d87129df8ca38: +Enter passphrase for db2d87129df8ca38: +Repeat passphrase for db2d87129df8ca38: Shared secrets are in: /tmp/share.008847aa % ls -l /tmp/share.008847aa total 14 @@ -161,7 +161,7 @@ % netpgpkeys -l --homedir /tmp/share.008847aa 1 key found signature 2048/RSA (Encrypt or Sign) db2d87129df8ca38 2010-11-23 -Key fingerprint: c632 7068 8809 2dad 15f3 f84b db2d 8712 9df8 ca38 +Key fingerprint: c632 7068 8809 2dad 15f3 f84b db2d 8712 9df8 ca38 uid /etc/group shared 2/3 by agc Mon Nov 22 16:46:27 PST 2010 .Ed @@ -170,10 +170,10 @@ .Bd -literal % sharedkey -r -o group.recover /tmp/share.008847aa/share000.tar.gz /tmp/share.008847aa/share001.tar.gz Creating file /tmp/recover.008981aa/db2d87129df8ca38/secring.gpg from files: -signature 2048/RSA (Encrypt or Sign) db2d87129df8ca38 2010-11-23 -Key fingerprint: c632 7068 8809 2dad 15f3 f84b db2d 8712 9df8 ca38 +signature 2048/RSA (Encrypt or Sign) db2d87129df8ca38 2010-11-23 +Key fingerprint: c632 7068 8809 2dad 15f3 f84b db2d 8712 9df8 ca38 uid /etc/group shared 2/3 by agc Mon Nov 22 16:46:27 PST 2010 -netpgp passphrase: +netpgp passphrase: Recovered secret in: group.recover % ls -l /etc/group group.recover Index: othersrc/crypto/external/bsd//dist/src/lib/lib.3 diff -u othersrc/crypto/external/bsd//dist/src/lib/lib.3:1.1.1.1 othersrc/crypto/external/bsd//dist/src/lib/lib.3:1.2 --- othersrc/crypto/external/bsd//dist/src/lib/lib.3:1.1.1.1 Mon Mar 21 05:43:35 2011 +++ othersrc/crypto/external/bsd//dist/src/lib/lib.3 Mon Mar 21 14:44:47 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: lib.3,v 1.1.1.1 2011/03/21 05:43:35 agc Exp $ +.\ $NetBSD: lib.3,v 1.2 2011/03/21 14:44:47 wiz Exp $ .\ .\ Copyright (c) 2010,2011 Alistair Crooks a...@netbsd.org .\ All rights reserved. @@ -28,7 +28,7 @@ .Os .Sh NAME .Nm lib -.Nd secret sharing library +.Nd secret sharing library .Sh LIBRARY .Lb lib .Sh SYNOPSIS @@ -101,7 +101,7 @@ .It use Shamir's Secret Sharing Scheme to share the original file in a way that cannot be recovered by others except by using -a number of shares equalling the threshold +a number of shares equalling the threshold .El .Pp If the threshold is set to 1, then any of the shares can be used to @@ -145,7 +145,7 @@ .Fa data argument, and a value of -.Dv -1 +.Dv \-1 should be given for the length. .Pp To split input data into shares, Index: othersrc/crypto/external/bsd//dist/src//.1 diff -u othersrc/crypto/external/bsd//dist/src//.1:1.1.1.1 othersrc/crypto/external/bsd//dist/src//.1:1.2 --- othersrc/crypto/external/bsd//dist/src//.1:1.1.1.1 Mon Mar 21 05:43:35 2011 +++ othersrc/crypto/external/bsd//dist/src//.1 Mon Mar 21 14:44:47 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: .1,v 1.1.1.1 2011/03/21 05:43:35 agc Exp $ +.\ $NetBSD: .1,v 1.2 2011/03/21 14:44:47 wiz Exp $ .\ .\ Copyright (c) 2010,2011
CVS commit: src/crypto/dist/heimdal/lib/krb5
Module Name:src Committed By: njoly Date: Mon Mar 21 15:04:18 UTC 2011 Modified Files: src/crypto/dist/heimdal/lib/krb5: krb5_c_make_checksum.3 krb5_encrypt.3 Log Message: Add missing quotes. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/dist/heimdal/lib/krb5/krb5_c_make_checksum.3 cvs rdiff -u -r1.8 -r1.9 src/crypto/dist/heimdal/lib/krb5/krb5_encrypt.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/heimdal/lib/krb5/krb5_c_make_checksum.3 diff -u src/crypto/dist/heimdal/lib/krb5/krb5_c_make_checksum.3:1.1 src/crypto/dist/heimdal/lib/krb5/krb5_c_make_checksum.3:1.2 --- src/crypto/dist/heimdal/lib/krb5/krb5_c_make_checksum.3:1.1 Sat Mar 22 08:37:14 2008 +++ src/crypto/dist/heimdal/lib/krb5/krb5_c_make_checksum.3 Mon Mar 21 15:04:18 2011 @@ -30,7 +30,7 @@ .\ SUCH DAMAGE. .\ .\ $Heimdal: krb5_c_make_checksum.3 19066 2006-11-17 22:09:25Z lha $ -.\ $NetBSD: krb5_c_make_checksum.3,v 1.1 2008/03/22 08:37:14 mlelstv Exp $ +.\ $NetBSD: krb5_c_make_checksum.3,v 1.2 2011/03/21 15:04:18 njoly Exp $ .\ .Dd Nov 17, 2006 .Dt KRB5_C_MAKE_CHECKSUM 3 @@ -113,7 +113,7 @@ .Fc .Ft krb5_error_code .Fo krb5_c_verify_checksum -.Fa krb5_context context +.Fa krb5_context context .Fa const krb5_keyblock *key .Fa krb5_keyusage usage .Fa const krb5_data *data Index: src/crypto/dist/heimdal/lib/krb5/krb5_encrypt.3 diff -u src/crypto/dist/heimdal/lib/krb5/krb5_encrypt.3:1.8 src/crypto/dist/heimdal/lib/krb5/krb5_encrypt.3:1.9 --- src/crypto/dist/heimdal/lib/krb5/krb5_encrypt.3:1.8 Sat Mar 22 08:37:14 2008 +++ src/crypto/dist/heimdal/lib/krb5/krb5_encrypt.3 Mon Mar 21 15:04:18 2011 @@ -30,7 +30,7 @@ .\ SUCH DAMAGE. .\ .\ $Heimdal: krb5_encrypt.3 22071 2007-11-14 20:04:50Z lha $ -.\ $NetBSD: krb5_encrypt.3,v 1.8 2008/03/22 08:37:14 mlelstv Exp $ +.\ $NetBSD: krb5_encrypt.3,v 1.9 2011/03/21 15:04:18 njoly Exp $ .\ .Dd March 20, 2004 .Dt KRB5_ENCRYPT 3 @@ -142,7 +142,7 @@ .Ft krb5_error_code .Fo krb5_crypto_getconfoundersize .Fa krb5_context context -.Fa krb5_crypto crypto +.Fa krb5_crypto crypto .Fa size_t *confoundersize .Fc .Ft krb5_error_code
CVS commit: src/usr.sbin/schedctl
Module Name:src Committed By: jruoho Date: Mon Mar 21 15:35:22 UTC 2011 Modified Files: src/usr.sbin/schedctl: schedctl.8 Log Message: Use a better width for the list. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/schedctl/schedctl.8 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/schedctl/schedctl.8 diff -u src/usr.sbin/schedctl/schedctl.8:1.9 src/usr.sbin/schedctl/schedctl.8:1.10 --- src/usr.sbin/schedctl/schedctl.8:1.9 Sat Oct 18 03:40:18 2008 +++ src/usr.sbin/schedctl/schedctl.8 Mon Mar 21 15:35:21 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: schedctl.8,v 1.9 2008/10/18 03:40:18 rmind Exp $ +.\ $NetBSD: schedctl.8,v 1.10 2011/03/21 15:35:21 jruoho Exp $ .\ .\ Copyright (c) 2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd October 18, 2008 +.Dd March 21, 2011 .Dt SCHEDCTL 8 .Os .Sh NAME @@ -51,7 +51,7 @@ can also be used to start a new command using the specified parameters. .Pp Available options: -.Bl -tag -width indent +.Bl -tag -width -C class .It Fl A Ar cpus Set of the processors on which process or thread should run, that is, affinity.
CVS commit: src/sys/rump/net/lib/libshmif
Module Name:src Committed By: pooka Date: Mon Mar 21 15:47:54 UTC 2011 Removed Files: src/sys/rump/net/lib/libshmif: dumpbus.c Log Message: this was moved to usr.bin ages ago To generate a diff of this commit: cvs rdiff -u -r1.10 -r0 src/sys/rump/net/lib/libshmif/dumpbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/net/rumptest
Module Name:src Committed By: pooka Date: Mon Mar 21 15:51:34 UTC 2011 Removed Files: src/sys/rump/net/rumptest: Makefile rumptest_net.c Log Message: remove historic test To generate a diff of this commit: cvs rdiff -u -r1.10 -r0 src/sys/rump/net/rumptest/Makefile cvs rdiff -u -r1.23 -r0 src/sys/rump/net/rumptest/rumptest_net.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Mon Mar 21 16:41:09 UTC 2011 Modified Files: src/sys/rump/include/machine: cpu.h intr.h src/sys/rump/include/rump: rump.h rumpuser.h src/sys/rump/librump/rumpkern: emul.c intr.c locks.c rump.c rump_private.h scheduler.c vm.c src/sys/rump/librump/rumpvfs: rumpfs.c vm_vfs.c src/sys/rump/net/lib/libshmif: if_shmem.c shmif_busops.c shmifvar.h Log Message: Update copyright statements. no functional change. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/rump/include/machine/cpu.h cvs rdiff -u -r1.17 -r1.18 src/sys/rump/include/machine/intr.h cvs rdiff -u -r1.52 -r1.53 src/sys/rump/include/rump/rump.h cvs rdiff -u -r1.67 -r1.68 src/sys/rump/include/rump/rumpuser.h cvs rdiff -u -r1.149 -r1.150 src/sys/rump/librump/rumpkern/emul.c cvs rdiff -u -r1.35 -r1.36 src/sys/rump/librump/rumpkern/intr.c cvs rdiff -u -r1.53 -r1.54 src/sys/rump/librump/rumpkern/locks.c cvs rdiff -u -r1.232 -r1.233 src/sys/rump/librump/rumpkern/rump.c cvs rdiff -u -r1.69 -r1.70 src/sys/rump/librump/rumpkern/rump_private.h cvs rdiff -u -r1.25 -r1.26 src/sys/rump/librump/rumpkern/scheduler.c cvs rdiff -u -r1.113 -r1.114 src/sys/rump/librump/rumpkern/vm.c cvs rdiff -u -r1.92 -r1.93 src/sys/rump/librump/rumpvfs/rumpfs.c cvs rdiff -u -r1.27 -r1.28 src/sys/rump/librump/rumpvfs/vm_vfs.c cvs rdiff -u -r1.38 -r1.39 src/sys/rump/net/lib/libshmif/if_shmem.c cvs rdiff -u -r1.8 -r1.9 src/sys/rump/net/lib/libshmif/shmif_busops.c cvs rdiff -u -r1.5 -r1.6 src/sys/rump/net/lib/libshmif/shmifvar.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/rump/include/machine/cpu.h diff -u src/sys/rump/include/machine/cpu.h:1.14 src/sys/rump/include/machine/cpu.h:1.15 --- src/sys/rump/include/machine/cpu.h:1.14 Tue Jan 4 16:23:35 2011 +++ src/sys/rump/include/machine/cpu.h Mon Mar 21 16:41:08 2011 @@ -1,9 +1,7 @@ -/* $NetBSD: cpu.h,v 1.14 2011/01/04 16:23:35 pooka Exp $ */ +/* $NetBSD: cpu.h,v 1.15 2011/03/21 16:41:08 pooka Exp $ */ /* - * Copyright (c) 2007 Antti Kantee. All Rights Reserved. - * - * Development of this software was supported by Google Summer of Code. + * Copyright (c) 2008-2011 Antti Kantee. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Index: src/sys/rump/include/machine/intr.h diff -u src/sys/rump/include/machine/intr.h:1.17 src/sys/rump/include/machine/intr.h:1.18 --- src/sys/rump/include/machine/intr.h:1.17 Mon Aug 30 18:29:52 2010 +++ src/sys/rump/include/machine/intr.h Mon Mar 21 16:41:08 2011 @@ -1,9 +1,7 @@ -/* $NetBSD: intr.h,v 1.17 2010/08/30 18:29:52 pooka Exp $ */ +/* $NetBSD: intr.h,v 1.18 2011/03/21 16:41:08 pooka Exp $ */ /* - * Copyright (c) 2007 Antti Kantee. All Rights Reserved. - * - * Development of this software was supported by Google Summer of Code. + * Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Index: src/sys/rump/include/rump/rump.h diff -u src/sys/rump/include/rump/rump.h:1.52 src/sys/rump/include/rump/rump.h:1.53 --- src/sys/rump/include/rump/rump.h:1.52 Wed Mar 9 10:10:19 2011 +++ src/sys/rump/include/rump/rump.h Mon Mar 21 16:41:08 2011 @@ -1,9 +1,7 @@ -/* $NetBSD: rump.h,v 1.52 2011/03/09 10:10:19 pooka Exp $ */ +/* $NetBSD: rump.h,v 1.53 2011/03/21 16:41:08 pooka Exp $ */ /* - * Copyright (c) 2007 Antti Kantee. All Rights Reserved. - * - * Development of this software was supported by Google Summer of Code. + * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Index: src/sys/rump/include/rump/rumpuser.h diff -u src/sys/rump/include/rump/rumpuser.h:1.67 src/sys/rump/include/rump/rumpuser.h:1.68 --- src/sys/rump/include/rump/rumpuser.h:1.67 Tue Mar 8 12:39:29 2011 +++ src/sys/rump/include/rump/rumpuser.h Mon Mar 21 16:41:08 2011 @@ -1,9 +1,7 @@ -/* $NetBSD: rumpuser.h,v 1.67 2011/03/08 12:39:29 pooka Exp $ */ +/* $NetBSD: rumpuser.h,v 1.68 2011/03/21 16:41:08 pooka Exp $ */ /* - * Copyright (c) 2007 Antti Kantee. All Rights Reserved. - * - * Development of this software was supported by Google Summer of Code. + * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Index: src/sys/rump/librump/rumpkern/emul.c diff -u src/sys/rump/librump/rumpkern/emul.c:1.149 src/sys/rump/librump/rumpkern/emul.c:1.150 --- src/sys/rump/librump/rumpkern/emul.c:1.149 Fri Jan 21 13:11:03 2011 +++
CVS commit: src/lib/libp2k
Module Name:src Committed By: pooka Date: Mon Mar 21 16:41:27 UTC 2011 Modified Files: src/lib/libp2k: p2k.h Log Message: update copyright To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libp2k/p2k.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libp2k/p2k.h diff -u src/lib/libp2k/p2k.h:1.7 src/lib/libp2k/p2k.h:1.8 --- src/lib/libp2k/p2k.h:1.7 Thu Dec 3 14:27:16 2009 +++ src/lib/libp2k/p2k.h Mon Mar 21 16:41:27 2011 @@ -1,7 +1,7 @@ -/* $NetBSD: p2k.h,v 1.7 2009/12/03 14:27:16 pooka Exp $ */ +/* $NetBSD: p2k.h,v 1.8 2011/03/21 16:41:27 pooka Exp $ */ /* - * Copyright (c) 2007 Antti Kantee. All Rights Reserved. + * Copyright (c) 2007-2009 Antti Kantee. All Rights Reserved. * * Development of this software was supported by Google Summer of Code. *
CVS commit: src/external/bsd/llvm
Module Name:src
Committed By: joerg
Date: Mon Mar 21 16:50:12 UTC 2011
Modified Files:
src/external/bsd/llvm: Makefile.inc
Log Message:
Update LLVM/clang snapshot. This brings much improved support for
--sysroot and a cross-compiling toolchain.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/llvm/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/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.4 src/external/bsd/llvm/Makefile.inc:1.5
--- src/external/bsd/llvm/Makefile.inc:1.4 Fri Mar 18 23:32:01 2011
+++ src/external/bsd/llvm/Makefile.inc Mon Mar 21 16:50:12 2011
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.4 2011/03/18 23:32:01 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2011/03/21 16:50:12 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
.include bsd.own.mk
-LLVM_REVISION= 127912
-CLANG_REVISION= 127912
+LLVM_REVISION= 127996
+CLANG_REVISION= 127996
LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm
CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
CVS commit: src/share/man/man4/man4.emips
Module Name:src Committed By: njoly Date: Mon Mar 21 17:09:10 UTC 2011 Modified Files: src/share/man/man4/man4.emips: ace.4 Log Message: Add missing quotes. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.emips/ace.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.emips/ace.4 diff -u src/share/man/man4/man4.emips/ace.4:1.2 src/share/man/man4/man4.emips/ace.4:1.3 --- src/share/man/man4/man4.emips/ace.4:1.2 Mon Feb 14 21:13:17 2011 +++ src/share/man/man4/man4.emips/ace.4 Mon Mar 21 17:09:09 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: ace.4,v 1.2 2011/02/14 21:13:17 pooka Exp $ +.\ $NetBSD: ace.4,v 1.3 2011/03/21 17:09:09 njoly Exp $ .\ .\ Copyright (c) 2010 NetBSD Foundation, Inc. .\ All rights reserved. @@ -33,7 +33,7 @@ .Nd ACE disk adaptor .Sh SYNOPSIS -.Cd ace* at ebus0 addr ? +.Cd ace* at ebus0 addr ? .Sh DESCRIPTION The .Nm
CVS commit: src/sys/dev/videomode
Module Name:src Committed By: jdc Date: Mon Mar 21 19:28:37 UTC 2011 Modified Files: src/sys/dev/videomode: modelines Log Message: Add EDID established timing modelines for 720x400x70 and 720x400x88 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/videomode/modelines 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/videomode/modelines diff -u src/sys/dev/videomode/modelines:1.7 src/sys/dev/videomode/modelines:1.8 --- src/sys/dev/videomode/modelines:1.7 Wed Jan 21 14:40:25 2009 +++ src/sys/dev/videomode/modelines Mon Mar 21 19:28:37 2011 @@ -1,4 +1,4 @@ -// $NetBSD: modelines,v 1.7 2009/01/21 14:40:25 jnemeth Exp $ +// $NetBSD: modelines,v 1.8 2011/03/21 19:28:37 jdc Exp $ // // This file was imported from XFree86, and is made of the contents of both // the vesamodes and extramodes files. As a result these should correspond @@ -21,9 +21,15 @@ # 640x400 @ 85Hz (VESA) hsync: 37.9kHz ModeLine 640x40031.5 640 672 736 832400 401 404 445 -hsync +vsync +# 720x400 @ 70Hz (EDID established timing) hsync: 31.47kHz +ModeLine 720x40028.32 720 738 846 900400 412 414 449 -hsync +vsync + # 720x400 @ 85Hz (VESA) hsync: 37.9kHz ModeLine 720x40035.5 720 756 828 936400 401 404 446 -hsync +vsync +# 720x400 @ 88Hz (EDID established timing) hsync: 39.44kHz +ModeLine 720x40035.5 720 738 846 900400 421 423 449 -hsync -vsync + # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz ModeLine 640x48025.2 640 656 752 800480 490 492 525 -hsync -vsync
CVS commit: src/sys/dev/videomode
Module Name:src
Committed By: jdc
Date: Mon Mar 21 19:29:54 UTC 2011
Modified Files:
src/sys/dev/videomode: videomode.c
Log Message:
Regenerate for:
Add EDID established timing modelines for 720x400x70 and 720x400x88
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/videomode/videomode.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/videomode/videomode.c
diff -u src/sys/dev/videomode/videomode.c:1.9 src/sys/dev/videomode/videomode.c:1.10
--- src/sys/dev/videomode/videomode.c:1.9 Tue Oct 21 06:04:37 2008
+++ src/sys/dev/videomode/videomode.c Mon Mar 21 19:29:54 2011
@@ -1,14 +1,14 @@
-/* $NetBSD: videomode.c,v 1.9 2008/10/21 06:04:37 macallan Exp $ */
+/* $NetBSD: videomode.c,v 1.10 2011/03/21 19:29:54 jdc Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: modelines,v 1.5 2007/04/03 03:33:41 macallan Exp
+ * NetBSD: modelines,v 1.8 2011/03/21 19:28:37 jdc Exp
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: videomode.c,v 1.9 2008/10/21 06:04:37 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: videomode.c,v 1.10 2011/03/21 19:29:54 jdc Exp $);
#include dev/videomode/videomode.h
@@ -28,7 +28,9 @@
const struct videomode videomode_list[] = {
M(640x350x85,640,350,31500,672,736,832,382,385,445,HP|VN),
M(640x400x85,640,400,31500,672,736,832,401,404,445,HN|VP),
+M(720x400x70,720,400,28320,738,846,900,412,414,449,HN|VP),
M(720x400x85,720,400,35500,756,828,936,401,404,446,HN|VP),
+M(720x400x87,720,400,35500,738,846,900,421,423,449,HN|VN),
M(640x480x60,640,480,25200,656,752,800,490,492,525,HN|VN),
M(640x480x72,640,480,31500,664,704,832,489,491,520,HN|VN),
M(640x480x75,640,480,31500,656,720,840,481,484,500,HN|VN),
@@ -75,7 +77,9 @@
M(320x175x85,320,175,15750,336,368,416,191,192,222,HP|VN|DS),
M(320x200x85,320,200,15750,336,368,416,200,202,222,HN|VP|DS),
+M(360x200x70,360,200,14160,369,423,450,206,207,224,HN|VP|DS),
M(360x200x85,360,200,17750,378,414,468,200,202,223,HN|VP|DS),
+M(360x200x87,360,200,17750,369,423,450,210,211,224,HN|VN|DS),
M(320x240x60,320,240,12600,328,376,400,245,246,262,HN|VN|DS),
M(320x240x72,320,240,15750,332,352,416,244,245,260,HN|VN|DS),
M(320x240x75,320,240,15750,328,360,420,240,242,250,HN|VN|DS),
@@ -119,4 +123,4 @@
M(576x450x76,576,450,52780,584,640,736,451,453,471,HN|VN|DS),
};
-const int videomode_count = 44;
+const int videomode_count = 46;
CVS commit: src/sys/dev/videomode
Module Name:src Committed By: jdc Date: Mon Mar 21 19:32:27 UTC 2011 Modified Files: src/sys/dev/videomode: modelines2c.awk Log Message: Clarify vrefresh comment (no functional change) To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/videomode/modelines2c.awk 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/videomode/modelines2c.awk diff -u src/sys/dev/videomode/modelines2c.awk:1.4 src/sys/dev/videomode/modelines2c.awk:1.5 --- src/sys/dev/videomode/modelines2c.awk:1.4 Thu Oct 26 23:19:50 2006 +++ src/sys/dev/videomode/modelines2c.awk Mon Mar 21 19:32:26 2011 @@ -1,5 +1,5 @@ #! /usr/bin/awk -f -# $NetBSD: modelines2c.awk,v 1.4 2006/10/26 23:19:50 bjh21 Exp $ +# $NetBSD: modelines2c.awk,v 1.5 2011/03/21 19:32:26 jdc Exp $ # # Copyright (c) 2006 Itronix Inc. # All rights reserved. @@ -104,8 +104,9 @@ ifactor = 2.0; } - # why the additional .1 to vrefresh? well it seems that awk likes to - # make some rounding errors, and this will compensate + # We truncate the vrefresh figure, but some mode descriptions rely + # on rounding, so we can't win here. Adding an additional .1 + # compensates to some extent. hrefresh= (dotclock * 100) / htotal; vrefresh= int(((hrefresh * ifactor) / vtotal) + .1);
CVS commit: src/sys/dev/videomode
Module Name:src
Committed By: jdc
Date: Mon Mar 21 19:34:27 UTC 2011
Modified Files:
src/sys/dev/videomode: edid.c
Log Message:
Correct 832x624x74.
Update comments.
Reverse iteratiion, so that modes are in established timing order.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/videomode/edid.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/videomode/edid.c
diff -u src/sys/dev/videomode/edid.c:1.6 src/sys/dev/videomode/edid.c:1.7
--- src/sys/dev/videomode/edid.c:1.6 Sat Nov 14 09:19:41 2009
+++ src/sys/dev/videomode/edid.c Mon Mar 21 19:34:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: edid.c,v 1.6 2009/11/14 09:19:41 tsutsui Exp $ */
+/* $NetBSD: edid.c,v 1.7 2011/03/21 19:34:27 jdc Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: edid.c,v 1.6 2009/11/14 09:19:41 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: edid.c,v 1.7 2011/03/21 19:34:27 jdc Exp $);
#include sys/param.h
#include sys/systm.h
@@ -48,13 +48,14 @@
#define EDIDVERBOSE 1
#define DIVIDE(x,y) (((x) + ((y) / 2)) / (y))
+/* These are reversed established timing order */
static const char *_edid_modes[] = {
1280x1024x75,
1024x768x75,
1024x768x70,
1024x768x60,
1024x768x87i,
- 832x768x74, /* rounding error, 74.55 Hz aka 832x624x75 */
+ 832x624x74, /* rounding error, 74.55 Hz aka 832x624x75 */
800x600x75,
800x600x72,
800x600x60,
@@ -63,8 +64,8 @@
640x480x72,
640x480x67,
640x480x60,
- 720x400x85, /* should this really be 720x400x88 ? */
- 720x400x70, /* hmm... videmode.c doesn't have this one */
+ 720x400x87, /* rounding error, 87.85 Hz aka 720x400x88 */
+ 720x400x70,
};
#ifdef EDIDVERBOSE
@@ -542,7 +543,8 @@
edid-edid_nmodes = 0;
edid-edid_preferred_mode = NULL;
estmodes = EDID_EST_TIMING(data);
- for (i = 0; i 16; i++) {
+ /* Iterate in esztablished timing order */
+ for (i = 15; i = 0; i--) {
if (estmodes (1 i)) {
vmp = edid_mode_lookup_list(_edid_modes[i]);
if (vmp != NULL) {
CVS commit: src/lib/libc/gdtoa
Module Name:src Committed By: christos Date: Mon Mar 21 19:46:41 UTC 2011 Modified Files: src/lib/libc/gdtoa: dtoa.c Log Message: fix vax typo. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/gdtoa/dtoa.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/gdtoa/dtoa.c diff -u src/lib/libc/gdtoa/dtoa.c:1.6 src/lib/libc/gdtoa/dtoa.c:1.7 --- src/lib/libc/gdtoa/dtoa.c:1.6 Sun Mar 20 19:15:35 2011 +++ src/lib/libc/gdtoa/dtoa.c Mon Mar 21 15:46:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dtoa.c,v 1.6 2011/03/20 23:15:35 christos Exp $ */ +/* $NetBSD: dtoa.c,v 1.7 2011/03/21 19:46:41 christos Exp $ */ / @@ -712,7 +712,7 @@ return NULL; jj1 = cmp(b, S); #ifdef ROUND_BIASED - if (jjj1 = 0 /*)*/ + if (jj1 = 0 /*)*/ #else if ((jj1 0 || (jj1 == 0 dig 1)) #endif
CVS commit: src/sys/arch/powerpc/booke
Module Name:src
Committed By: matt
Date: Mon Mar 21 19:55:04 UTC 2011
Modified Files:
src/sys/arch/powerpc/booke: e500_intr.c
Log Message:
Fix a bug in onchip_intr_name_lookup
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/booke/e500_intr.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/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.4 src/sys/arch/powerpc/booke/e500_intr.c:1.5
--- src/sys/arch/powerpc/booke/e500_intr.c:1.4 Wed Mar 16 05:31:03 2011
+++ src/sys/arch/powerpc/booke/e500_intr.c Mon Mar 21 19:55:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_intr.c,v 1.4 2011/03/16 05:31:03 matt Exp $ */
+/* $NetBSD: e500_intr.c,v 1.5 2011/03/21 19:55:04 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -433,11 +433,11 @@
{
const char *name;
- return e500_intr_name_lookup(e500_intr_info.ii_onchip_intr_names, irq);
- if (name != NULL)
- return name;
+ name = e500_intr_name_lookup(e500_intr_info.ii_onchip_intr_names, irq);
+ if (name == NULL)
+ name = e500_intr_name_lookup(e500_onchip_intr_names, irq);
- name = e500_intr_name_lookup(e500_onchip_intr_names, irq);
+ return name;
}
#ifdef __HAVE_FAST_SOFTINTS
@@ -1115,10 +1115,17 @@
}
KASSERT(evcnt == cpu-cpu_evcnt_intrs + info-ii_ist_vectors[IST_ONCHIP]);
for (size_t j = 0; j info-ii_onchip_sources; j++, evcnt++) {
- const char *name = e500_intr_onchip_name_lookup(j);
- if (name != NULL) {
- evcnt_attach_dynamic(evcnt, EVCNT_TYPE_INTR,
- NULL, xname, name);
+ if (info-ii_onchip_bitmap[j / 32] __BIT(j 31)) {
+ const char *name = e500_intr_onchip_name_lookup(j);
+ if (name != NULL) {
+evcnt_attach_dynamic(evcnt, EVCNT_TYPE_INTR,
+NULL, xname, name);
+#ifdef DIAGNOSTIC
+ } else {
+printf(%s: missing evcnt for onchip irq %zu\n,
+__func__, j);
+#endif
+ }
}
}
CVS commit: src/sys/netinet
Module Name:src
Committed By: matt
Date: Mon Mar 21 20:39:32 UTC 2011
Modified Files:
src/sys/netinet: tcp_output.c
Log Message:
Clean up setting ECN bit in TOS. Fixes PR 44742
To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/sys/netinet/tcp_output.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/netinet/tcp_output.c
diff -u src/sys/netinet/tcp_output.c:1.169 src/sys/netinet/tcp_output.c:1.170
--- src/sys/netinet/tcp_output.c:1.169 Tue Jan 26 18:09:08 2010
+++ src/sys/netinet/tcp_output.c Mon Mar 21 20:39:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_output.c,v 1.169 2010/01/26 18:09:08 pooka Exp $ */
+/* $NetBSD: tcp_output.c,v 1.170 2011/03/21 20:39:32 matt Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -135,7 +135,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_output.c,v 1.169 2010/01/26 18:09:08 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_output.c,v 1.170 2011/03/21 20:39:32 matt Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -573,6 +573,7 @@
bool alwaysfrag;
int sack_rxmit;
int sack_bytes_rxmt;
+ int ecn_tos;
struct sackhole *p;
#ifdef TCP_SIGNATURE
int sigoff = 0;
@@ -698,6 +699,7 @@
txsegsize_nosack = txsegsize;
again:
+ ecn_tos = 0;
use_tso = has_tso;
if ((tp-t_flags (TF_ECN_SND_CWR|TF_ECN_SND_ECE)) != 0) {
/* don't duplicate CWR/ECE. */
@@ -1344,18 +1346,7 @@
*/
if (len 0 SEQ_GEQ(tp-snd_nxt, tp-snd_max)
!(tp-t_force len == 1)) {
- switch (af) {
-#ifdef INET
- case AF_INET:
-tp-t_inpcb-inp_ip.ip_tos |= IPTOS_ECN_ECT0;
-break;
-#endif
-#ifdef INET6
- case AF_INET6:
-ip6-ip6_flow |= htonl(IPTOS_ECN_ECT0 20);
-break;
-#endif
- }
+ ecn_tos = IPTOS_ECN_ECT0;
TCP_STATINC(TCP_STAT_ECN_ECT);
}
@@ -1569,12 +1560,12 @@
packetlen = m-m_pkthdr.len;
if (tp-t_inpcb) {
ip-ip_ttl = tp-t_inpcb-inp_ip.ip_ttl;
- ip-ip_tos = tp-t_inpcb-inp_ip.ip_tos;
+ ip-ip_tos = tp-t_inpcb-inp_ip.ip_tos | ecn_tos;
}
#ifdef INET6
else if (tp-t_in6pcb) {
ip-ip_ttl = in6_selecthlim(tp-t_in6pcb, NULL); /*XXX*/
- ip-ip_tos = 0; /*XXX*/
+ ip-ip_tos = ecn_tos; /*XXX*/
}
#endif
break;
@@ -1594,7 +1585,8 @@
(rt = rtcache_validate(ro)) != NULL ? rt-rt_ifp
: NULL);
}
- /* ip6-ip6_flow = ??? */
+ ip6-ip6_flow |= htonl(ecn_tos 20);
+ /* ip6-ip6_flow = ??? (from template) */
/* ip6_plen will be filled in ip6_output(). */
break;
#endif
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: rmind
Date: Mon Mar 21 22:25:14 UTC 2011
Modified Files:
src/sys/arch/x86/x86: x86_machdep.c
Log Message:
cpu_need_resched: make AST if no __HAVE_PREEMPTION. Change has no effect
since MP option is mandatory on x86, but makes code more logical.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/x86/x86/x86_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/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.45 src/sys/arch/x86/x86/x86_machdep.c:1.46
--- src/sys/arch/x86/x86/x86_machdep.c:1.45 Sun Feb 6 23:25:17 2011
+++ src/sys/arch/x86/x86/x86_machdep.c Mon Mar 21 22:25:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_machdep.c,v 1.45 2011/02/06 23:25:17 jmcneill Exp $ */
+/* $NetBSD: x86_machdep.c,v 1.46 2011/03/21 22:25:13 rmind Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: x86_machdep.c,v 1.45 2011/02/06 23:25:17 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: x86_machdep.c,v 1.46 2011/03/21 22:25:13 rmind Exp $);
#include opt_modular.h
#include opt_physmem.h
@@ -216,15 +216,16 @@
} else {
x86_send_ipi(ci, X86_IPI_KPREEMPT);
}
+ return;
#endif
- } else {
- aston(l, X86_AST_PREEMPT);
- if (ci == cur) {
- return;
- }
- if ((flags RESCHED_IMMED) != 0) {
- x86_send_ipi(ci, 0);
- }
+ }
+
+ aston(l, X86_AST_PREEMPT);
+ if (ci == cur) {
+ return;
+ }
+ if ((flags RESCHED_IMMED) != 0) {
+ x86_send_ipi(ci, 0);
}
}
CVS commit: src/lib/libc/gdtoa
Module Name:src Committed By: christos Date: Mon Mar 21 22:33:29 UTC 2011 Modified Files: src/lib/libc/gdtoa: gdtoaimp.h Log Message: Add Emin for the vax. Need to check To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libc/gdtoa/gdtoaimp.h 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/gdtoa/gdtoaimp.h diff -u src/lib/libc/gdtoa/gdtoaimp.h:1.10 src/lib/libc/gdtoa/gdtoaimp.h:1.11 --- src/lib/libc/gdtoa/gdtoaimp.h:1.10 Mon Mar 21 00:52:09 2011 +++ src/lib/libc/gdtoa/gdtoaimp.h Mon Mar 21 18:33:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gdtoaimp.h,v 1.10 2011/03/21 04:52:09 christos Exp $ */ +/* $NetBSD: gdtoaimp.h,v 1.11 2011/03/21 22:33:29 christos Exp $ */ / @@ -406,6 +406,7 @@ #define Exp_mask 0x7f80 #define P 56 #define Bias 129 +#define Emin (-127) /* XXX: Check this */ #define Exp_1 0x4080 #define Exp_11 0x4080 #define Ebits 8
CVS commit: src/lib/libc/gdtoa
Module Name:src Committed By: christos Date: Mon Mar 21 22:33:46 UTC 2011 Modified Files: src/lib/libc/gdtoa: hdtoa.c Log Message: pacify lint. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/gdtoa/hdtoa.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/gdtoa/hdtoa.c diff -u src/lib/libc/gdtoa/hdtoa.c:1.6 src/lib/libc/gdtoa/hdtoa.c:1.7 --- src/lib/libc/gdtoa/hdtoa.c:1.6 Fri Mar 21 19:13:48 2008 +++ src/lib/libc/gdtoa/hdtoa.c Mon Mar 21 18:33:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hdtoa.c,v 1.6 2008/03/21 23:13:48 christos Exp $ */ +/* $NetBSD: hdtoa.c,v 1.7 2011/03/21 22:33:46 christos Exp $ */ /*- * Copyright (c) 2004, 2005 David Schultz d...@freebsd.org @@ -30,7 +30,7 @@ #if 0 __FBSDID($FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.4 2007/01/03 04:57:58 das Exp $); #else -__RCSID($NetBSD: hdtoa.c,v 1.6 2008/03/21 23:13:48 christos Exp $); +__RCSID($NetBSD: hdtoa.c,v 1.7 2011/03/21 22:33:46 christos Exp $); #endif #include float.h @@ -161,8 +161,15 @@ *decpt = 1; return (nrv_alloc(0, rve, 1)); case FP_SUBNORMAL: +#ifdef __vax__ + /* (DBL_MAX_EXP=127 / 2) + 2 = 65? */ + u.dblu_d *= 0x1p65; + *decpt = u.dblu_dbl.dbl_exp - (65 + DBL_ADJ); +#endif + /* (DBL_MAX_EXP=1024 / 2) + 2 = 514? */ u.dblu_d *= 0x1p514; *decpt = u.dblu_dbl.dbl_exp - (514 + DBL_ADJ); +#endif break; case FP_INFINITE: *decpt = INT_MAX;
CVS commit: src/lib/libc/gdtoa
Module Name:src Committed By: enami Date: Mon Mar 21 23:37:42 UTC 2011 Modified Files: src/lib/libc/gdtoa: hdtoa.c Log Message: Don't use #endif where #else is expected. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/gdtoa/hdtoa.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/gdtoa/hdtoa.c diff -u src/lib/libc/gdtoa/hdtoa.c:1.7 src/lib/libc/gdtoa/hdtoa.c:1.8 --- src/lib/libc/gdtoa/hdtoa.c:1.7 Mon Mar 21 22:33:46 2011 +++ src/lib/libc/gdtoa/hdtoa.c Mon Mar 21 23:37:42 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hdtoa.c,v 1.7 2011/03/21 22:33:46 christos Exp $ */ +/* $NetBSD: hdtoa.c,v 1.8 2011/03/21 23:37:42 enami Exp $ */ /*- * Copyright (c) 2004, 2005 David Schultz d...@freebsd.org @@ -30,7 +30,7 @@ #if 0 __FBSDID($FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.4 2007/01/03 04:57:58 das Exp $); #else -__RCSID($NetBSD: hdtoa.c,v 1.7 2011/03/21 22:33:46 christos Exp $); +__RCSID($NetBSD: hdtoa.c,v 1.8 2011/03/21 23:37:42 enami Exp $); #endif #include float.h @@ -165,7 +165,7 @@ /* (DBL_MAX_EXP=127 / 2) + 2 = 65? */ u.dblu_d *= 0x1p65; *decpt = u.dblu_dbl.dbl_exp - (65 + DBL_ADJ); -#endif +#else /* (DBL_MAX_EXP=1024 / 2) + 2 = 514? */ u.dblu_d *= 0x1p514; *decpt = u.dblu_dbl.dbl_exp - (514 + DBL_ADJ);
CVS commit: src/doc
Module Name:src Committed By: taca Date: Tue Mar 22 00:04:33 UTC 2011 Modified Files: src/doc: 3RDPARTY Log Message: Postfix 2.8.2 has released. To generate a diff of this commit: cvs rdiff -u -r1.824 -r1.825 src/doc/3RDPARTY 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.824 src/doc/3RDPARTY:1.825 --- src/doc/3RDPARTY:1.824 Sun Mar 20 23:19:35 2011 +++ src/doc/3RDPARTY Tue Mar 22 00:04:33 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.824 2011/03/20 23:19:35 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.825 2011/03/22 00:04:33 taca Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -896,7 +896,7 @@ Package: postfix Version: 2.8.1 -Current Vers: 2.8.1 +Current Vers: 2.8.2 Maintainer: Wietse Venema wie...@porcupine.org Archive Site: ftp://postfix.cloud9.net/official/ Home Page: http://www.postfix.org/
CVS commit: src/sys/arch/mmeye/include
Module Name:src
Committed By: kiyohara
Date: Tue Mar 22 05:37:37 UTC 2011
Modified Files:
src/sys/arch/mmeye/include: bus.h
Log Message:
Add dummy bus_dma(9) stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mmeye/include/bus.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/mmeye/include/bus.h
diff -u src/sys/arch/mmeye/include/bus.h:1.1 src/sys/arch/mmeye/include/bus.h:1.2
--- src/sys/arch/mmeye/include/bus.h:1.1 Mon Sep 13 10:30:54 1999
+++ src/sys/arch/mmeye/include/bus.h Tue Mar 22 05:37:37 2011
@@ -1,3 +1,26 @@
-/* $NetBSD: bus.h,v 1.1 1999/09/13 10:30:54 itojun Exp $ */
+/* $NetBSD: bus.h,v 1.2 2011/03/22 05:37:37 kiyohara Exp $ */
+
+#ifndef _MMEYE_BUS_H_
+#define _MMEYE_BUS_H_
#include sh3/bus.h
+
+/*
+ * Dummy bus_dma(9)
+ * : mmeye don't use bus_dma.
+ */
+typedef void *bus_dma_tag_t;
+
+typedef struct bus_dma_segment {
+ bus_addr_t ds_addr;
+ bus_size_t ds_len;
+} *bus_dma_segment_t;
+
+typedef struct bus_dmamap {
+ bus_size_t dm_maxsegsz;
+ bus_size_t dm_mapsize;
+ int dm_nsegs;
+ bus_dma_segment_t *dm_segs;
+} *bus_dmamap_t;
+
+#endif /* _MMEYE_BUS_H_ */
CVS commit: src/sys/arch/mmeye/conf
Module Name:src Committed By: kiyohara Date: Tue Mar 22 05:39:32 UTC 2011 Modified Files: src/sys/arch/mmeye/conf: MMEYE_WLF files.mmeye Log Message: Add slhci(4) and some usb devices. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mmeye/conf/MMEYE_WLF cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mmeye/conf/files.mmeye 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/mmeye/conf/MMEYE_WLF diff -u src/sys/arch/mmeye/conf/MMEYE_WLF:1.1 src/sys/arch/mmeye/conf/MMEYE_WLF:1.2 --- src/sys/arch/mmeye/conf/MMEYE_WLF:1.1 Sat Feb 19 10:46:27 2011 +++ src/sys/arch/mmeye/conf/MMEYE_WLF Tue Mar 22 05:39:31 2011 @@ -1,4 +1,4 @@ -# $NetBSD: MMEYE_WLF,v 1.1 2011/02/19 10:46:27 kiyohara Exp $ +# $NetBSD: MMEYE_WLF,v 1.2 2011/03/22 05:39:31 kiyohara Exp $ # # MMEYE_WLF -- Brains Inc. MMEYE-WLF platforms kernel # @@ -22,7 +22,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.1 $ +#ident GENERIC-$Revision: 1.2 $ maxusers 16 # estimated number of users @@ -196,10 +196,25 @@ com* at pcmcia? function ? # Modems and serial cards wdc* at pcmcia? function ? wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11) +slhci* at pcmcia? function ? # ScanLogic SL811HS atabus* at ata? wd* at atabus? drive ? # the drives themselves +usb* at slhci? + +# USB Hubs +uhub* at usb? +uhub* at uhub? port ? + +# USB Mass Storage +umass* at uhub? port ? configuration ? interface ? +scsibus* at scsi? +sd* at scsibus? target ? lun ? # SCSI disk drives + +# USB Generic driver +ugen* at uhub? port ? + # Bluetooth Device Hub bthub* at bcsp? bthub* at btuart? Index: src/sys/arch/mmeye/conf/files.mmeye diff -u src/sys/arch/mmeye/conf/files.mmeye:1.14 src/sys/arch/mmeye/conf/files.mmeye:1.15 --- src/sys/arch/mmeye/conf/files.mmeye:1.14 Sat Feb 19 10:46:28 2011 +++ src/sys/arch/mmeye/conf/files.mmeye Tue Mar 22 05:39:31 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.mmeye,v 1.14 2011/02/19 10:46:28 kiyohara Exp $ +# $NetBSD: files.mmeye,v 1.15 2011/03/22 05:39:31 kiyohara Exp $ # # config file for mmeye @@ -70,6 +70,7 @@ attach rtciic at mainbus file arch/mmeye/dev/rtciic.c rtciic +include dev/usb/files.usb include dev/bluetooth/files.bluetooth include arch/mmeye/conf/majors.mmeye
