--- lib/crypto/c_src/crypto_drv.c.orig	2003-07-08 01:31:50 +1300
+++ lib/crypto/c_src/crypto_drv.c	2004-08-31 01:16:45 +1300
@@ -145,11 +145,11 @@
 {
     int klen, dlen, i, macsize;
     char *key, *key2, *key3, *dbuf, *ivec;
-    const_DES_cblock *des_key, *des_key2, *des_key3;
+    const_des_cblock *des_key, *des_key2, *des_key3;
     const unsigned char *des_dbuf;
-    DES_cblock *des_ivec;
+    des_cblock *des_ivec;
     ErlDrvBinary *bin;
-    DES_key_schedule schedule, schedule2, schedule3;
+    des_key_schedule schedule, schedule2, schedule3;
     char hmacbuf[SHA_LEN];
     MD5_CTX md5_ctx;
     SHA_CTX sha_ctx;
@@ -262,12 +262,12 @@
 	dlen = len - 16;
 	if (dlen < 0)
 	    return -1;
-	des_key = (const_DES_cblock*) buf; 
-	des_ivec = (DES_cblock*)(buf + 8); 
+	des_key = (const_des_cblock*) buf; 
+	des_ivec = (des_cblock*)(buf + 8); 
 	des_dbuf = buf + 16;
 	*rbuf = (char *)(bin = driver_alloc_binary(dlen));
-	DES_set_key(des_key, &schedule);
-	DES_ncbc_encrypt(des_dbuf, bin->orig_bytes, dlen, &schedule, des_ivec, 
+	des_set_key(des_key, &schedule);
+	des_ncbc_encrypt(des_dbuf, bin->orig_bytes, dlen, &schedule, des_ivec, 
 			 (command == DRV_CBC_DES_ENCRYPT));
 	return dlen;
 	break;
@@ -277,16 +277,16 @@
 	dlen = len - 32;
 	if (dlen < 0)
 	    return -1;
-	des_key = (const_DES_cblock*) buf; 
-	des_key2 = (const_DES_cblock*) (buf + 8); 
-	des_key3 = (const_DES_cblock*) (buf + 16);
-	des_ivec = (DES_cblock*) (buf + 24); 
+	des_key = (const_des_cblock*) buf; 
+	des_key2 = (const_des_cblock*) (buf + 8); 
+	des_key3 = (const_des_cblock*) (buf + 16);
+	des_ivec = (des_cblock*) (buf + 24); 
 	des_dbuf = buf + 32;
 	*rbuf = (char *)(bin = driver_alloc_binary(dlen));
-	DES_set_key(des_key, &schedule);
-	DES_set_key(des_key2, &schedule2);
-	DES_set_key(des_key3, &schedule3);
-	DES_ede3_cbc_encrypt(des_dbuf, bin->orig_bytes, dlen, &schedule,
+	des_set_key(des_key, &schedule);
+	des_set_key(des_key2, &schedule2);
+	des_set_key(des_key3, &schedule3);
+	des_ede3_cbc_encrypt(des_dbuf, bin->orig_bytes, dlen, &schedule,
 			     &schedule2, &schedule3, des_ivec, 
 			     (command == DRV_EDE3_CBC_DES_ENCRYPT));
 	return dlen;