1 files changed, 177 insertions, 22 deletions
diff --git a/src/lib/libcrypto/des/set_key.c b/src/lib/libcrypto/des/set_key.c
index bbdc71ba6b..09afd4fc03 100644
--- a/src/lib/libcrypto/des/set_key.c
+++ b/src/lib/libcrypto/des/set_key.c
@@ -64,12 +64,27 @@
 * 1.0 First working version
 */
 #include "des_locl.h"
-#include "podd.h"
-#include "sk.h"
-static int check_parity(const_des_cblock *key);
 OPENSSL_GLOBAL int des_check_key=0;
+static const unsigned char odd_parity[256]={
+  1,  1,  2,  2,  4,  4,  7,  7,  8,  8, 11, 11, 13, 13, 14, 14,
+ 16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31,
+ 32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47,
+ 49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62,
+ 64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79,
+ 81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94,
+ 97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110,
+112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127,
+128,128,131,131,133,133,134,134,137,137,138,138,140,140,143,143,
+145,145,146,146,148,148,151,151,152,152,155,155,157,157,158,158,
+161,161,162,162,164,164,167,167,168,168,171,171,173,173,174,174,
+176,176,179,179,181,181,182,182,185,185,186,186,188,188,191,191,
+193,193,194,194,196,196,199,199,200,200,203,203,205,205,206,206,
+208,208,211,211,213,213,214,214,217,217,218,218,220,220,223,223,
+224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239,
+241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254};
 void des_set_odd_parity(des_cblock *key)
        {
        int i;
@@ -78,7 +93,7 @@ void des_set_odd_parity(des_cblock *key)
                (*key)[i]=odd_parity[(*key)[i]];
        }
-static int check_parity(const_des_cblock *key)
+int des_check_key_parity(const_des_cblock *key)
        {
        int i;
@@ -145,6 +160,153 @@ int des_is_weak_key(const_des_cblock *key)
 #define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
        (a)=(a)^(t)^(t>>(16-(n))))
