unifdef -DOPENSSL_NO_RC5

2 files changed, 2 insertions, 42 deletions

diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c
index c85a807d29..0361d1cbb4 100644
--- a/src/usr.bin/openssl/openssl.c
+++ b/src/usr.bin/openssl/openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openssl.c,v 1.7 2015/09/11 14:30:23 bcook Exp $ */
+/* $OpenBSD: openssl.c,v 1.8 2015/09/11 20:55:59 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -321,13 +321,6 @@ FUNCTION functions[] = {
         { FUNC_TYPE_CIPHER, "rc4", enc_main },
         { FUNC_TYPE_CIPHER, "rc4-40", enc_main },
 #endif
-#ifndef OPENSSL_NO_RC5
-        { FUNC_TYPE_CIPHER, "rc5", enc_main },
-        { FUNC_TYPE_CIPHER, "rc5-cbc", enc_main },
-        { FUNC_TYPE_CIPHER, "rc5-ecb", enc_main },
-        { FUNC_TYPE_CIPHER, "rc5-cfb", enc_main },
-        { FUNC_TYPE_CIPHER, "rc5-ofb", enc_main },
-#endif
 #ifdef ZLIB
         { FUNC_TYPE_CIPHER, "zlib", enc_main },
 #endif
diff --git a/src/usr.bin/openssl/speed.c b/src/usr.bin/openssl/speed.c
index 2c3dd8d6c6..a149a31afa 100644
--- a/src/usr.bin/openssl/speed.c
+++ b/src/usr.bin/openssl/speed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: speed.c,v 1.11 2015/09/11 14:30:23 bcook Exp $ */
+/* $OpenBSD: speed.c,v 1.12 2015/09/11 20:55:59 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -136,9 +136,6 @@
 #ifndef OPENSSL_NO_RC4
 #include <openssl/rc4.h>
 #endif
-#ifndef OPENSSL_NO_RC5
-#include <openssl/rc5.h>
-#endif
 #include <openssl/rsa.h>
 #ifndef OPENSSL_NO_RIPEMD
 #include <openssl/ripemd.h>
@@ -260,9 +257,6 @@ speed_main(int argc, char **argv)
 #ifndef OPENSSL_NO_RC4
         RC4_KEY rc4_ks;
 #endif
-#ifndef OPENSSL_NO_RC5
-        RC5_32_KEY rc5_ks;
-#endif
 #ifndef OPENSSL_NO_RC2
         RC2_KEY rc2_ks;
 #endif
@@ -670,13 +664,6 @@ speed_main(int argc, char **argv)
                         doit[D_CBC_RC2] = 1;
                 else
 #endif
-#ifndef OPENSSL_NO_RC5
-                if (strcmp(*argv, "rc5-cbc") == 0)
-                        doit[D_CBC_RC5] = 1;
-                else if (strcmp(*argv, "rc5") == 0)
-                        doit[D_CBC_RC5] = 1;
-                else
-#endif
 #ifndef OPENSSL_NO_IDEA
                 if (strcmp(*argv, "idea-cbc") == 0)
                         doit[D_CBC_IDEA] = 1;
@@ -848,9 +835,6 @@ speed_main(int argc, char **argv)
 #ifndef OPENSSL_NO_RC2
                         BIO_printf(bio_err, "rc2-cbc  ");
 #endif
-#ifndef OPENSSL_NO_RC5
-                        BIO_printf(bio_err, "rc5-cbc  ");
-#endif
 #ifndef OPENSSL_NO_BF
                         BIO_printf(bio_err, "bf-cbc");
 #endif
@@ -989,9 +973,6 @@ speed_main(int argc, char **argv)
 #ifndef OPENSSL_NO_RC2
         RC2_set_key(&rc2_ks, 16, key16, 128);
 #endif
-#ifndef OPENSSL_NO_RC5
-        RC5_32_set_key(&rc5_ks, 16, key16, 12);
-#endif
 #ifndef OPENSSL_NO_BF
         BF_set_key(&bf_ks, 16, key16);
 #endif
@@ -1306,20 +1287,6 @@ speed_main(int argc, char **argv)
                 }
         }
 #endif
-#ifndef OPENSSL_NO_RC5
-        if (doit[D_CBC_RC5]) {
-                for (j = 0; j < SIZE_NUM; j++) {
-                        print_message(names[D_CBC_RC5], c[D_CBC_RC5][j], lengths[j]);
-                        Time_F(START);
-                        for (count = 0, run = 1; COND(c[D_CBC_RC5][j]); count++)
-                                RC5_32_cbc_encrypt(buf, buf,
-                                    (unsigned long) lengths[j], &rc5_ks,
-                                    iv, RC5_ENCRYPT);
-                        d = Time_F(STOP);
-                        print_result(D_CBC_RC5, j, count, d);
-                }
-        }
-#endif
 #ifndef OPENSSL_NO_BF
         if (doit[D_CBC_BF]) {
                 for (j = 0; j < SIZE_NUM; j++) {