projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restore change undone in 1.831 (apparently by accident)
[oweals/openssl.git]
/
crypto
/
cast
/
c_ecb.c
diff --git
a/crypto/cast/c_ecb.c
b/crypto/cast/c_ecb.c
index e6a3d4332e937141ad445dcf7f3fb4ee1d57adec..0b3da9ad871784d0504396fdee3cc4aef19e9579 100644
(file)
--- a/
crypto/cast/c_ecb.c
+++ b/
crypto/cast/c_ecb.c
@@
-56,23
+56,20
@@
* [including the GNU Public Licence.]
*/
* [including the GNU Public Licence.]
*/
-#include
"cast.h"
+#include
<openssl/cast.h>
#include "cast_lcl.h"
#include "cast_lcl.h"
-#include
"opensslv.h"
+#include
<openssl/opensslv.h>
-char *CAST_version="CAST" OPENSSL_VERSION_PTEXT;
+c
onst c
har *CAST_version="CAST" OPENSSL_VERSION_PTEXT;
-void CAST_ecb_encrypt(in, out, ks, encrypt)
-unsigned char *in;
-unsigned char *out;
-CAST_KEY *ks;
-int encrypt;
+void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
+ CAST_KEY *ks, int enc)
{
CAST_LONG l,d[2];
n2l(in,l); d[0]=l;
n2l(in,l); d[1]=l;
{
CAST_LONG l,d[2];
n2l(in,l); d[0]=l;
n2l(in,l); d[1]=l;
- if (enc
rypt
)
+ if (enc)
CAST_encrypt(d,ks);
else
CAST_decrypt(d,ks);
CAST_encrypt(d,ks);
else
CAST_decrypt(d,ks);