OpenSSL 0.9.4 merge

1 files changed, 10 insertions, 21 deletions

diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c
index dafa686f64..21eda418bc 100644
--- a/src/lib/libcrypto/evp/evp_key.c
+++ b/src/lib/libcrypto/evp/evp_key.c
@@ -58,15 +58,14 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "x509.h"
-#include "objects.h"
-#include "evp.h"
+#include <openssl/x509.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
 
 /* should be init to zeros. */
 static char prompt_string[80];
 
-void EVP_set_pw_prompt(prompt)
-char *prompt;
+void EVP_set_pw_prompt(char *prompt)
         {
         if (prompt == NULL)
                 prompt_string[0]='\0';
@@ -74,7 +73,7 @@ char *prompt;
                 strncpy(prompt_string,prompt,79);
         }
 
-char *EVP_get_pw_prompt()
+char *EVP_get_pw_prompt(void)
         {
         if (prompt_string[0] == '\0')
                 return(NULL);
@@ -83,29 +82,19 @@ char *EVP_get_pw_prompt()
         }
 
 #ifdef NO_DES
-int des_read_pw_string(char *buf,int len,char *prompt,int verify);
+int des_read_pw_string(char *buf,int len,const char *prompt,int verify);
 #endif
 
-int EVP_read_pw_string(buf,len,prompt,verify)
-char *buf;
-int len;
-char *prompt;
-int verify;
+int EVP_read_pw_string(char *buf, int len, const char *prompt, int verify)
         {
         if ((prompt == NULL) && (prompt_string[0] != '\0'))
                 prompt=prompt_string;
         return(des_read_pw_string(buf,len,prompt,verify));
         }
 
-int EVP_BytesToKey(type,md,salt,data,datal,count,key,iv)
-EVP_CIPHER *type;
-EVP_MD *md;
-unsigned char *salt;
-unsigned char *data;
-int datal;
-int count;
-unsigned char *key;
-unsigned char *iv;
+int EVP_BytesToKey(const EVP_CIPHER *type, EVP_MD *md, unsigned char *salt,
+             unsigned char *data, int datal, int count, unsigned char *key,
+             unsigned char *iv)
         {
         EVP_MD_CTX c;
         unsigned char md_buf[EVP_MAX_MD_SIZE];