Merged origin/release (checked in because wanted to merge new stuff)

1 files changed, 177 insertions, 144 deletions

diff --git a/openssl/crypto/des/spr.h b/openssl/crypto/des/spr.h
index b91936a5a..4d946395a 100644
--- a/openssl/crypto/des/spr.h
+++ b/openssl/crypto/des/spr.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@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 
+ * 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 (tjh@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
@@ -49,156 +49,189 @@
  * 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.]
  */
 
-OPENSSL_GLOBAL const DES_LONG DES_SPtrans[8][64]={
-{
+OPENSSL_GLOBAL const DES_LONG DES_SPtrans[8][64] = {
+    {
 /* nibble 0 */
-0x02080800L, 0x00080000L, 0x02000002L, 0x02080802L,
-0x02000000L, 0x00080802L, 0x00080002L, 0x02000002L,
-0x00080802L, 0x02080800L, 0x02080000L, 0x00000802L,
-0x02000802L, 0x02000000L, 0x00000000L, 0x00080002L,
-0x00080000L, 0x00000002L, 0x02000800L, 0x00080800L,
-0x02080802L, 0x02080000L, 0x00000802L, 0x02000800L,
-0x00000002L, 0x00000800L, 0x00080800L, 0x02080002L,
-0x00000800L, 0x02000802L, 0x02080002L, 0x00000000L,
-0x00000000L, 0x02080802L, 0x02000800L, 0x00080002L,
-0x02080800L, 0x00080000L, 0x00000802L, 0x02000800L,
-0x02080002L, 0x00000800L, 0x00080800L, 0x02000002L,
-0x00080802L, 0x00000002L, 0x02000002L, 0x02080000L,
-0x02080802L, 0x00080800L, 0x02080000L, 0x02000802L,
-0x02000000L, 0x00000802L, 0x00080002L, 0x00000000L,
-0x00080000L, 0x02000000L, 0x02000802L, 0x02080800L,
-0x00000002L, 0x02080002L, 0x00000800L, 0x00080802L,
-},{
+     0x02080800L, 0x00080000L, 0x02000002L, 0x02080802L,
+     0x02000000L, 0x00080802L, 0x00080002L, 0x02000002L,
+     0x00080802L, 0x02080800L, 0x02080000L, 0x00000802L,
+     0x02000802L, 0x02000000L, 0x00000000L, 0x00080002L,
+     0x00080000L, 0x00000002L, 0x02000800L, 0x00080800L,
+     0x02080802L, 0x02080000L, 0x00000802L, 0x02000800L,
+     0x00000002L, 0x00000800L, 0x00080800L, 0x02080002L,
+     0x00000800L, 0x02000802L, 0x02080002L, 0x00000000L,
+     0x00000000L, 0x02080802L, 0x02000800L, 0x00080002L,
+     0x02080800L, 0x00080000L, 0x00000802L, 0x02000800L,
+     0x02080002L, 0x00000800L, 0x00080800L, 0x02000002L,
+     0x00080802L, 0x00000002L, 0x02000002L, 0x02080000L,
+     0x02080802L, 0x00080800L, 0x02080000L, 0x02000802L,
+     0x02000000L, 0x00000802L, 0x00080002L, 0x00000000L,
+     0x00080000L, 0x02000000L, 0x02000802L, 0x02080800L,
+     0x00000002L, 0x02080002L, 0x00000800L, 0x00080802L,
+     }, {
 /* nibble 1 */
-0x40108010L, 0x00000000L, 0x00108000L, 0x40100000L,
-0x40000010L, 0x00008010L, 0x40008000L, 0x00108000L,
-0x00008000L, 0x40100010L, 0x00000010L, 0x40008000L,
-0x00100010L, 0x40108000L, 0x40100000L, 0x00000010L,
-0x00100000L, 0x40008010L, 0x40100010L, 0x00008000L,
-0x00108010L, 0x40000000L, 0x00000000L, 0x00100010L,
-0x40008010L, 0x00108010L, 0x40108000L, 0x40000010L,
-0x40000000L, 0x00100000L, 0x00008010L, 0x40108010L,
-0x00100010L, 0x40108000L, 0x40008000L, 0x00108010L,
-0x40108010L, 0x00100010L, 0x40000010L, 0x00000000L,
-0x40000000L, 0x00008010L, 0x00100000L, 0x40100010L,
-0x00008000L, 0x40000000L, 0x00108010L, 0x40008010L,
-0x40108000L, 0x00008000L, 0x00000000L, 0x40000010L,
-0x00000010L, 0x40108010L, 0x00108000L, 0x40100000L,
-0x40100010L, 0x00100000L, 0x00008010L, 0x40008000L,
-0x40008010L, 0x00000010L, 0x40100000L, 0x00108000L,
-},{
+         0x40108010L, 0x00000000L, 0x00108000L, 0x40100000L,
+         0x40000010L, 0x00008010L, 0x40008000L, 0x00108000L,
+         0x00008000L, 0x40100010L, 0x00000010L, 0x40008000L,
+         0x00100010L, 0x40108000L, 0x40100000L, 0x00000010L,
+         0x00100000L, 0x40008010L, 0x40100010L, 0x00008000L,
+         0x00108010L, 0x40000000L, 0x00000000L, 0x00100010L,
+         0x40008010L, 0x00108010L, 0x40108000L, 0x40000010L,
+         0x40000000L, 0x00100000L, 0x00008010L, 0x40108010L,
+         0x00100010L, 0x40108000L, 0x40008000L, 0x00108010L,
+         0x40108010L, 0x00100010L, 0x40000010L, 0x00000000L,
+         0x40000000L, 0x00008010L, 0x00100000L, 0x40100010L,
+         0x00008000L, 0x40000000L, 0x00108010L, 0x40008010L,
+         0x40108000L, 0x00008000L, 0x00000000L, 0x40000010L,
+         0x00000010L, 0x40108010L, 0x00108000L, 0x40100000L,
+         0x40100010L, 0x00100000L, 0x00008010L, 0x40008000L,
+         0x40008010L, 0x00000010L, 0x40100000L, 0x00108000L,
+         }, {
 /* nibble 2 */
-0x04000001L, 0x04040100L, 0x00000100L, 0x04000101L,
-0x00040001L, 0x04000000L, 0x04000101L, 0x00040100L,
-0x04000100L, 0x00040000L, 0x04040000L, 0x00000001L,
-0x04040101L, 0x00000101L, 0x00000001L, 0x04040001L,
-0x00000000L, 0x00040001L, 0x04040100L, 0x00000100L,
-0x00000101L, 0x04040101L, 0x00040000L, 0x04000001L,
-0x04040001L, 0x04000100L, 0x00040101L, 0x04040000L,
-0x00040100L, 0x00000000L, 0x04000000L, 0x00040101L,
-0x04040100L, 0x00000100L, 0x00000001L, 0x00040000L,
-0x00000101L, 0x00040001L, 0x04040000L, 0x04000101L,
-0x00000000L, 0x04040100L, 0x00040100L, 0x04040001L,
-0x00040001L, 0x04000000L, 0x04040101L, 0x00000001L,
-0x00040101L, 0x04000001L, 0x04000000L, 0x04040101L,
-0x00040000L, 0x04000100L, 0x04000101L, 0x00040100L,
-0x04000100L, 0x00000000L, 0x04040001L, 0x00000101L,
-0x04000001L, 0x00040101L, 0x00000100L, 0x04040000L,
-},{
+             0x04000001L, 0x04040100L, 0x00000100L, 0x04000101L,
+             0x00040001L, 0x04000000L, 0x04000101L, 0x00040100L,
+             0x04000100L, 0x00040000L, 0x04040000L, 0x00000001L,
+             0x04040101L, 0x00000101L, 0x00000001L, 0x04040001L,
+             0x00000000L, 0x00040001L, 0x04040100L, 0x00000100L,
+             0x00000101L, 0x04040101L, 0x00040000L, 0x04000001L,
+             0x04040001L, 0x04000100L, 0x00040101L, 0x04040000L,
+             0x00040100L, 0x00000000L, 0x04000000L, 0x00040101L,
+             0x04040100L, 0x00000100L, 0x00000001L, 0x00040000L,
+             0x00000101L, 0x00040001L, 0x04040000L, 0x04000101L,
+             0x00000000L, 0x04040100L, 0x00040100L, 0x04040001L,
+             0x00040001L, 0x04000000L, 0x04040101L, 0x00000001L,
+             0x00040101L, 0x04000001L, 0x04000000L, 0x04040101L,
+             0x00040000L, 0x04000100L, 0x04000101L, 0x00040100L,
+             0x04000100L, 0x00000000L, 0x04040001L, 0x00000101L,
+             0x04000001L, 0x00040101L, 0x00000100L, 0x04040000L,
+             }, {
 /* nibble 3 */
-0x00401008L, 0x10001000L, 0x00000008L, 0x10401008L,
-0x00000000L, 0x10400000L, 0x10001008L, 0x00400008L,
-0x10401000L, 0x10000008L, 0x10000000L, 0x00001008L,
-0x10000008L, 0x00401008L, 0x00400000L, 0x10000000L,
-0x10400008L, 0x00401000L, 0x00001000L, 0x00000008L,
-0x00401000L, 0x10001008L, 0x10400000L, 0x00001000L,
-0x00001008L, 0x00000000L, 0x00400008L, 0x10401000L,
-0x10001000L, 0x10400008L, 0x10401008L, 0x00400000L,
-0x10400008L, 0x00001008L, 0x00400000L, 0x10000008L,
-0x00401000L, 0x10001000L, 0x00000008L, 0x10400000L,
-0x10001008L, 0x00000000L, 0x00001000L, 0x00400008L,
-0x00000000L, 0x10400008L, 0x10401000L, 0x00001000L,
-0x10000000L, 0x10401008L, 0x00401008L, 0x00400000L,
-0x10401008L, 0x00000008L, 0x10001000L, 0x00401008L,
-0x00400008L, 0x00401000L, 0x10400000L, 0x10001008L,
-0x00001008L, 0x10000000L, 0x10000008L, 0x10401000L,
-},{
+                 0x00401008L, 0x10001000L, 0x00000008L, 0x10401008L,
+                 0x00000000L, 0x10400000L, 0x10001008L, 0x00400008L,
+                 0x10401000L, 0x10000008L, 0x10000000L, 0x00001008L,
+                 0x10000008L, 0x00401008L, 0x00400000L, 0x10000000L,
+                 0x10400008L, 0x00401000L, 0x00001000L, 0x00000008L,
+                 0x00401000L, 0x10001008L, 0x10400000L, 0x00001000L,
+                 0x00001008L, 0x00000000L, 0x00400008L, 0x10401000L,
+                 0x10001000L, 0x10400008L, 0x10401008L, 0x00400000L,
+                 0x10400008L, 0x00001008L, 0x00400000L, 0x10000008L,
+                 0x00401000L, 0x10001000L, 0x00000008L, 0x10400000L,
+                 0x10001008L, 0x00000000L, 0x00001000L, 0x00400008L,
+                 0x00000000L, 0x10400008L, 0x10401000L, 0x00001000L,
+                 0x10000000L, 0x10401008L, 0x00401008L, 0x00400000L,
+                 0x10401008L, 0x00000008L, 0x10001000L, 0x00401008L,
+                 0x00400008L, 0x00401000L, 0x10400000L, 0x10001008L,
+                 0x00001008L, 0x10000000L, 0x10000008L, 0x10401000L,
+                 }, {
 /* nibble 4 */
-0x08000000L, 0x00010000L, 0x00000400L, 0x08010420L,
-0x08010020L, 0x08000400L, 0x00010420L, 0x08010000L,
-0x00010000L, 0x00000020L, 0x08000020L, 0x00010400L,
-0x08000420L, 0x08010020L, 0x08010400L, 0x00000000L,
-0x00010400L, 0x08000000L, 0x00010020L, 0x00000420L,
-0x08000400L, 0x00010420L, 0x00000000L, 0x08000020L,
-0x00000020L, 0x08000420L, 0x08010420L, 0x00010020L,
-0x08010000L, 0x00000400L, 0x00000420L, 0x08010400L,
-0x08010400L, 0x08000420L, 0x00010020L, 0x08010000L,
-0x00010000L, 0x00000020L, 0x08000020L, 0x08000400L,
-0x08000000L, 0x00010400L, 0x08010420L, 0x00000000L,
-0x00010420L, 0x08000000L, 0x00000400L, 0x00010020L,
-0x08000420L, 0x00000400L, 0x00000000L, 0x08010420L,
-0x08010020L, 0x08010400L, 0x00000420L, 0x00010000L,
-0x00010400L, 0x08010020L, 0x08000400L, 0x00000420L,
-0x00000020L, 0x00010420L, 0x08010000L, 0x08000020L,
-},{
+                     0x08000000L, 0x00010000L, 0x00000400L, 0x08010420L,
+                     0x08010020L, 0x08000400L, 0x00010420L, 0x08010000L,
+                     0x00010000L, 0x00000020L, 0x08000020L, 0x00010400L,
+                     0x08000420L, 0x08010020L, 0x08010400L, 0x00000000L,
+                     0x00010400L, 0x08000000L, 0x00010020L, 0x00000420L,
+                     0x08000400L, 0x00010420L, 0x00000000L, 0x08000020L,
+                     0x00000020L, 0x08000420L, 0x08010420L, 0x00010020L,
+                     0x08010000L, 0x00000400L, 0x00000420L, 0x08010400L,
+                     0x08010400L, 0x08000420L, 0x00010020L, 0x08010000L,
+                     0x00010000L, 0x00000020L, 0x08000020L, 0x08000400L,
+                     0x08000000L, 0x00010400L, 0x08010420L, 0x00000000L,
+                     0x00010420L, 0x08000000L, 0x00000400L, 0x00010020L,
+                     0x08000420L, 0x00000400L, 0x00000000L, 0x08010420L,
+                     0x08010020L, 0x08010400L, 0x00000420L, 0x00010000L,
+                     0x00010400L, 0x08010020L, 0x08000400L, 0x00000420L,
+                     0x00000020L, 0x00010420L, 0x08010000L, 0x08000020L,
+                     }, {
 /* nibble 5 */
-0x80000040L, 0x00200040L, 0x00000000L, 0x80202000L,
-0x00200040L, 0x00002000L, 0x80002040L, 0x00200000L,
-0x00002040L, 0x80202040L, 0x00202000L, 0x80000000L,
-0x80002000L, 0x80000040L, 0x80200000L, 0x00202040L,
-0x00200000L, 0x80002040L, 0x80200040L, 0x00000000L,
-0x00002000L, 0x00000040L, 0x80202000L, 0x80200040L,
-0x80202040L, 0x80200000L, 0x80000000L, 0x00002040L,
-0x00000040L, 0x00202000L, 0x00202040L, 0x80002000L,
-0x00002040L, 0x80000000L, 0x80002000L, 0x00202040L,
-0x80202000L, 0x00200040L, 0x00000000L, 0x80002000L,
-0x80000000L, 0x00002000L, 0x80200040L, 0x00200000L,
-0x00200040L, 0x80202040L, 0x00202000L, 0x00000040L,
-0x80202040L, 0x00202000L, 0x00200000L, 0x80002040L,
-0x80000040L, 0x80200000L, 0x00202040L, 0x00000000L,
-0x00002000L, 0x80000040L, 0x80002040L, 0x80202000L,
-0x80200000L, 0x00002040L, 0x00000040L, 0x80200040L,
-},{
+                         0x80000040L, 0x00200040L, 0x00000000L, 0x80202000L,
+                         0x00200040L, 0x00002000L, 0x80002040L, 0x00200000L,
+                         0x00002040L, 0x80202040L, 0x00202000L, 0x80000000L,
+                         0x80002000L, 0x80000040L, 0x80200000L, 0x00202040L,
+                         0x00200000L, 0x80002040L, 0x80200040L, 0x00000000L,
+                         0x00002000L, 0x00000040L, 0x80202000L, 0x80200040L,
+                         0x80202040L, 0x80200000L, 0x80000000L, 0x00002040L,
+                         0x00000040L, 0x00202000L, 0x00202040L, 0x80002000L,
+                         0x00002040L, 0x80000000L, 0x80002000L, 0x00202040L,
+                         0x80202000L, 0x00200040L, 0x00000000L, 0x80002000L,
+                         0x80000000L, 0x00002000L, 0x80200040L, 0x00200000L,
+                         0x00200040L, 0x80202040L, 0x00202000L, 0x00000040L,
+                         0x80202040L, 0x00202000L, 0x00200000L, 0x80002040L,
+                         0x80000040L, 0x80200000L, 0x00202040L, 0x00000000L,
+                         0x00002000L, 0x80000040L, 0x80002040L, 0x80202000L,
+                         0x80200000L, 0x00002040L, 0x00000040L, 0x80200040L,
+                         }, {
 /* nibble 6 */
-0x00004000L, 0x00000200L, 0x01000200L, 0x01000004L,
-0x01004204L, 0x00004004L, 0x00004200L, 0x00000000L,
-0x01000000L, 0x01000204L, 0x00000204L, 0x01004000L,
-0x00000004L, 0x01004200L, 0x01004000L, 0x00000204L,
-0x01000204L, 0x00004000L, 0x00004004L, 0x01004204L,
-0x00000000L, 0x01000200L, 0x01000004L, 0x00004200L,
-0x01004004L, 0x00004204L, 0x01004200L, 0x00000004L,
-0x00004204L, 0x01004004L, 0x00000200L, 0x01000000L,
-0x00004204L, 0x01004000L, 0x01004004L, 0x00000204L,
-0x00004000L, 0x00000200L, 0x01000000L, 0x01004004L,
-0x01000204L, 0x00004204L, 0x00004200L, 0x00000000L,
-0x00000200L, 0x01000004L, 0x00000004L, 0x01000200L,
-0x00000000L, 0x01000204L, 0x01000200L, 0x00004200L,
-0x00000204L, 0x00004000L, 0x01004204L, 0x01000000L,
-0x01004200L, 0x00000004L, 0x00004004L, 0x01004204L,
-0x01000004L, 0x01004200L, 0x01004000L, 0x00004004L,
-},{
+                             0x00004000L, 0x00000200L, 0x01000200L,
+                             0x01000004L,
+                             0x01004204L, 0x00004004L, 0x00004200L,
+                             0x00000000L,
+                             0x01000000L, 0x01000204L, 0x00000204L,
+                             0x01004000L,
+                             0x00000004L, 0x01004200L, 0x01004000L,
+                             0x00000204L,
+                             0x01000204L, 0x00004000L, 0x00004004L,
+                             0x01004204L,
+                             0x00000000L, 0x01000200L, 0x01000004L,
+                             0x00004200L,
+                             0x01004004L, 0x00004204L, 0x01004200L,
+                             0x00000004L,
+                             0x00004204L, 0x01004004L, 0x00000200L,
+                             0x01000000L,
+                             0x00004204L, 0x01004000L, 0x01004004L,
+                             0x00000204L,
+                             0x00004000L, 0x00000200L, 0x01000000L,
+                             0x01004004L,
+                             0x01000204L, 0x00004204L, 0x00004200L,
+                             0x00000000L,
+                             0x00000200L, 0x01000004L, 0x00000004L,
+                             0x01000200L,
+                             0x00000000L, 0x01000204L, 0x01000200L,
+                             0x00004200L,
+                             0x00000204L, 0x00004000L, 0x01004204L,
+                             0x01000000L,
+                             0x01004200L, 0x00000004L, 0x00004004L,
+                             0x01004204L,
+                             0x01000004L, 0x01004200L, 0x01004000L,
+                             0x00004004L,
+                             }, {
 /* nibble 7 */
-0x20800080L, 0x20820000L, 0x00020080L, 0x00000000L,
-0x20020000L, 0x00800080L, 0x20800000L, 0x20820080L,
-0x00000080L, 0x20000000L, 0x00820000L, 0x00020080L,
-0x00820080L, 0x20020080L, 0x20000080L, 0x20800000L,
-0x00020000L, 0x00820080L, 0x00800080L, 0x20020000L,
-0x20820080L, 0x20000080L, 0x00000000L, 0x00820000L,
-0x20000000L, 0x00800000L, 0x20020080L, 0x20800080L,
-0x00800000L, 0x00020000L, 0x20820000L, 0x00000080L,
-0x00800000L, 0x00020000L, 0x20000080L, 0x20820080L,
-0x00020080L, 0x20000000L, 0x00000000L, 0x00820000L,
-0x20800080L, 0x20020080L, 0x20020000L, 0x00800080L,
-0x20820000L, 0x00000080L, 0x00800080L, 0x20020000L,
-0x20820080L, 0x00800000L, 0x20800000L, 0x20000080L,
-0x00820000L, 0x00020080L, 0x20020080L, 0x20800000L,
-0x00000080L, 0x20820000L, 0x00820080L, 0x00000000L,
-0x20000000L, 0x20800080L, 0x00020000L, 0x00820080L,
-}};
+                                 0x20800080L, 0x20820000L, 0x00020080L,
+                                 0x00000000L,
+                                 0x20020000L, 0x00800080L, 0x20800000L,
+                                 0x20820080L,
+                                 0x00000080L, 0x20000000L, 0x00820000L,
+                                 0x00020080L,
+                                 0x00820080L, 0x20020080L, 0x20000080L,
+                                 0x20800000L,
+                                 0x00020000L, 0x00820080L, 0x00800080L,
+                                 0x20020000L,
+                                 0x20820080L, 0x20000080L, 0x00000000L,
+                                 0x00820000L,
+                                 0x20000000L, 0x00800000L, 0x20020080L,
+                                 0x20800080L,
+                                 0x00800000L, 0x00020000L, 0x20820000L,
+                                 0x00000080L,
+                                 0x00800000L, 0x00020000L, 0x20000080L,
+                                 0x20820080L,
+                                 0x00020080L, 0x20000000L, 0x00000000L,
+                                 0x00820000L,
+                                 0x20800080L, 0x20020080L, 0x20020000L,
+                                 0x00800080L,
+                                 0x20820000L, 0x00000080L, 0x00800080L,
+                                 0x20020000L,
+                                 0x20820080L, 0x00800000L, 0x20800000L,
+                                 0x20000080L,
+                                 0x00820000L, 0x00020080L, 0x20020080L,
+                                 0x20800000L,
+                                 0x00000080L, 0x20820000L, 0x00820080L,
+                                 0x00000000L,
+                                 0x20000000L, 0x20800080L, 0x00020000L,
+                                 0x00820080L,
+                                 }
+};