+static const DES_LONG des_skb[8][64]={
+        {
+        /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
+        0x00000000L,0x00000010L,0x20000000L,0x20000010L,
+        0x00010000L,0x00010010L,0x20010000L,0x20010010L,
+        0x00000800L,0x00000810L,0x20000800L,0x20000810L,
+        0x00010800L,0x00010810L,0x20010800L,0x20010810L,
+        0x00000020L,0x00000030L,0x20000020L,0x20000030L,
+        0x00010020L,0x00010030L,0x20010020L,0x20010030L,
+        0x00000820L,0x00000830L,0x20000820L,0x20000830L,
+        0x00010820L,0x00010830L,0x20010820L,0x20010830L,
+        0x00080000L,0x00080010L,0x20080000L,0x20080010L,
+        0x00090000L,0x00090010L,0x20090000L,0x20090010L,
+        0x00080800L,0x00080810L,0x20080800L,0x20080810L,
+        0x00090800L,0x00090810L,0x20090800L,0x20090810L,
+        0x00080020L,0x00080030L,0x20080020L,0x20080030L,
+        0x00090020L,0x00090030L,0x20090020L,0x20090030L,
+        0x00080820L,0x00080830L,0x20080820L,0x20080830L,
+        0x00090820L,0x00090830L,0x20090820L,0x20090830L,
+        },{
+        /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
+        0x00000000L,0x02000000L,0x00002000L,0x02002000L,
+        0x00200000L,0x02200000L,0x00202000L,0x02202000L,
+        0x00000004L,0x02000004L,0x00002004L,0x02002004L,
+        0x00200004L,0x02200004L,0x00202004L,0x02202004L,
+        0x00000400L,0x02000400L,0x00002400L,0x02002400L,
+        0x00200400L,0x02200400L,0x00202400L,0x02202400L,
+        0x00000404L,0x02000404L,0x00002404L,0x02002404L,
+        0x00200404L,0x02200404L,0x00202404L,0x02202404L,
+        0x10000000L,0x12000000L,0x10002000L,0x12002000L,
+        0x10200000L,0x12200000L,0x10202000L,0x12202000L,
+        0x10000004L,0x12000004L,0x10002004L,0x12002004L,
+        0x10200004L,0x12200004L,0x10202004L,0x12202004L,
+        0x10000400L,0x12000400L,0x10002400L,0x12002400L,
+        0x10200400L,0x12200400L,0x10202400L,0x12202400L,
+        0x10000404L,0x12000404L,0x10002404L,0x12002404L,
+        0x10200404L,0x12200404L,0x10202404L,0x12202404L,
+        },{
+        /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
+        0x00000000L,0x00000001L,0x00040000L,0x00040001L,
+        0x01000000L,0x01000001L,0x01040000L,0x01040001L,
+        0x00000002L,0x00000003L,0x00040002L,0x00040003L,
+        0x01000002L,0x01000003L,0x01040002L,0x01040003L,
+        0x00000200L,0x00000201L,0x00040200L,0x00040201L,
+        0x01000200L,0x01000201L,0x01040200L,0x01040201L,
+        0x00000202L,0x00000203L,0x00040202L,0x00040203L,
+        0x01000202L,0x01000203L,0x01040202L,0x01040203L,
+        0x08000000L,0x08000001L,0x08040000L,0x08040001L,
+        0x09000000L,0x09000001L,0x09040000L,0x09040001L,
+        0x08000002L,0x08000003L,0x08040002L,0x08040003L,
+        0x09000002L,0x09000003L,0x09040002L,0x09040003L,
+        0x08000200L,0x08000201L,0x08040200L,0x08040201L,
+        0x09000200L,0x09000201L,0x09040200L,0x09040201L,
+        0x08000202L,0x08000203L,0x08040202L,0x08040203L,
+        0x09000202L,0x09000203L,0x09040202L,0x09040203L,
+        },{
+        /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
+        0x00000000L,0x00100000L,0x00000100L,0x00100100L,
+        0x00000008L,0x00100008L,0x00000108L,0x00100108L,
+        0x00001000L,0x00101000L,0x00001100L,0x00101100L,
+        0x00001008L,0x00101008L,0x00001108L,0x00101108L,
+        0x04000000L,0x04100000L,0x04000100L,0x04100100L,
+        0x04000008L,0x04100008L,0x04000108L,0x04100108L,
+        0x04001000L,0x04101000L,0x04001100L,0x04101100L,
+        0x04001008L,0x04101008L,0x04001108L,0x04101108L,
+        0x00020000L,0x00120000L,0x00020100L,0x00120100L,
+        0x00020008L,0x00120008L,0x00020108L,0x00120108L,
+        0x00021000L,0x00121000L,0x00021100L,0x00121100L,
+        0x00021008L,0x00121008L,0x00021108L,0x00121108L,
+        0x04020000L,0x04120000L,0x04020100L,0x04120100L,
+        0x04020008L,0x04120008L,0x04020108L,0x04120108L,
+        0x04021000L,0x04121000L,0x04021100L,0x04121100L,
+        0x04021008L,0x04121008L,0x04021108L,0x04121108L,
+        },{
+        /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
+        0x00000000L,0x10000000L,0x00010000L,0x10010000L,
+        0x00000004L,0x10000004L,0x00010004L,0x10010004L,
+        0x20000000L,0x30000000L,0x20010000L,0x30010000L,
+        0x20000004L,0x30000004L,0x20010004L,0x30010004L,
+        0x00100000L,0x10100000L,0x00110000L,0x10110000L,
+        0x00100004L,0x10100004L,0x00110004L,0x10110004L,
+        0x20100000L,0x30100000L,0x20110000L,0x30110000L,
+        0x20100004L,0x30100004L,0x20110004L,0x30110004L,
+        0x00001000L,0x10001000L,0x00011000L,0x10011000L,
+        0x00001004L,0x10001004L,0x00011004L,0x10011004L,
+        0x20001000L,0x30001000L,0x20011000L,0x30011000L,
+        0x20001004L,0x30001004L,0x20011004L,0x30011004L,
+        0x00101000L,0x10101000L,0x00111000L,0x10111000L,
+        0x00101004L,0x10101004L,0x00111004L,0x10111004L,
+        0x20101000L,0x30101000L,0x20111000L,0x30111000L,
+        0x20101004L,0x30101004L,0x20111004L,0x30111004L,
+        },{
+        /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
+        0x00000000L,0x08000000L,0x00000008L,0x08000008L,
+        0x00000400L,0x08000400L,0x00000408L,0x08000408L,
+        0x00020000L,0x08020000L,0x00020008L,0x08020008L,
+        0x00020400L,0x08020400L,0x00020408L,0x08020408L,
+        0x00000001L,0x08000001L,0x00000009L,0x08000009L,
+        0x00000401L,0x08000401L,0x00000409L,0x08000409L,
+        0x00020001L,0x08020001L,0x00020009L,0x08020009L,
+        0x00020401L,0x08020401L,0x00020409L,0x08020409L,
+        0x02000000L,0x0A000000L,0x02000008L,0x0A000008L,
+        0x02000400L,0x0A000400L,0x02000408L,0x0A000408L,
+        0x02020000L,0x0A020000L,0x02020008L,0x0A020008L,
+        0x02020400L,0x0A020400L,0x02020408L,0x0A020408L,
+        0x02000001L,0x0A000001L,0x02000009L,0x0A000009L,
+        0x02000401L,0x0A000401L,0x02000409L,0x0A000409L,
+        0x02020001L,0x0A020001L,0x02020009L,0x0A020009L,
+        0x02020401L,0x0A020401L,0x02020409L,0x0A020409L,
+        },{
+        /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
+        0x00000000L,0x00000100L,0x00080000L,0x00080100L,
+        0x01000000L,0x01000100L,0x01080000L,0x01080100L,
+        0x00000010L,0x00000110L,0x00080010L,0x00080110L,
+        0x01000010L,0x01000110L,0x01080010L,0x01080110L,
+        0x00200000L,0x00200100L,0x00280000L,0x00280100L,
+        0x01200000L,0x01200100L,0x01280000L,0x01280100L,
+        0x00200010L,0x00200110L,0x00280010L,0x00280110L,
+        0x01200010L,0x01200110L,0x01280010L,0x01280110L,
+        0x00000200L,0x00000300L,0x00080200L,0x00080300L,
+        0x01000200L,0x01000300L,0x01080200L,0x01080300L,
+        0x00000210L,0x00000310L,0x00080210L,0x00080310L,
+        0x01000210L,0x01000310L,0x01080210L,0x01080310L,
+        0x00200200L,0x00200300L,0x00280200L,0x00280300L,
+        0x01200200L,0x01200300L,0x01280200L,0x01280300L,
+        0x00200210L,0x00200310L,0x00280210L,0x00280310L,
+        0x01200210L,0x01200310L,0x01280210L,0x01280310L,
+        },{
+        /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
+        0x00000000L,0x04000000L,0x00040000L,0x04040000L,
+        0x00000002L,0x04000002L,0x00040002L,0x04040002L,
+        0x00002000L,0x04002000L,0x00042000L,0x04042000L,
+        0x00002002L,0x04002002L,0x00042002L,0x04042002L,
+        0x00000020L,0x04000020L,0x00040020L,0x04040020L,
+        0x00000022L,0x04000022L,0x00040022L,0x04040022L,
+        0x00002020L,0x04002020L,0x00042020L,0x04042020L,
+        0x00002022L,0x04002022L,0x00042022L,0x04042022L,
+        0x00000800L,0x04000800L,0x00040800L,0x04040800L,
+        0x00000802L,0x04000802L,0x00040802L,0x04040802L,
+        0x00002800L,0x04002800L,0x00042800L,0x04042800L,
+        0x00002802L,0x04002802L,0x00042802L,0x04042802L,
+        0x00000820L,0x04000820L,0x00040820L,0x04040820L,
+        0x00000822L,0x04000822L,0x00040822L,0x04040822L,
+        0x00002820L,0x04002820L,0x00042820L,0x04042820L,
+        0x00002822L,0x04002822L,0x00042822L,0x04042822L,
+        }};
 int des_set_key(const_des_cblock *key, des_key_schedule schedule)
        {
        if (des_check_key)
@@ -164,7 +326,7 @@ int des_set_key(const_des_cblock *key, des_key_schedule schedule)
 */
 int des_set_key_checked(const_des_cblock *key, des_key_schedule schedule)
        {
-        if (!check_parity(key))
+        if (!des_check_key_parity(key))
                return(-1);
        if (des_is_weak_key(key))
                return(-2);
@@ -186,20 +348,7 @@ void des_set_key_unchecked(const_des_cblock *key, des_key_schedule schedule)
        c2l(in,c);
        c2l(in,d);
-        /* do PC1 in 60 simple operations */ 
+        /* do PC1 in 47 simple operations :-)
-/*      PERM_OP(d,c,t,4,0x0f0f0f0fL);
-        HPERM_OP(c,t,-2, 0xcccc0000L);
-        HPERM_OP(c,t,-1, 0xaaaa0000L);
-        HPERM_OP(c,t, 8, 0x00ff0000L);
-        HPERM_OP(c,t,-1, 0xaaaa0000L);
-        HPERM_OP(d,t,-8, 0xff000000L);
-        HPERM_OP(d,t, 8, 0x00ff0000L);
-        HPERM_OP(d,t, 2, 0x33330000L);
-        d=((d&0x00aa00aaL)<<7L)|((d&0x55005500L)>>7L)|(d&0xaa55aa55L);
-        d=(d>>8)|((c&0xf0000000L)>>4);
-        c&=0x0fffffffL; */
-        /* I now do it in 47 simple operations :-)
         * Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov)
         * for the inspiration. :-) */
        PERM_OP (d,c,t,4,0x0f0f0f0fL);
@@ -223,9 +372,9 @@ void des_set_key_unchecked(const_des_cblock *key, des_key_schedule schedule)
                /* could be a few less shifts but I am to lazy at this
                 * point in time to investigate */
                s=      des_skb[0][ (c    )&0x3f                ]|
-                        des_skb[1][((c>> 6)&0x03)|((c>> 7L)&0x3c)]|
+                        des_skb[1][((c>> 6L)&0x03)|((c>> 7L)&0x3c)]|
-                        des_skb[2][((c>>13)&0x0f)|((c>>14L)&0x30)]|
+                        des_skb[2][((c>>13L)&0x0f)|((c>>14L)&0x30)]|
-                        des_skb[3][((c>>20)&0x01)|((c>>21L)&0x06) |
+                        des_skb[3][((c>>20L)&0x01)|((c>>21L)&0x06) |
                                                  ((c>>22L)&0x38)];
                t=      des_skb[4][ (d    )&0x3f                ]|
                        des_skb[5][((d>> 7L)&0x03)|((d>> 8L)&0x3c)]|
@@ -245,3 +394,9 @@ int des_key_sched(const_des_cblock *key, des_key_schedule schedule)
        {
        return(des_set_key(key,schedule));
        }
+#undef des_fixup_key_parity
+void des_fixup_key_parity(des_cblock *key)
+        {
+        des_set_odd_parity(key);
+        }

diff --git a/src/lib/libcrypto/des/set_key.c b/src/lib/libcrypto/des/set_key.c index bbdc71ba6b..09afd4fc03 100644 --- a/src/lib/libcrypto/des/set_key.c +++ b/src/lib/libcrypto/des/set_key.c
@@ -64,12 +64,27 @@
64	* 1.0 First working version	64	* 1.0 First working version
65	*/	65	*/
66	#include "des_locl.h"	66	#include "des_locl.h"
67	#include "podd.h"
68	#include "sk.h"
69		67
70	static int check_parity(const_des_cblock *key);
71	OPENSSL_GLOBAL int des_check_key=0;	68	OPENSSL_GLOBAL int des_check_key=0;
72		69
		70	static const unsigned char odd_parity[256]={
		71	1, 1, 2, 2, 4, 4, 7, 7, 8, 8, 11, 11, 13, 13, 14, 14,
		72	16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31,
		73	32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47,
		74	49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62,
		75	64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79,
		76	81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94,
		77	97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110,
		78	112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127,
		79	128,128,131,131,133,133,134,134,137,137,138,138,140,140,143,143,
		80	145,145,146,146,148,148,151,151,152,152,155,155,157,157,158,158,
		81	161,161,162,162,164,164,167,167,168,168,171,171,173,173,174,174,
		82	176,176,179,179,181,181,182,182,185,185,186,186,188,188,191,191,
		83	193,193,194,194,196,196,199,199,200,200,203,203,205,205,206,206,
		84	208,208,211,211,213,213,214,214,217,217,218,218,220,220,223,223,
		85	224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239,
		86	241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254};
		87
73	void des_set_odd_parity(des_cblock *key)	88	void des_set_odd_parity(des_cblock *key)
74	{	89	{
75	int i;	90	int i;
@@ -78,7 +93,7 @@ void des_set_odd_parity(des_cblock *key)
78	(key)[i]=odd_parity[(key)[i]];	93	(key)[i]=odd_parity[(key)[i]];
79	}	94	}
80		95
81	static int check_parity(const_des_cblock *key)	96	int des_check_key_parity(const_des_cblock *key)
82	{	97	{
83	int i;	98	int i;
84		99
@@ -145,6 +160,153 @@ int des_is_weak_key(const_des_cblock *key)
145	#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\	160	#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
146	(a)=(a)^(t)^(t>>(16-(n))))	161	(a)=(a)^(t)^(t>>(16-(n))))
147		162
		163	static const DES_LONG des_skb[8][64]={
		164	{
		165	/* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
		166	0x00000000L,0x00000010L,0x20000000L,0x20000010L,
		167	0x00010000L,0x00010010L,0x20010000L,0x20010010L,
		168	0x00000800L,0x00000810L,0x20000800L,0x20000810L,
		169	0x00010800L,0x00010810L,0x20010800L,0x20010810L,
		170	0x00000020L,0x00000030L,0x20000020L,0x20000030L,
		171	0x00010020L,0x00010030L,0x20010020L,0x20010030L,
		172	0x00000820L,0x00000830L,0x20000820L,0x20000830L,
		173	0x00010820L,0x00010830L,0x20010820L,0x20010830L,
		174	0x00080000L,0x00080010L,0x20080000L,0x20080010L,
		175	0x00090000L,0x00090010L,0x20090000L,0x20090010L,
		176	0x00080800L,0x00080810L,0x20080800L,0x20080810L,
		177	0x00090800L,0x00090810L,0x20090800L,0x20090810L,
		178	0x00080020L,0x00080030L,0x20080020L,0x20080030L,
		179	0x00090020L,0x00090030L,0x20090020L,0x20090030L,
		180	0x00080820L,0x00080830L,0x20080820L,0x20080830L,
		181	0x00090820L,0x00090830L,0x20090820L,0x20090830L,
		182	},{
		183	/* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
		184	0x00000000L,0x02000000L,0x00002000L,0x02002000L,
		185	0x00200000L,0x02200000L,0x00202000L,0x02202000L,
		186	0x00000004L,0x02000004L,0x00002004L,0x02002004L,
		187	0x00200004L,0x02200004L,0x00202004L,0x02202004L,
		188	0x00000400L,0x02000400L,0x00002400L,0x02002400L,
		189	0x00200400L,0x02200400L,0x00202400L,0x02202400L,
		190	0x00000404L,0x02000404L,0x00002404L,0x02002404L,
		191	0x00200404L,0x02200404L,0x00202404L,0x02202404L,
		192	0x10000000L,0x12000000L,0x10002000L,0x12002000L,
		193	0x10200000L,0x12200000L,0x10202000L,0x12202000L,
		194	0x10000004L,0x12000004L,0x10002004L,0x12002004L,
		195	0x10200004L,0x12200004L,0x10202004L,0x12202004L,
		196	0x10000400L,0x12000400L,0x10002400L,0x12002400L,
		197	0x10200400L,0x12200400L,0x10202400L,0x12202400L,
		198	0x10000404L,0x12000404L,0x10002404L,0x12002404L,
		199	0x10200404L,0x12200404L,0x10202404L,0x12202404L,
		200	},{
		201	/* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
		202	0x00000000L,0x00000001L,0x00040000L,0x00040001L,
		203	0x01000000L,0x01000001L,0x01040000L,0x01040001L,
		204	0x00000002L,0x00000003L,0x00040002L,0x00040003L,
		205	0x01000002L,0x01000003L,0x01040002L,0x01040003L,
		206	0x00000200L,0x00000201L,0x00040200L,0x00040201L,
		207	0x01000200L,0x01000201L,0x01040200L,0x01040201L,
		208	0x00000202L,0x00000203L,0x00040202L,0x00040203L,
		209	0x01000202L,0x01000203L,0x01040202L,0x01040203L,
		210	0x08000000L,0x08000001L,0x08040000L,0x08040001L,
		211	0x09000000L,0x09000001L,0x09040000L,0x09040001L,
		212	0x08000002L,0x08000003L,0x08040002L,0x08040003L,
		213	0x09000002L,0x09000003L,0x09040002L,0x09040003L,
		214	0x08000200L,0x08000201L,0x08040200L,0x08040201L,
		215	0x09000200L,0x09000201L,0x09040200L,0x09040201L,
		216	0x08000202L,0x08000203L,0x08040202L,0x08040203L,
		217	0x09000202L,0x09000203L,0x09040202L,0x09040203L,
		218	},{
		219	/* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
		220	0x00000000L,0x00100000L,0x00000100L,0x00100100L,
		221	0x00000008L,0x00100008L,0x00000108L,0x00100108L,
		222	0x00001000L,0x00101000L,0x00001100L,0x00101100L,
		223	0x00001008L,0x00101008L,0x00001108L,0x00101108L,
		224	0x04000000L,0x04100000L,0x04000100L,0x04100100L,
		225	0x04000008L,0x04100008L,0x04000108L,0x04100108L,
		226	0x04001000L,0x04101000L,0x04001100L,0x04101100L,
		227	0x04001008L,0x04101008L,0x04001108L,0x04101108L,
		228	0x00020000L,0x00120000L,0x00020100L,0x00120100L,
		229	0x00020008L,0x00120008L,0x00020108L,0x00120108L,
		230	0x00021000L,0x00121000L,0x00021100L,0x00121100L,
		231	0x00021008L,0x00121008L,0x00021108L,0x00121108L,
		232	0x04020000L,0x04120000L,0x04020100L,0x04120100L,
		233	0x04020008L,0x04120008L,0x04020108L,0x04120108L,
		234	0x04021000L,0x04121000L,0x04021100L,0x04121100L,
		235	0x04021008L,0x04121008L,0x04021108L,0x04121108L,
		236	},{
		237	/* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
		238	0x00000000L,0x10000000L,0x00010000L,0x10010000L,
		239	0x00000004L,0x10000004L,0x00010004L,0x10010004L,
		240	0x20000000L,0x30000000L,0x20010000L,0x30010000L,
		241	0x20000004L,0x30000004L,0x20010004L,0x30010004L,
		242	0x00100000L,0x10100000L,0x00110000L,0x10110000L,
		243	0x00100004L,0x10100004L,0x00110004L,0x10110004L,
		244	0x20100000L,0x30100000L,0x20110000L,0x30110000L,
		245	0x20100004L,0x30100004L,0x20110004L,0x30110004L,
		246	0x00001000L,0x10001000L,0x00011000L,0x10011000L,
		247	0x00001004L,0x10001004L,0x00011004L,0x10011004L,
		248	0x20001000L,0x30001000L,0x20011000L,0x30011000L,
		249	0x20001004L,0x30001004L,0x20011004L,0x30011004L,
		250	0x00101000L,0x10101000L,0x00111000L,0x10111000L,
		251	0x00101004L,0x10101004L,0x00111004L,0x10111004L,
		252	0x20101000L,0x30101000L,0x20111000L,0x30111000L,
		253	0x20101004L,0x30101004L,0x20111004L,0x30111004L,
		254	},{
		255	/* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
		256	0x00000000L,0x08000000L,0x00000008L,0x08000008L,
		257	0x00000400L,0x08000400L,0x00000408L,0x08000408L,
		258	0x00020000L,0x08020000L,0x00020008L,0x08020008L,
		259	0x00020400L,0x08020400L,0x00020408L,0x08020408L,
		260	0x00000001L,0x08000001L,0x00000009L,0x08000009L,
		261	0x00000401L,0x08000401L,0x00000409L,0x08000409L,
		262	0x00020001L,0x08020001L,0x00020009L,0x08020009L,
		263	0x00020401L,0x08020401L,0x00020409L,0x08020409L,
		264	0x02000000L,0x0A000000L,0x02000008L,0x0A000008L,
		265	0x02000400L,0x0A000400L,0x02000408L,0x0A000408L,
		266	0x02020000L,0x0A020000L,0x02020008L,0x0A020008L,
		267	0x02020400L,0x0A020400L,0x02020408L,0x0A020408L,
		268	0x02000001L,0x0A000001L,0x02000009L,0x0A000009L,
		269	0x02000401L,0x0A000401L,0x02000409L,0x0A000409L,
		270	0x02020001L,0x0A020001L,0x02020009L,0x0A020009L,
		271	0x02020401L,0x0A020401L,0x02020409L,0x0A020409L,
		272	},{
		273	/* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
		274	0x00000000L,0x00000100L,0x00080000L,0x00080100L,
		275	0x01000000L,0x01000100L,0x01080000L,0x01080100L,
		276	0x00000010L,0x00000110L,0x00080010L,0x00080110L,
		277	0x01000010L,0x01000110L,0x01080010L,0x01080110L,
		278	0x00200000L,0x00200100L,0x00280000L,0x00280100L,
		279	0x01200000L,0x01200100L,0x01280000L,0x01280100L,
		280	0x00200010L,0x00200110L,0x00280010L,0x00280110L,
		281	0x01200010L,0x01200110L,0x01280010L,0x01280110L,
		282	0x00000200L,0x00000300L,0x00080200L,0x00080300L,
		283	0x01000200L,0x01000300L,0x01080200L,0x01080300L,
		284	0x00000210L,0x00000310L,0x00080210L,0x00080310L,
		285	0x01000210L,0x01000310L,0x01080210L,0x01080310L,
		286	0x00200200L,0x00200300L,0x00280200L,0x00280300L,
		287	0x01200200L,0x01200300L,0x01280200L,0x01280300L,
		288	0x00200210L,0x00200310L,0x00280210L,0x00280310L,
		289	0x01200210L,0x01200310L,0x01280210L,0x01280310L,
		290	},{
		291	/* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
		292	0x00000000L,0x04000000L,0x00040000L,0x04040000L,
		293	0x00000002L,0x04000002L,0x00040002L,0x04040002L,
		294	0x00002000L,0x04002000L,0x00042000L,0x04042000L,
		295	0x00002002L,0x04002002L,0x00042002L,0x04042002L,
		296	0x00000020L,0x04000020L,0x00040020L,0x04040020L,
		297	0x00000022L,0x04000022L,0x00040022L,0x04040022L,
		298	0x00002020L,0x04002020L,0x00042020L,0x04042020L,
		299	0x00002022L,0x04002022L,0x00042022L,0x04042022L,
		300	0x00000800L,0x04000800L,0x00040800L,0x04040800L,
		301	0x00000802L,0x04000802L,0x00040802L,0x04040802L,
		302	0x00002800L,0x04002800L,0x00042800L,0x04042800L,
		303	0x00002802L,0x04002802L,0x00042802L,0x04042802L,
		304	0x00000820L,0x04000820L,0x00040820L,0x04040820L,
		305	0x00000822L,0x04000822L,0x00040822L,0x04040822L,
		306	0x00002820L,0x04002820L,0x00042820L,0x04042820L,
		307	0x00002822L,0x04002822L,0x00042822L,0x04042822L,
		308	}};
		309
148	int des_set_key(const_des_cblock *key, des_key_schedule schedule)	310	int des_set_key(const_des_cblock *key, des_key_schedule schedule)
149	{	311	{
150	if (des_check_key)	312	if (des_check_key)
@@ -164,7 +326,7 @@ int des_set_key(const_des_cblock *key, des_key_schedule schedule)
164	*/	326	*/
165	int des_set_key_checked(const_des_cblock *key, des_key_schedule schedule)	327	int des_set_key_checked(const_des_cblock *key, des_key_schedule schedule)
166	{	328	{
167	if (!check_parity(key))	329	if (!des_check_key_parity(key))
168	return(-1);	330	return(-1);
169	if (des_is_weak_key(key))	331	if (des_is_weak_key(key))
170	return(-2);	332	return(-2);
@@ -186,20 +348,7 @@ void des_set_key_unchecked(const_des_cblock *key, des_key_schedule schedule)
186	c2l(in,c);	348	c2l(in,c);
187	c2l(in,d);	349	c2l(in,d);
188		350
189	/* do PC1 in 60 simple operations */	351	/* do PC1 in 47 simple operations :-)
190	/* PERM_OP(d,c,t,4,0x0f0f0f0fL);
191	HPERM_OP(c,t,-2, 0xcccc0000L);
192	HPERM_OP(c,t,-1, 0xaaaa0000L);
193	HPERM_OP(c,t, 8, 0x00ff0000L);
194	HPERM_OP(c,t,-1, 0xaaaa0000L);
195	HPERM_OP(d,t,-8, 0xff000000L);
196	HPERM_OP(d,t, 8, 0x00ff0000L);
197	HPERM_OP(d,t, 2, 0x33330000L);
198	d=((d&0x00aa00aaL)<<7L)\|((d&0x55005500L)>>7L)\|(d&0xaa55aa55L);
199	d=(d>>8)\|((c&0xf0000000L)>>4);
200	c&=0x0fffffffL; */
201
202	/* I now do it in 47 simple operations :-)
203	* Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov)	352	* Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov)
204	* for the inspiration. :-) */	353	* for the inspiration. :-) */
205	PERM_OP (d,c,t,4,0x0f0f0f0fL);	354	PERM_OP (d,c,t,4,0x0f0f0f0fL);
@@ -223,9 +372,9 @@ void des_set_key_unchecked(const_des_cblock *key, des_key_schedule schedule)
223	/* could be a few less shifts but I am to lazy at this	372	/* could be a few less shifts but I am to lazy at this
224	* point in time to investigate */	373	* point in time to investigate */
225	s= des_skb[0][ (c )&0x3f ]\|	374	s= des_skb[0][ (c )&0x3f ]\|
226	des_skb[1][((c>> 6)&0x03)\|((c>> 7L)&0x3c)]\|	375	des_skb[1][((c>> 6L)&0x03)\|((c>> 7L)&0x3c)]\|
227	des_skb[2][((c>>13)&0x0f)\|((c>>14L)&0x30)]\|	376	des_skb[2][((c>>13L)&0x0f)\|((c>>14L)&0x30)]\|
228	des_skb[3][((c>>20)&0x01)\|((c>>21L)&0x06) \|	377	des_skb[3][((c>>20L)&0x01)\|((c>>21L)&0x06) \|
229	((c>>22L)&0x38)];	378	((c>>22L)&0x38)];
230	t= des_skb[4][ (d )&0x3f ]\|	379	t= des_skb[4][ (d )&0x3f ]\|
231	des_skb[5][((d>> 7L)&0x03)\|((d>> 8L)&0x3c)]\|	380	des_skb[5][((d>> 7L)&0x03)\|((d>> 8L)&0x3c)]\|
@@ -245,3 +394,9 @@ int des_key_sched(const_des_cblock *key, des_key_schedule schedule)
245	{	394	{
246	return(des_set_key(key,schedule));	395	return(des_set_key(key,schedule));
247	}	396	}
		397
		398	#undef des_fixup_key_parity
		399	void des_fixup_key_parity(des_cblock *key)
		400	{
		401	des_set_odd_parity(key);
		402	}