|
Line 0
Link Here
|
|
|
1 |
--- usr/lib/pkcs11/soft_stdll/soft_specific.c.orig 2010-07-29 14:28:41.000000000 +0200 |
| 2 |
+++ usr/lib/pkcs11/soft_stdll/soft_specific.c 2015-02-25 21:39:34.150913516 +0100 |
| 3 |
@@ -426,14 +426,14 @@ |
| 4 |
{ |
| 5 |
CK_ULONG rc; |
| 6 |
|
| 7 |
- des_key_schedule des_key2; |
| 8 |
- const_des_cblock key_val_SSL, in_key_data; |
| 9 |
- des_cblock out_key_data; |
| 10 |
+ DES_key_schedule des_key2; |
| 11 |
+ const_DES_cblock key_val_SSL, in_key_data; |
| 12 |
+ DES_cblock out_key_data; |
| 13 |
unsigned int i,j; |
| 14 |
|
| 15 |
// Create the key schedule |
| 16 |
memcpy(&key_val_SSL, key_value, 8); |
| 17 |
- des_set_key_unchecked(&key_val_SSL, des_key2); |
| 18 |
+ des_set_key_unchecked(&key_val_SSL, &des_key2); |
| 19 |
|
| 20 |
// the des decrypt will only fail if the data length is not evenly divisible |
| 21 |
// by 8 |
| 22 |
@@ -446,7 +446,7 @@ |
| 23 |
if (encrypt) { |
| 24 |
for (i=0; i<in_data_len; i=i+8) { |
| 25 |
memcpy(in_key_data, in_data+i, 8); |
| 26 |
- des_ecb_encrypt(&in_key_data, &out_key_data, des_key2, DES_ENCRYPT); |
| 27 |
+ DES_ecb_encrypt(&in_key_data, &out_key_data, &des_key2, DES_ENCRYPT); |
| 28 |
memcpy(out_data+i, out_key_data, 8); |
| 29 |
} |
| 30 |
|
| 31 |
@@ -456,7 +456,7 @@ |
| 32 |
|
| 33 |
for(j=0; j < in_data_len; j=j+8) { |
| 34 |
memcpy(in_key_data, in_data+j, 8); |
| 35 |
- des_ecb_encrypt(&in_key_data, &out_key_data, des_key2, DES_DECRYPT); |
| 36 |
+ DES_ecb_encrypt(&in_key_data, &out_key_data, &des_key2, DES_DECRYPT); |
| 37 |
memcpy(out_data+j, out_key_data, 8); |
| 38 |
} |
| 39 |
|
| 40 |
@@ -478,14 +478,14 @@ |
| 41 |
{ |
| 42 |
CK_ULONG rc; |
| 43 |
|
| 44 |
- des_cblock ivec; |
| 45 |
+ DES_cblock ivec; |
| 46 |
|
| 47 |
- des_key_schedule des_key2; |
| 48 |
- const_des_cblock key_val_SSL; |
| 49 |
+ DES_key_schedule des_key2; |
| 50 |
+ const_DES_cblock key_val_SSL; |
| 51 |
|
| 52 |
// Create the key schedule |
| 53 |
memcpy(&key_val_SSL, key_value, 8); |
| 54 |
- des_set_key_unchecked(&key_val_SSL, des_key2); |
| 55 |
+ des_set_key_unchecked(&key_val_SSL, &des_key2); |
| 56 |
|
| 57 |
memcpy(&ivec, init_v, 8); |
| 58 |
// the des decrypt will only fail if the data length is not evenly divisible |
| 59 |
@@ -497,11 +497,11 @@ |
| 60 |
|
| 61 |
|
| 62 |
if ( encrypt){ |
| 63 |
- des_ncbc_encrypt(in_data, out_data, in_data_len, des_key2, &ivec, DES_ENCRYPT); |
| 64 |
+ DES_ncbc_encrypt(in_data, out_data, in_data_len, &des_key2, &ivec, DES_ENCRYPT); |
| 65 |
*out_data_len = in_data_len; |
| 66 |
rc = CKR_OK; |
| 67 |
} else { |
| 68 |
- des_ncbc_encrypt(in_data, out_data, in_data_len, des_key2, &ivec, DES_DECRYPT); |
| 69 |
+ DES_ncbc_encrypt(in_data, out_data, in_data_len, &des_key2, &ivec, DES_DECRYPT); |
| 70 |
*out_data_len = in_data_len; |
| 71 |
rc = CKR_OK; |
| 72 |
} |
| 73 |
@@ -519,12 +519,12 @@ |
| 74 |
CK_RV rc; |
| 75 |
|
| 76 |
unsigned int k,j; |
| 77 |
- des_key_schedule des_key1; |
| 78 |
- des_key_schedule des_key2; |
| 79 |
- des_key_schedule des_key3; |
| 80 |
+ DES_key_schedule des_key1; |
| 81 |
+ DES_key_schedule des_key2; |
| 82 |
+ DES_key_schedule des_key3; |
| 83 |
|
| 84 |
- const_des_cblock key_SSL1, key_SSL2, key_SSL3, in_key_data; |
| 85 |
- des_cblock out_key_data; |
| 86 |
+ const_DES_cblock key_SSL1, key_SSL2, key_SSL3, in_key_data; |
| 87 |
+ DES_cblock out_key_data; |
| 88 |
|
| 89 |
// The key as passed is a 24 byte long string containing three des keys |
| 90 |
// pick them apart and create the 3 corresponding key schedules |
| 91 |
@@ -546,11 +546,11 @@ |
| 92 |
if (encrypt) { |
| 93 |
for(k=0;k<in_data_len;k=k+8){ |
| 94 |
memcpy(in_key_data, in_data+k, 8); |
| 95 |
- des_ecb3_encrypt((const_DES_cblock *)&in_key_data, |
| 96 |
+ DES_ecb3_encrypt((const_DES_cblock *)&in_key_data, |
| 97 |
(DES_cblock *)&out_key_data, |
| 98 |
- des_key1, |
| 99 |
- des_key2, |
| 100 |
- des_key3, |
| 101 |
+ &des_key1, |
| 102 |
+ &des_key2, |
| 103 |
+ &des_key3, |
| 104 |
DES_ENCRYPT); |
| 105 |
memcpy(out_data+k, out_key_data, 8); |
| 106 |
} |
| 107 |
@@ -559,11 +559,11 @@ |
| 108 |
} else { |
| 109 |
for (j=0;j<in_data_len;j=j+8){ |
| 110 |
memcpy(in_key_data, in_data+j, 8); |
| 111 |
- des_ecb3_encrypt((const_DES_cblock *)&in_key_data, |
| 112 |
+ DES_ecb3_encrypt((const_DES_cblock *)&in_key_data, |
| 113 |
(DES_cblock *)&out_key_data, |
| 114 |
- des_key1, |
| 115 |
- des_key2, |
| 116 |
- des_key3, |
| 117 |
+ &des_key1, |
| 118 |
+ &des_key2, |
| 119 |
+ &des_key3, |
| 120 |
DES_DECRYPT); |
| 121 |
memcpy(out_data+j, out_key_data, 8); |
| 122 |
} |
| 123 |
@@ -584,12 +584,12 @@ |
| 124 |
{ |
| 125 |
|
| 126 |
CK_RV rc = CKR_OK; |
| 127 |
- des_key_schedule des_key1; |
| 128 |
- des_key_schedule des_key2; |
| 129 |
- des_key_schedule des_key3; |
| 130 |
+ DES_key_schedule des_key1; |
| 131 |
+ DES_key_schedule des_key2; |
| 132 |
+ DES_key_schedule des_key3; |
| 133 |
|
| 134 |
- const_des_cblock key_SSL1, key_SSL2, key_SSL3; |
| 135 |
- des_cblock ivec; |
| 136 |
+ const_DES_cblock key_SSL1, key_SSL2, key_SSL3; |
| 137 |
+ DES_cblock ivec; |
| 138 |
|
| 139 |
// The key as passed in is a 24 byte string containing 3 keys |
| 140 |
// pick it apart and create the key schedules |
| 141 |
@@ -611,23 +611,23 @@ |
| 142 |
|
| 143 |
// Encrypt or decrypt the data |
| 144 |
if (encrypt){ |
| 145 |
- des_ede3_cbc_encrypt(in_data, |
| 146 |
+ DES_ede3_cbc_encrypt(in_data, |
| 147 |
out_data, |
| 148 |
in_data_len, |
| 149 |
- des_key1, |
| 150 |
- des_key2, |
| 151 |
- des_key3, |
| 152 |
+ &des_key1, |
| 153 |
+ &des_key2, |
| 154 |
+ &des_key3, |
| 155 |
&ivec, |
| 156 |
DES_ENCRYPT); |
| 157 |
*out_data_len = in_data_len; |
| 158 |
rc = CKR_OK; |
| 159 |
}else { |
| 160 |
- des_ede3_cbc_encrypt(in_data, |
| 161 |
+ DES_ede3_cbc_encrypt(in_data, |
| 162 |
out_data, |
| 163 |
in_data_len, |
| 164 |
- des_key1, |
| 165 |
- des_key2, |
| 166 |
- des_key3, |
| 167 |
+ &des_key1, |
| 168 |
+ &des_key2, |
| 169 |
+ &des_key3, |
| 170 |
&ivec, |
| 171 |
DES_DECRYPT); |
| 172 |
|