Fix escaping code for string printing. If *any* escaping is enabled we

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

diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c
index 00d5b91e8ca5e64125102d2772318bfe67075b4d..75ae6cf8bb6c447a85432f5d8595da52b053da77 100644 (file)
--- a/crypto/des/ecb_enc.c
+++ b/crypto/des/ecb_enc.c
@@ -57,54 +57,7 @@
  */
 
 #include "des_locl.h"
-#include "des_ver.h"
 #include "spr.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;
-
-const char *DES_options(void)
-       {
-       static int init=1;
-       static char buf[32];
-
-       if (init)
-               {
-               const char *ptr,*unroll,*risc,*size;
-
-#ifdef DES_PTR
-               ptr="ptr";
-#else
-               ptr="idx";
-#endif
-#if defined(DES_RISC1) || defined(DES_RISC2)
-#ifdef DES_RISC1
-               risc="risc1";
-#endif
-#ifdef DES_RISC2
-               risc="risc2";
-#endif
-#else
-               risc="cisc";
-#endif
-#ifdef DES_UNROLL
-               unroll="16";
-#else
-               unroll="4";
-#endif
-               if (sizeof(DES_LONG) != sizeof(long))
-                       size="int";
-               else
-                       size="long";
-               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)