OpenSSL 0.9.4 merge

1 files changed, 4 insertions, 6 deletions

diff --git a/src/lib/libcrypto/des/rpw.c b/src/lib/libcrypto/des/rpw.c
index 6447ed9cf0..0b6b1519b0 100644
--- a/src/lib/libcrypto/des/rpw.c
+++ b/src/lib/libcrypto/des/rpw.c
@@ -57,17 +57,15 @@
  */
 
 #include <stdio.h>
-#include "des.h"
+#include <openssl/des.h>
 
-int main(argc,argv)
-int argc;
-char *argv[];
+int main(int argc, char *argv[])
         {
         des_cblock k,k1;
         int i;
 
         printf("read passwd\n");
-        if ((i=des_read_password((C_Block *)k,"Enter password:",0)) == 0)
+        if ((i=des_read_password(&k,"Enter password:",0)) == 0)
                 {
                 printf("password = ");
                 for (i=0; i<8; i++)
@@ -77,7 +75,7 @@ char *argv[];
                 printf("error %d\n",i);
         printf("\n");
         printf("read 2passwds and verify\n");
-        if ((i=des_read_2passwords((C_Block *)k,(C_Block *)k1,
+        if ((i=des_read_2passwords(&k,&k1,
                 "Enter verified password:",1)) == 0)
                 {
                 printf("password1 = ");