X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=crypto%2Fdes%2Fecb_enc.c;h=b261a8aad9408b27d0e8cef87ac6202421e61d6b;hb=17f389bbbfccf057a8bc04084ed068c4b368e751;hp=a5c2c1e77c050bf9fed3b6033a79a3b48939c804;hpb=08853ba82d38548a9e178bd6506a0a8c0deade34;p=openssl.git diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c index a5c2c1e77c..b261a8aad9 100644 --- a/crypto/des/ecb_enc.c +++ b/crypto/des/ecb_enc.c @@ -58,20 +58,20 @@ #include "des_locl.h" #include "spr.h" +#include -char *libdes_version="libdes v 3.24 - 20-Apr-1996 - eay"; -char *DES_version="DES part of OpenSSL 0.9.2 31-Dec-1998"; +OPENSSL_GLOBAL const char *libdes_version="libdes" OPENSSL_VERSION_PTEXT; +OPENSSL_GLOBAL const char *DES_version="DES" OPENSSL_VERSION_PTEXT; -char *des_options() +const char *des_options(void) { static int init=1; static char buf[32]; if (init) { - char *ptr,*unroll,*risc,*size; + const char *ptr,*unroll,*risc,*size; - init=0; #ifdef DES_PTR ptr="ptr"; #else @@ -97,19 +97,20 @@ char *des_options() else size="long"; sprintf(buf,"des(%s,%s,%s,%s)",ptr,risc,unroll,size); + init=0; } return(buf); } -void des_ecb_encrypt(in, out, ks, enc) -const des_cblock in; -des_cblock out; -des_key_schedule ks; -int enc; +void des_ecb_encrypt(const_des_cblock *input, des_cblock *output, + des_key_schedule ks, + int enc) { register DES_LONG l; DES_LONG ll[2]; + const unsigned char *in = &(*input)[0]; + unsigned char *out = &(*output)[0]; c2l(in,l); ll[0]=l; c2l(in,l); ll[1]=l;