Constify "salt" (Jason Molenda <jason@molenda.com>)

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index cdf5f3cf8942ffd68ff77e5eee475bdcd3cca2ed..0d71c548a5f77769d8187623763bacb2ad5ffb20 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -554,9 +554,9 @@ int EVP_read_pw_string(char *buf,int length,const char *prompt,int verify);
 void   EVP_set_pw_prompt(char *prompt);
 char * EVP_get_pw_prompt(void);
 
-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);
+int     EVP_BytesToKey(const EVP_CIPHER *type, EVP_MD *md,
+               const unsigned char *salt, unsigned char *data, int datal,
+                       int count, unsigned char *key, unsigned char *iv);
 
 int    EVP_EncryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type,
                unsigned char *key, unsigned char *iv);

diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c
index 09b72bf4bdd1c661460da6d09d2ceec61e9be22c..f8710bf32953d62a2e3fcaaa3e866b13a555495e 100644 (file)
--- a/crypto/evp/evp_key.c
+++ b/crypto/evp/evp_key.c
@@ -95,9 +95,9 @@ int EVP_read_pw_string(char *buf, int len, const char *prompt, int verify)
 #endif
        }
 
-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)
+int EVP_BytesToKey(const EVP_CIPHER *type, EVP_MD *md, 
+             const 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];