cr.yp.to update

diff -ru .old-crypto/cv.html cr.yp.to/cv.html
--- .old-crypto/cv.html	2005-05-09 18:25:00.000000000 -0400
+++ cr.yp.to/cv.html	2005-05-14 04:39:38.000000000 -0400
@@ -48,6 +48,10 @@
 <a href="snuffle.html">Salsa20</a> documentation.
 <li>2005.05.04: Corrected publisher errors in poly1305.
 <li>2005.05.09: Posted revision of powers2.
+<li>2005.05.13: bruteforce has been accepted
+to Proceedings of the STVL Workshop on Symmetric Key Encryption.
+<li>2005.05.13: Salsa20 has been accepted
+to Proceedings of the STVL Workshop on Symmetric Key Encryption.
 </ul>
 Also a clarification:
 I should have said in Section 4 of activities-20050107
diff -ru .old-crypto/hardware/advice.html cr.yp.to/hardware/advice.html
--- .old-crypto/hardware/advice.html	2004-12-16 08:01:53.000000000 -0500
+++ cr.yp.to/hardware/advice.html	2005-05-15 00:48:45.000000000 -0400
@@ -19,8 +19,8 @@
 If you build a machine along these lines,
 send email to djb-hardware a few weeks later
 reporting the hardware details and the results.
-<h2>The 2004.10.10 standard workstation</h2>
-The 2004.10.10 standard workstation costs $629.
+<h2>The 2005.05.14 standard workstation</h2>
+The 2005.05.14 standard workstation costs $552.
 Notes on the price:
 <ul>
 <li>This price <i>includes</i> shipping within the United States.
@@ -46,11 +46,11 @@
 a keyboard,
 or a touchpad/trackball/mouse.
 <p>
-A catalog might say that what you're getting for $629
+A catalog might say that what you're getting for $552
 is
 ``Athlon 64 3000+, 200GB, 512MB DDR400, DVD, Ethernet, audio, video.''
 I'd add ``built for reliability'':
-the motherboard, power supply, hard drive, drive cable, and memory
+the motherboard, power supply, hard drive, and memory
 are all from well-known manufacturers;
 the CPU, motherboard, power supply, and hard drive
 are covered by 3-year warranties;
@@ -69,23 +69,22 @@
 <a href="warehouse.html#zipzoomfly">ZipZoomFly</a>:
 <table border>
 <tr><th align=right>Price</th><th>Component</th><th>Warranty</th><th>Watts</th></tr>
-<tr><td align=right>$160</td><td>AMD ADA3000AXBOX: 2000MHz PC3200 Socket-754 Athlon 64 CPU with a fan</td><td>3 years from AMD</td><td>92? (89 CPU; 3? fan) at +12V</td></tr>
-<tr><td align=right>$88</td><td>Asus K8V-X: PC3200 Socket-754 UATA/SATA 305mmx245mm motherboard with audio and Ethernet; includes 2 SATA cables, UATA cable, ATA cable, floppy cable</td><td>3 years from Asus</td><td>20? at +3.3V, 20? at +5V, 10? at +12V</td></tr>
-<tr><td align=right>$110</td><td>Kingston KVR400X72C3A/512: 512MB PC3200 ECC memory in one DIMM</td><td>lifetime from Kingston</td><td>5 at +3.3V</td></tr>
-<tr><td align=right>$111</td><td>Western Digital WD2000JB: 200GB 7200RPM UATA hard drive</td><td>3 years from Western Digital</td><td>19 at +12V (max for spinup), 4 at +5V</td></tr>
-<tr><td align=right>$14</td><td>Cooler Master UTC-A24: grounded round 24-inch UATA cable</td><td>3 years from Cooler Master</td></tr>
-<tr><td align=right>$36</td><td>PowerColor RV6DL-A3: 32MB video card using ATI Radeon VE (7000) chip with VGA, TV, DVI outputs</td><td>3 years from PowerColor</td><td>10? at +3.3V</td></tr>
-<tr><td align=right>$29</td><td>Artec DHM-G48-BR: UATA 16X DVD-ROM 40X CD-ROM drive (black)</td><td>1 year from Artec</td><td>15 at +12V, 8 at +5V</td></tr>
-<tr><td align=right>$10</td><td>Zalman ZM-F1: 80mm 1700RPM 20CFM 20dB fan</td><td>3 years from Zalman</td><td>2 at +12V</td></tr>
+<tr><td align=right>$146</td><td>AMD ADA3000AXBOX: 2000MHz PC3200 Socket-754 Athlon 64 CPU with a fan</td><td>3 years from AMD</td><td>92? (89 CPU; 3? fan) at +12V</td></tr>
+<tr><td align=right>$79</td><td>Asus K8V-X: PC3200 Socket-754 UATA/SATA 305mmx245mm motherboard with audio and Ethernet; includes 2 SATA cables, UATA cable, ATA cable, floppy cable</td><td>3 years from Asus</td><td>20? at +3.3V, 20? at +5V, 10? at +12V</td></tr>
+<tr><td align=right>$55</td><td>Kingston KVR400X72C3A/512: 512MB PC3200 ECC memory in one DIMM</td><td>lifetime from Kingston</td><td>5 at +3.3V</td></tr>
+<tr><td align=right>$105</td><td>Western Digital WD2000JD: 200GB 7200RPM SATA hard drive</td><td>3 years from Western Digital</td><td>19 at +12V (max for spinup), 4 at +5V</td></tr>
+<tr><td align=right>$40</td><td>Sapphire 100945: 64MB video card using ATI Radeon VE (7000) chip with VGA, TV, DVI outputs</td><td>1 year from ZipZoomFly</td><td>10? at +3.3V</td></tr>
+<tr><td align=right>$29</td><td>LG GDR-8162BK: UATA 16X DVD-ROM 40X CD-ROM drive (black)</td><td>1 year from LG</td><td>15? at +12V, 8? at +5V</td></tr>
+<tr><td align=right>$12</td><td>Antec TRICOOL 80 DBB: 80mm 1500RPM 20CFM 18dB fan, adjustable to higher speed</td><td>3 years from Antec</td><td>2? at +12V</td></tr>
 <tr><td align=right>$0</td><td>UPS 2-day shipping</td></tr>
 </table>
 <p>
 The following components are available from
