Remove old DES API

Includes VMS fixes from Richard.
Includes Kurt's destest fixes (RT 1290).
Closes tickets 1290 and 1291

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>

1 files changed, 51 insertions, 51 deletions

diff --git a/crypto/des/destest.c b/crypto/des/destest.c
index 14f4dfe77c..406e6de7bc 100644
--- a/crypto/des/destest.c
+++ b/crypto/des/destest.c
@@ -357,8 +357,8 @@ int main(int argc, char *argv[])
 {
     int j, err = 0;
     unsigned int i;
-    des_cblock in, out, outin, iv3;
-    des_key_schedule ks, ks2, ks3;
+    DES_cblock in, out, outin, iv3;
+    DES_key_schedule ks, ks2, ks3;
     unsigned char cbc_in[40];
     unsigned char cbc_out[40];
     DES_LONG cs;
@@ -373,8 +373,8 @@ int main(int argc, char *argv[])
         memcpy(in, plain_data[i], 8);
         memset(out, 0, 8);
         memset(outin, 0, 8);
-        des_ecb_encrypt(&in, &out, ks, DES_ENCRYPT);
-        des_ecb_encrypt(&out, &outin, ks, DES_DECRYPT);
+        DES_ecb_encrypt(&in, &out, &ks, DES_ENCRYPT);
+        DES_ecb_encrypt(&out, &outin, &ks, DES_DECRYPT);
 
         if (memcmp(out, cipher_data[i], 8) != 0) {
             printf("Encryption error %2d\nk=%s p=%s o=%s act=%s\n",
@@ -398,8 +398,8 @@ int main(int argc, char *argv[])
         memcpy(in, plain_data[i], 8);
         memset(out, 0, 8);
         memset(outin, 0, 8);
-        des_ecb2_encrypt(&in, &out, ks, ks2, DES_ENCRYPT);
-        des_ecb2_encrypt(&out, &outin, ks, ks2, DES_DECRYPT);
+        DES_ecb3_encrypt(&in,&out,&ks,&ks2,&ks,DES_ENCRYPT);
+        DES_ecb3_encrypt(&out,&outin,&ks,&ks2,&ks,DES_DECRYPT);
 
         if (memcmp(out, cipher_ecb2[i], 8) != 0) {
             printf("Encryption error %2d\nk=%s p=%s o=%s act=%s\n",
@@ -423,7 +423,7 @@ int main(int argc, char *argv[])
     memset(cbc_out, 0, 40);
     memset(cbc_in, 0, 40);
     memcpy(iv3, cbc_iv, sizeof(cbc_iv));
-    des_ncbc_encrypt(cbc_data, cbc_out, strlen((char *)cbc_data) + 1, ks,
+    DES_ncbc_encrypt(cbc_data, cbc_out, strlen((char *)cbc_data) + 1, &ks,
                      &iv3, DES_ENCRYPT);
     if (memcmp(cbc_out, cbc_ok, 32) != 0) {
         printf("cbc_encrypt encrypt error\n");
@@ -431,7 +431,7 @@ int main(int argc, char *argv[])
     }
 
     memcpy(iv3, cbc_iv, sizeof(cbc_iv));
-    des_ncbc_encrypt(cbc_out, cbc_in, strlen((char *)cbc_data) + 1, ks,
+    DES_ncbc_encrypt(cbc_out, cbc_in, strlen((char *)cbc_data) + 1, &ks,
                      &iv3, DES_DECRYPT);
     if (memcmp(cbc_in, cbc_data, strlen((char *)cbc_data)) != 0) {
         printf("cbc_encrypt decrypt error\n");
@@ -446,14 +446,14 @@ int main(int argc, char *argv[])
     memset(cbc_out, 0, 40);
     memset(cbc_in, 0, 40);
     memcpy(iv3, cbc_iv, sizeof(cbc_iv));
-    des_xcbc_encrypt(cbc_data, cbc_out, strlen((char *)cbc_data) + 1, ks,
+    DES_xcbc_encrypt(cbc_data, cbc_out, strlen((char *)cbc_data) + 1, &ks,
                      &iv3, &cbc2_key, &cbc3_key, DES_ENCRYPT);
     if (memcmp(cbc_out, xcbc_ok, 32) != 0) {
         printf("des_xcbc_encrypt encrypt error\n");
         err = 1;
     }
     memcpy(iv3, cbc_iv, sizeof(cbc_iv));
-    des_xcbc_encrypt(cbc_out, cbc_in, strlen((char *)cbc_data) + 1, ks,
+    DES_xcbc_encrypt(cbc_out, cbc_in, strlen((char *)cbc_data) + 1, &ks,
                      &iv3, &cbc2_key, &cbc3_key, DES_DECRYPT);
     if (memcmp(cbc_in, cbc_data, strlen((char *)cbc_data) + 1) != 0) {
         printf("des_xcbc_encrypt decrypt error\n");
@@ -480,10 +480,10 @@ int main(int argc, char *argv[])
     /* i=((i+7)/8)*8; */
     memcpy(iv3, cbc_iv, sizeof(cbc_iv));
 
-    des_ede3_cbc_encrypt(cbc_data, cbc_out, 16L, ks, ks2, ks3, &iv3,
+    DES_ede3_cbc_encrypt(cbc_data, cbc_out, 16L, &ks, &ks2, &ks3, &iv3,
                          DES_ENCRYPT);
-    des_ede3_cbc_encrypt(&(cbc_data[16]), &(cbc_out[16]), i - 16, ks, ks2,
-                         ks3, &iv3, DES_ENCRYPT);
+    DES_ede3_cbc_encrypt(&(cbc_data[16]), &(cbc_out[16]), i - 16, &ks, &ks2,
+                         &ks3, &iv3, DES_ENCRYPT);
     if (memcmp
         (cbc_out, cbc3_ok,
          (unsigned int)(strlen((char *)cbc_data) + 1 + 7) / 8 * 8) != 0) {
@@ -500,11 +500,11 @@ int main(int argc, char *argv[])
     }
 
     memcpy(iv3, cbc_iv, sizeof(cbc_iv));
-    des_ede3_cbc_encrypt(cbc_out, cbc_in, i, ks, ks2, ks3, &iv3, DES_DECRYPT);
+    DES_ede3_cbc_encrypt(cbc_out, cbc_in, i, &ks, &ks2, &ks3, &iv3, DES_DECRYPT);
     if (memcmp(cbc_in, cbc_data, strlen((char *)cbc_data) + 1) != 0) {
         unsigned int n;
 
-        printf("des_ede3_cbc_encrypt decrypt error\n");
+        printf("DES_ede3_cbc_encrypt decrypt error\n");
         for (n = 0; n < i; ++n)
             printf(" %02x", cbc_data[n]);
         printf("\n");
@@ -521,13 +521,13 @@ int main(int argc, char *argv[])
     }
     memset(cbc_out, 0, 40);
     memset(cbc_in, 0, 40);
-    des_pcbc_encrypt(cbc_data, cbc_out, strlen((char *)cbc_data) + 1, ks,
+    DES_pcbc_encrypt(cbc_data, cbc_out, strlen((char *)cbc_data) + 1, &ks,
                      &cbc_iv, DES_ENCRYPT);
     if (memcmp(cbc_out, pcbc_ok, 32) != 0) {
         printf("pcbc_encrypt encrypt error\n");
         err = 1;
     }
-    des_pcbc_encrypt(cbc_out, cbc_in, strlen((char *)cbc_data) + 1, ks,
+    DES_pcbc_encrypt(cbc_out, cbc_in, strlen((char *)cbc_data) + 1, &ks,
                      &cbc_iv, DES_DECRYPT);
     if (memcmp(cbc_in, cbc_data, strlen((char *)cbc_data) + 1) != 0) {
         printf("pcbc_encrypt decrypt error\n");
@@ -551,8 +551,8 @@ int main(int argc, char *argv[])
 
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
     for (i = 0; i < sizeof(plain); i++)
-        des_cfb_encrypt(&(plain[i]), &(cfb_buf1[i]),
-                        8, 1, ks, &cfb_tmp, DES_ENCRYPT);
+        DES_cfb_encrypt(&(plain[i]), &(cfb_buf1[i]),
+                        8, 1, &ks, &cfb_tmp, DES_ENCRYPT);
     if (memcmp(cfb_cipher8, cfb_buf1, sizeof(plain)) != 0) {
         printf("cfb_encrypt small encrypt error\n");
         err = 1;
@@ -560,8 +560,8 @@ int main(int argc, char *argv[])
 
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
     for (i = 0; i < sizeof(plain); i++)
-        des_cfb_encrypt(&(cfb_buf1[i]), &(cfb_buf2[i]),
-                        8, 1, ks, &cfb_tmp, DES_DECRYPT);
+        DES_cfb_encrypt(&(cfb_buf1[i]), &(cfb_buf2[i]),
+                        8, 1, &ks, &cfb_tmp, DES_DECRYPT);
     if (memcmp(plain, cfb_buf2, sizeof(plain)) != 0) {
         printf("cfb_encrypt small decrypt error\n");
         err = 1;
@@ -575,7 +575,7 @@ int main(int argc, char *argv[])
     printf("Doing ofb\n");
     DES_set_key_checked(&ofb_key, &ks);
     memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
-    des_ofb_encrypt(plain, ofb_buf1, 64, sizeof(plain) / 8, ks, &ofb_tmp);
+    DES_ofb_encrypt(plain, ofb_buf1, 64, sizeof(plain) / 8, &ks, &ofb_tmp);
     if (memcmp(ofb_cipher, ofb_buf1, sizeof(ofb_buf1)) != 0) {
         printf("ofb_encrypt encrypt error\n");
         printf("%02X %02X %02X %02X %02X %02X %02X %02X\n",
@@ -589,7 +589,7 @@ int main(int argc, char *argv[])
         err = 1;
     }
     memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
-    des_ofb_encrypt(ofb_buf1, ofb_buf2, 64, sizeof(ofb_buf1) / 8, ks,
+    DES_ofb_encrypt(ofb_buf1, ofb_buf2, 64, sizeof(ofb_buf1) / 8, &ks,
                     &ofb_tmp);
     if (memcmp(plain, ofb_buf2, sizeof(ofb_buf2)) != 0) {
         printf("ofb_encrypt decrypt error\n");
@@ -610,7 +610,7 @@ int main(int argc, char *argv[])
     memset(ofb_buf2, 0, sizeof(ofb_buf1));
     num = 0;
     for (i = 0; i < sizeof(plain); i++) {
-        des_ofb64_encrypt(&(plain[i]), &(ofb_buf1[i]), 1, ks, &ofb_tmp, &num);
+        DES_ofb64_encrypt(&(plain[i]), &(ofb_buf1[i]), 1, &ks, &ofb_tmp, &num);
     }
     if (memcmp(ofb_cipher, ofb_buf1, sizeof(ofb_buf1)) != 0) {
         printf("ofb64_encrypt encrypt error\n");
@@ -618,7 +618,7 @@ int main(int argc, char *argv[])
     }
     memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
     num = 0;
-    des_ofb64_encrypt(ofb_buf1, ofb_buf2, sizeof(ofb_buf1), ks, &ofb_tmp,
+    DES_ofb64_encrypt(ofb_buf1, ofb_buf2, sizeof(ofb_buf1), &ks, &ofb_tmp,
                       &num);
     if (memcmp(plain, ofb_buf2, sizeof(ofb_buf2)) != 0) {
         printf("ofb64_encrypt decrypt error\n");
@@ -632,8 +632,8 @@ int main(int argc, char *argv[])
     memset(ofb_buf2, 0, sizeof(ofb_buf1));
     num = 0;
     for (i = 0; i < sizeof(plain); i++) {
-        des_ede3_ofb64_encrypt(&(plain[i]), &(ofb_buf1[i]), 1, ks, ks,
-                               ks, &ofb_tmp, &num);
+        DES_ede3_ofb64_encrypt(&(plain[i]), &(ofb_buf1[i]), 1, &ks, &ks,
+                               &ks, &ofb_tmp, &num);
     }
     if (memcmp(ofb_cipher, ofb_buf1, sizeof(ofb_buf1)) != 0) {
         printf("ede_ofb64_encrypt encrypt error\n");
@@ -641,7 +641,7 @@ int main(int argc, char *argv[])
     }
     memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
     num = 0;
-    des_ede3_ofb64_encrypt(ofb_buf1, ofb_buf2, sizeof(ofb_buf1), ks, ks, ks,
+    DES_ede3_ofb64_encrypt(ofb_buf1, ofb_buf2, sizeof(ofb_buf1), &ks, &ks, &ks,
                            &ofb_tmp, &num);
     if (memcmp(plain, ofb_buf2, sizeof(ofb_buf2)) != 0) {
         printf("ede_ofb64_encrypt decrypt error\n");
@@ -650,7 +650,7 @@ int main(int argc, char *argv[])
 
     printf("Doing cbc_cksum\n");
     DES_set_key_checked(&cbc_key, &ks);
-    cs = des_cbc_cksum(cbc_data, &cret, strlen((char *)cbc_data), ks,
+    cs = DES_cbc_cksum(cbc_data, &cret, strlen((char *)cbc_data), &ks,
                        &cbc_iv);
     if (cs != cbc_cksum_ret) {
         printf("bad return value (%08lX), should be %08lX\n",
@@ -663,9 +663,9 @@ int main(int argc, char *argv[])
     }
 
     printf("Doing quad_cksum\n");
-    cs = des_quad_cksum(cbc_data, (des_cblock *)lqret,
+    cs = DES_quad_cksum(cbc_data, (DES_cblock *)lqret,
                         (long)strlen((char *)cbc_data), 2,
-                        (des_cblock *)cbc_iv);
+                        (DES_cblock *)cbc_iv);
     if (cs != 0x70d7a63aL) {
         printf("quad_cksum error, ret %08lx should be 70d7a63a\n",
                (unsigned long)cs);
@@ -696,15 +696,15 @@ int main(int argc, char *argv[])
     printf("input word alignment test");
     for (i = 0; i < 4; i++) {
         printf(" %d", i);
-        des_ncbc_encrypt(&(cbc_out[i]), cbc_in,
-                         strlen((char *)cbc_data) + 1, ks,
+        DES_ncbc_encrypt(&(cbc_out[i]), cbc_in,
+                         strlen((char *)cbc_data) + 1, &ks,
                          &cbc_iv, DES_ENCRYPT);
     }
     printf("\noutput word alignment test");
     for (i = 0; i < 4; i++) {
         printf(" %d", i);
-        des_ncbc_encrypt(cbc_out, &(cbc_in[i]),
-                         strlen((char *)cbc_data) + 1, ks,
+        DES_ncbc_encrypt(cbc_out, &(cbc_in[i]),
+                         strlen((char *)cbc_data) + 1, &ks,
                          &cbc_iv, DES_ENCRYPT);
     }
     printf("\n");
@@ -749,12 +749,12 @@ static char *pt(unsigned char *p)
 
 static int cfb_test(int bits, unsigned char *cfb_cipher)
 {
-    des_key_schedule ks;
+    DES_key_schedule ks;
     int i, err = 0;
 
     DES_set_key_checked(&cfb_key, &ks);
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
-    des_cfb_encrypt(plain, cfb_buf1, bits, sizeof(plain), ks, &cfb_tmp,
+    DES_cfb_encrypt(plain, cfb_buf1, bits, sizeof(plain), &ks, &cfb_tmp,
                     DES_ENCRYPT);
     if (memcmp(cfb_cipher, cfb_buf1, sizeof(plain)) != 0) {
         err = 1;
@@ -763,7 +763,7 @@ static int cfb_test(int bits, unsigned char *cfb_cipher)
             printf("%s\n", pt(&(cfb_buf1[i])));
     }
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
-    des_cfb_encrypt(cfb_buf1, cfb_buf2, bits, sizeof(plain), ks, &cfb_tmp,
+    DES_cfb_encrypt(cfb_buf1, cfb_buf2, bits, sizeof(plain), &ks, &cfb_tmp,
                     DES_DECRYPT);
     if (memcmp(plain, cfb_buf2, sizeof(plain)) != 0) {
         err = 1;
@@ -776,14 +776,14 @@ static int cfb_test(int bits, unsigned char *cfb_cipher)
 
 static int cfb64_test(unsigned char *cfb_cipher)
 {
-    des_key_schedule ks;
+    DES_key_schedule ks;
     int err = 0, i, n;
 
     DES_set_key_checked(&cfb_key, &ks);
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
     n = 0;
-    des_cfb64_encrypt(plain, cfb_buf1, 12, ks, &cfb_tmp, &n, DES_ENCRYPT);
-    des_cfb64_encrypt(&(plain[12]), &(cfb_buf1[12]), sizeof(plain) - 12, ks,
+    DES_cfb64_encrypt(plain, cfb_buf1, 12, &ks, &cfb_tmp, &n, DES_ENCRYPT);
+    DES_cfb64_encrypt(&(plain[12]), &(cfb_buf1[12]), sizeof(plain) - 12, &ks,
                       &cfb_tmp, &n, DES_ENCRYPT);
     if (memcmp(cfb_cipher, cfb_buf1, sizeof(plain)) != 0) {
         err = 1;
@@ -793,9 +793,9 @@ static int cfb64_test(unsigned char *cfb_cipher)
     }
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
     n = 0;
-    des_cfb64_encrypt(cfb_buf1, cfb_buf2, 17, ks, &cfb_tmp, &n, DES_DECRYPT);
-    des_cfb64_encrypt(&(cfb_buf1[17]), &(cfb_buf2[17]),
-                      sizeof(plain) - 17, ks, &cfb_tmp, &n, DES_DECRYPT);
+    DES_cfb64_encrypt(cfb_buf1, cfb_buf2, 17, &ks, &cfb_tmp, &n, DES_DECRYPT);
+    DES_cfb64_encrypt(&(cfb_buf1[17]), &(cfb_buf2[17]),
+                      sizeof(plain) - 17, &ks, &cfb_tmp, &n, DES_DECRYPT);
     if (memcmp(plain, cfb_buf2, sizeof(plain)) != 0) {
         err = 1;
         printf("cfb_encrypt decrypt error\n");
@@ -807,16 +807,16 @@ static int cfb64_test(unsigned char *cfb_cipher)
 
 static int ede_cfb64_test(unsigned char *cfb_cipher)
 {
-    des_key_schedule ks;
+    DES_key_schedule ks;
     int err = 0, i, n;
 
     DES_set_key_checked(&cfb_key, &ks);
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
     n = 0;
-    des_ede3_cfb64_encrypt(plain, cfb_buf1, 12, ks, ks, ks, &cfb_tmp, &n,
+    DES_ede3_cfb64_encrypt(plain, cfb_buf1, 12, &ks, &ks, &ks, &cfb_tmp, &n,
                            DES_ENCRYPT);
-    des_ede3_cfb64_encrypt(&(plain[12]), &(cfb_buf1[12]),
-                           sizeof(plain) - 12, ks, ks, ks,
+    DES_ede3_cfb64_encrypt(&(plain[12]), &(cfb_buf1[12]),
+                           sizeof(plain) - 12, &ks, &ks, &ks,
                            &cfb_tmp, &n, DES_ENCRYPT);
     if (memcmp(cfb_cipher, cfb_buf1, sizeof(plain)) != 0) {
         err = 1;
@@ -826,10 +826,10 @@ static int ede_cfb64_test(unsigned char *cfb_cipher)
     }
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
     n = 0;
-    des_ede3_cfb64_encrypt(cfb_buf1, cfb_buf2, (long)17, ks, ks, ks,
+    DES_ede3_cfb64_encrypt(cfb_buf1, cfb_buf2, (long)17, &ks, &ks, &ks,
                            &cfb_tmp, &n, DES_DECRYPT);
-    des_ede3_cfb64_encrypt(&(cfb_buf1[17]), &(cfb_buf2[17]),
-                           sizeof(plain) - 17, ks, ks, ks,
+    DES_ede3_cfb64_encrypt(&(cfb_buf1[17]), &(cfb_buf2[17]),
+                           sizeof(plain) - 17, &ks, &ks, &ks,
                            &cfb_tmp, &n, DES_DECRYPT);
     if (memcmp(plain, cfb_buf2, sizeof(plain)) != 0) {
         err = 1;