OpenSSL 0.9.4 merge

1 files changed, 7 insertions, 16 deletions

diff --git a/src/lib/libcrypto/des/rpc_enc.c b/src/lib/libcrypto/des/rpc_enc.c
index 7c1da1f538..c96c204147 100644
--- a/src/lib/libcrypto/des/rpc_enc.c
+++ b/src/lib/libcrypto/des/rpc_enc.c
@@ -60,32 +60,23 @@
 #include "des_locl.h"
 #include "des_ver.h"
 
-#ifndef NOPROTO
 int _des_crypt(char *buf,int len,struct desparams *desp);
-#else
-int _des_crypt();
-#endif
-
-int _des_crypt(buf, len, desp)
-char *buf;
-int len;
-struct desparams *desp;
+int _des_crypt(char *buf, int len, struct desparams *desp)
         {
         des_key_schedule ks;
         int enc;
 
-        des_set_key((des_cblock *)desp->des_key,ks);
+        des_set_key(&desp->des_key,ks);
         enc=(desp->des_dir == ENCRYPT)?DES_ENCRYPT:DES_DECRYPT;
 
         if (desp->des_mode == CBC)
-                des_ecb_encrypt((des_cblock *)desp->UDES.UDES_buf,
-                                (des_cblock *)desp->UDES.UDES_buf,ks,enc);
+                des_ecb_encrypt((const_des_cblock *)desp->UDES.UDES_buf,
+                                (des_cblock *)desp->UDES.UDES_buf,ks,
+                                enc);
         else
                 {
-                des_ncbc_encrypt((des_cblock *)desp->UDES.UDES_buf,
-                                (des_cblock *)desp->UDES.UDES_buf,
-                                (long)len,ks,
-                                (des_cblock *)desp->des_ivec,enc);
+                des_ncbc_encrypt(desp->UDES.UDES_buf,desp->UDES.UDES_buf,
+                                len,ks,&desp->des_ivec,enc);
 #ifdef undef
                 /* len will always be %8 if called from common_crypt
                  * in secure_rpc.