In EC_KEY_set_public_key_affine_coordinates include explicit check to see passed...

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

diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c
index d481327ef3b38a279d92c512b6d2c5c8a56e3c3f..de4ede1a7b9c43a068a8373dae2c645f42173abf 100644 (file)
--- a/crypto/des/ecb_enc.c
+++ b/crypto/des/ecb_enc.c
@@ -56,14 +56,16 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include "des_locl.h"
-#include "spr.h"
+#include "des_ver.h"
 #include <openssl/opensslv.h>
+#include <openssl/bio.h>
 
-OPENSSL_GLOBAL const char *libdes_version="libdes" OPENSSL_VERSION_PTEXT;
-OPENSSL_GLOBAL 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];
@@ -90,22 +92,22 @@ const char *des_options(void)
 #ifdef DES_UNROLL
                unroll="16";
 #else
-               unroll="4";
+               unroll="2";
 #endif
                if (sizeof(DES_LONG) != sizeof(long))
                        size="int";
                else
                        size="long";
-               sprintf(buf,"des(%s,%s,%s,%s)",ptr,risc,unroll,size);
+               BIO_snprintf(buf,sizeof buf,"des(%s,%s,%s,%s)",ptr,risc,unroll,
+                            size);
                init=0;
                }
        return(buf);
        }
                
 
-void des_ecb_encrypt(const_des_cblock *input, des_cblock *output,
-            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];
@@ -114,9 +116,8 @@ void des_ecb_encrypt(const_des_cblock *input, des_cblock *output,
 
        c2l(in,l); ll[0]=l;
        c2l(in,l); ll[1]=l;
-       des_encrypt1(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;
        }
-