Redundant now as it's moved to ./Makefile.org.

[openssl.git] / crypto / des / ecb_enc.c

diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c
index 9de7b1d5c94794d23be385ed67e883a125c9d81f..1b70f68806d9d91c4b1860a3c935b1635422ae73 100644 (file)
--- a/crypto/des/ecb_enc.c
+++ b/crypto/des/ecb_enc.c
@@ -57,13 +57,14 @@
  */
 
 #include "des_locl.h"
  */
 
 #include "des_locl.h"

+#include "des_ver.h"

 #include "spr.h"
 #include "spr.h"

-#include "opensslv.h"
+#include <openssl/opensslv.h>

 
 

-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" OPENSSL_VERSION_PTEXT;
+OPENSSL_GLOBAL const char *DES_version="DES" OPENSSL_VERSION_PTEXT;

 
 

-const char *des_options(void)
+const char *DES_options(void)

        {
        static int init=1;
        static char buf[32];
        {
        static int init=1;
        static char buf[32];


@@ -103,17 +104,18 @@ const char *des_options(void)
        }
                
 
        }
                
 

-void des_ecb_encrypt(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];
        {
        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;
 
        c2l(in,l); ll[0]=l;
        c2l(in,l); ll[1]=l;

-       des_encrypt(ll,ks,enc);
+       DES_encrypt1(ll,ks,enc);

        l=ll[0]; l2c(l,out);
        l=ll[1]; l2c(l,out);
        l=ll[0]=ll[1]=0;
        }
        l=ll[0]; l2c(l,out);
        l=ll[1]; l2c(l,out);
        l=ll[0]=ll[1]=0;
        }

-