X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=crypto%2Fdes%2Fecb_enc.c;h=badb7e1149e75c45737db43f7ec105fbe84dd106;hb=7e701817234ff2be2a745fc63f32ccb5e874854c;hp=6c0e5a41062173fc07d699f361ec1acf7250fdd6;hpb=6b691a5c85ddc4e407e32781841fee5c029506cd;p=openssl.git diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c index 6c0e5a4106..badb7e1149 100644 --- a/crypto/des/ecb_enc.c +++ b/crypto/des/ecb_enc.c @@ -58,10 +58,10 @@ #include "des_locl.h" #include "spr.h" -#include "opensslv.h" +#include -const char *libdes_version="libdes v 3.24 - 20-Apr-1996 - eay"; -const char *DES_version="DES" OPENSSL_VERSION_PTEXT; +OPENSSL_GLOBAL const char *libdes_version="libdes v 3.24 - 20-Apr-1996 - eay"; +OPENSSL_GLOBAL const char *DES_version="DES" OPENSSL_VERSION_PTEXT; const char *des_options(void) { @@ -72,7 +72,6 @@ const char *des_options(void) { const char *ptr,*unroll,*risc,*size; - init=0; #ifdef DES_PTR ptr="ptr"; #else @@ -98,16 +97,20 @@ const char *des_options(void) else size="long"; sprintf(buf,"des(%s,%s,%s,%s)",ptr,risc,unroll,size); + init=0; } return(buf); } -void des_ecb_encrypt(const des_cblock in, des_cblock out, des_key_schedule ks, +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;