-<a href="warehouse.html#ebuyer">Ebuyer</a>:
+TheNerds.Net:
 <table border>
 <tr><th align=right>Price</th><th>Component</th><th>Warranty</th><th>Watts</th></tr>
-<tr><td align=right>$59</td><td>Antec SX635BII: 8.1kg case (black); one 2000RPM 17.3CFM 25dB case fan; 2kg SL350 power supply (max output watts: 330 at +5V, +3.3V, +12V combined; 230 at +5V, +3.3V combined; 175 at +5V; 192 at +12V; 92 at +3.3V); two power-supply fans</td><td>3 years from Antec</td><td>10? for fans at +12V</td></tr>
-<tr><td align=right>$12</td><td>UPS ground shipping</td></tr>
+<tr><td align=right>$76</td><td>Antec SX635BII: 8.1kg case (black); one 2000RPM 17.3CFM 25dB case fan; 2kg SL350 power supply (max output watts: 330 at +5V, +3.3V, +12V combined; 230 at +5V, +3.3V combined; 175 at +5V; 192 at +12V; 92 at +3.3V); two power-supply fans</td><td>3 years from Antec</td><td>10? for fans at +12V</td></tr>
+<tr><td align=right>$10</td><td>UPS ground shipping</td></tr>
 </table>
 Antec says that the SX635BII is
 17.25inx8.1inx18.6in (i.e., 438mmx206mmx472mm),
@@ -100,9 +99,9 @@
 <h2>Variant: better low-end components</h2>
 The DVD drive was selected entirely on the basis of price.
 If you want to write CDs,
-upgrade from the $30 DVD drive to a $50 DVD/CD-RW drive.
+upgrade from the $30 DVD drive to a $40 DVD/CD-RW drive.
 If you want to write CDs and DVDs,
-upgrade from the $30 DVD drive to an $80 DVD-RW drive.
+upgrade from the $30 DVD drive to an $60 DVD-RW drive.
 <p>
 The video card was selected
 almost entirely on the basis of price,
@@ -148,10 +147,11 @@
 and two SATA drives (one per cable).
 The SX600II case has room for eight drives.
 <p>
