projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use OPENSSL_GLOBAL, OPENSSL_EXTERN instead of GLOBAL and EXTERN.
[openssl.git]
/
crypto
/
des
/
str2key.c
diff --git
a/crypto/des/str2key.c
b/crypto/des/str2key.c
index 40f706beb723f4e9b520e484fbdb064007abb01b..674079b14b5bbba005afe2aec2aa8ce8dfad4ac3 100644
(file)
--- a/
crypto/des/str2key.c
+++ b/
crypto/des/str2key.c
@@
-58,7
+58,7
@@
#include "des_locl.h"
#include "des_locl.h"
-
extern
int des_check_key;
+
OPENSSL_EXTERN
int des_check_key;
void des_string_to_key(const char *str, des_cblock key)
{
void des_string_to_key(const char *str, des_cblock key)
{
@@
-92,7
+92,7
@@
void des_string_to_key(const char *str, des_cblock key)
des_check_key=0;
des_set_key(key,ks);
des_check_key=i;
des_check_key=0;
des_set_key(key,ks);
des_check_key=i;
- des_cbc_cksum(str,key,length,ks,key);
+ des_cbc_cksum(
(unsigned char*)
str,key,length,ks,key);
memset(ks,0,sizeof(ks));
des_set_odd_parity(key);
}
memset(ks,0,sizeof(ks));
des_set_odd_parity(key);
}
@@
-153,9
+153,9
@@
void des_string_to_2keys(const char *str, des_cblock key1, des_cblock key2)
i=des_check_key;
des_check_key=0;
des_set_key(key1,ks);
i=des_check_key;
des_check_key=0;
des_set_key(key1,ks);
- des_cbc_cksum(str,key1,length,ks,key1);
+ des_cbc_cksum(
(unsigned char*)
str,key1,length,ks,key1);
des_set_key(key2,ks);
des_set_key(key2,ks);
- des_cbc_cksum(str,key2,length,ks,key2);
+ des_cbc_cksum(
(unsigned char*)
str,key2,length,ks,key2);
des_check_key=i;
memset(ks,0,sizeof(ks));
des_set_odd_parity(key1);
des_check_key=i;
memset(ks,0,sizeof(ks));
des_set_odd_parity(key1);