-(Cable quality is hard to assess,
-but the UTC-A24 appears to be the best cable available today.
-A low-quality cable can destroy data written to disk:
-UATA data signals use ECC, but UATA instruction signals don't.)
+I've switched from UATA to SATA,
+now that operating systems generally support SATA.
+Like UATA, SATA has ECC on data signals;
+unlike UATA, SATA has ECC on instruction signals,
+so a low-quality cable won't destroy data written to disk.
 <p>
 I generally opt for lower-RPM drives.
 Lower-RPM drives are less expensive;
@@ -165,7 +165,10 @@
 Most of the drive manufacturers switched to 1-year warranties in October 2002;
 3-year-warranty drives sold out within a few months.
 Exception: Western Digital continued offering 3-year warranties
-on its Special Edition Caviar (WD400JB, WD600JB, WD800JB, etc.) drives.
+on its Special Edition Caviar
+(WD400JB, WD600JB, WD800JB, etc.;
+SATA versions: WD2000JD, etc.)
+drives.
 So I switched to those.
 (The 3-year warranty is standard, not an extended warranty.
 Western Digital doesn't offer a lower-cost 1-year-warranty option.
@@ -202,8 +205,8 @@
 15" LCDs from various warehouses
 reached the magical price points of $299 in 2001 and $249 in 2003.
 For comparison, typical 17" CRT prices remained stable between $100 and $200.
-A typical 15" LCD with DVI input now costs $300.
-15" LCDs are easier to read than 17" CRTs,
+A typical 17" LCD with DVI input now costs slightly over $200.
+17" LCDs are easier to read than 19" CRTs,
 are easier to move around,
 take less desk space,
 use less power,
@@ -286,20 +289,25 @@
 I am trying to help people take advantage of the hardware they already have;
 I am not suggesting that more of this hardware should be produced.
 <p>
-Apple's 2004.09.18
+Apple's 2005.04.27
 <a href="http://www.apple.com/education/pricelists">university price list</a>
 (Collegiate Purchase Program Price List)
 shows a $1799 Power Mac G5
-with two 1800MHz processors,
-256MB non-ECC DDR400 memory,
-an 80GB hard drive,
+with two 2000MHz processors,
+512MB non-ECC DDR400 memory,
+a 160GB hard drive,
 a video card,
 a DVD/CD-RW drive,
 a 10/100/1000 Ethernet card,
 a modem,
 a keyboard,
 and a mouse.
-(Apple's 2003.07.19, 2003.12.13, and 2004.03.13
+(Apple's 2004.09.18
+list showed a $1799 Power Mac G5
+with two 1800MHz processors,
+256MB non-ECC DDR400 memory,
+and an 80GB hard drive.
+Apple's 2003.07.19, 2003.12.13, and 2004.03.13
 lists showed an $1199 Power Mac G4
 with one 1250MHz processor
 and 256MB of slower memory.)
@@ -311,15 +319,7 @@
 You'd sell a lot more of your software
 if you stopped trying to use it as a tool to sell your overpriced hardware.
 <p>
-Similarly, on 2004.01.19,
-Sun's
-<a href="http://www.sun.com/products-n-solutions/edu/promotions/hardware.html">university price list</a>
-showed a $995 Sun Blade 150 workstation
-with a 550MHz UltraSPARC IIi processor,
-256MB memory,
-an 80GB hard drive,
-etc.
-Sure, it's a nice computer,
-but it's terribly slow compared to the standard workstation.
+I used to include UltraSPARC prices here as another example,
+but Sun seems to have given up on the UltraSPARC workstation market.
 </body>
 </html>
diff -ru .old-crypto/hardware/assembly.html cr.yp.to/hardware/assembly.html
--- .old-crypto/hardware/assembly.html	2004-12-16 08:16:17.000000000 -0500
+++ cr.yp.to/hardware/assembly.html	2005-05-15 00:29:20.000000000 -0400
@@ -4,6 +4,24 @@
 <a href="../djb.html">D. J. Bernstein</a>
 <br><a href="../hardware.html">Computer hardware</a>
 <h1>Assembling a computer from components</h1>
+<h2>Assembling the 2005.05.14 standard workstation</h2>
+The instructions below are for the 2004.10.10 standard workstation.
+The 2005.05.14 standard workstation has the following changes:
+<ul>
+<li>The UATA hard drive (and cable) have been replaced by a SATA hard drive
+(cable included with the motherboard).
+Effects on assembly:
+the hard drive uses a different cable from the one shown below,
+and plugs into a different spot on the motherboard.
+<li>The Zalman fan has been replaced by a three-speed Antec fan
+with a 4-pin power connector.
+Effects on assembly:
+the fan plugs into main power instead of the motherboard;
+the power-supply fan plugs into the motherboard.
+<li>The video card and DVD-ROM drive are different.
+Effects on assembly:
+none, but slightly different pictures.
+</ul>
 <h2>Assembling the 2004.10.10 standard workstation</h2>
 The 2004.10.10 standard workstation
 is a very nice x86 (Intel-compatible) computer:
New: hardware/old/advice-20041010.html
diff -ru .old-crypto/snuffle.html cr.yp.to/snuffle.html
--- .old-crypto/snuffle.html	2005-05-05 21:07:13.000000000 -0400
+++ cr.yp.to/snuffle.html	2005-05-14 04:35:56.000000000 -0400
@@ -47,6 +47,9 @@
 estimates Salsa20's performance on those benchmarks;
 and explains, at a lower level,
 techniques to achieve this performance.
+See the
+<a href="salsa20.html">Salsa20 hash function</a> page
+for updated speed information and the asm implementations.
 </ul>
 <p>
 Here is the test implementation: