[rtems-libbsd commit] openssl: Remove superfluous file

Sebastian Huber sebh at rtems.org
Mon Jan 8 13:01:28 UTC 2018


Module:    rtems-libbsd
Branch:    master
Commit:    4e3a5d3f032c5146af87fff32ede39e85f893e68
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=4e3a5d3f032c5146af87fff32ede39e85f893e68

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Dec 22 13:18:25 2017 +0100

openssl: Remove superfluous file

---

 freebsd/crypto/openssl/crypto/bf/bf_cbc.c | 137 ------------------------------
 libbsd.py                                 |   1 -
 libbsd_waf.py                             |   1 -
 3 files changed, 139 deletions(-)

diff --git a/freebsd/crypto/openssl/crypto/bf/bf_cbc.c b/freebsd/crypto/openssl/crypto/bf/bf_cbc.c
deleted file mode 100644
index 1d02e04..0000000
--- a/freebsd/crypto/openssl/crypto/bf/bf_cbc.c
+++ /dev/null
@@ -1,137 +0,0 @@
-#include <machine/rtems-bsd-user-space.h>
-
-/* crypto/bf/bf_cbc.c */
-/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay at cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh at cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay at cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh at cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <openssl/blowfish.h>
-#include "bf_locl.h"
-
-void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-                    const BF_KEY *schedule, unsigned char *ivec, int encrypt)
-{
-    register BF_LONG tin0, tin1;
-    register BF_LONG tout0, tout1, xor0, xor1;
-    register long l = length;
-    BF_LONG tin[2];
-
-    if (encrypt) {
-        n2l(ivec, tout0);
-        n2l(ivec, tout1);
-        ivec -= 8;
-        for (l -= 8; l >= 0; l -= 8) {
-            n2l(in, tin0);
-            n2l(in, tin1);
-            tin0 ^= tout0;
-            tin1 ^= tout1;
-            tin[0] = tin0;
-            tin[1] = tin1;
-            BF_encrypt(tin, schedule);
-            tout0 = tin[0];
-            tout1 = tin[1];
-            l2n(tout0, out);
-            l2n(tout1, out);
-        }
-        if (l != -8) {
-            n2ln(in, tin0, tin1, l + 8);
-            tin0 ^= tout0;
-            tin1 ^= tout1;
-            tin[0] = tin0;
-            tin[1] = tin1;
-            BF_encrypt(tin, schedule);
-            tout0 = tin[0];
-            tout1 = tin[1];
-            l2n(tout0, out);
-            l2n(tout1, out);
-        }
-        l2n(tout0, ivec);
-        l2n(tout1, ivec);
-    } else {
-        n2l(ivec, xor0);
-        n2l(ivec, xor1);
-        ivec -= 8;
-        for (l -= 8; l >= 0; l -= 8) {
-            n2l(in, tin0);
-            n2l(in, tin1);
-            tin[0] = tin0;
-            tin[1] = tin1;
-            BF_decrypt(tin, schedule);
-            tout0 = tin[0] ^ xor0;
-            tout1 = tin[1] ^ xor1;
-            l2n(tout0, out);
-            l2n(tout1, out);
-            xor0 = tin0;
-            xor1 = tin1;
-        }
-        if (l != -8) {
-            n2l(in, tin0);
-            n2l(in, tin1);
-            tin[0] = tin0;
-            tin[1] = tin1;
-            BF_decrypt(tin, schedule);
-            tout0 = tin[0] ^ xor0;
-            tout1 = tin[1] ^ xor1;
-            l2nn(tout0, tout1, out, l + 8);
-            xor0 = tin0;
-            xor1 = tin1;
-        }
-        l2n(xor0, ivec);
-        l2n(xor1, ivec);
-    }
-    tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
-    tin[0] = tin[1] = 0;
-}
diff --git a/libbsd.py b/libbsd.py
index bcddcba..c615675 100644
--- a/libbsd.py
+++ b/libbsd.py
@@ -3334,7 +3334,6 @@ def crypto_openssl(mm):
             'crypto/openssl/crypto/bf/bf_enc.c',
             'crypto/openssl/crypto/bf/bfspeed.c',
             'crypto/openssl/crypto/bf/bf_cfb64.c',
-            'crypto/openssl/crypto/bf/bf_cbc.c',
             'crypto/openssl/crypto/bf/bf_ecb.c',
             'crypto/openssl/crypto/rc4/rc4_utl.c',
             'crypto/openssl/crypto/rc4/rc4_enc.c',
diff --git a/libbsd_waf.py b/libbsd_waf.py
index a589808..c41a5d7 100644
--- a/libbsd_waf.py
+++ b/libbsd_waf.py
@@ -655,7 +655,6 @@ def build(bld):
                      'freebsd/crypto/openssl/crypto/asn1/x_val.c',
                      'freebsd/crypto/openssl/crypto/asn1/x_x509.c',
                      'freebsd/crypto/openssl/crypto/asn1/x_x509a.c',
-                     'freebsd/crypto/openssl/crypto/bf/bf_cbc.c',
                      'freebsd/crypto/openssl/crypto/bf/bf_cfb64.c',
                      'freebsd/crypto/openssl/crypto/bf/bf_ecb.c',
                      'freebsd/crypto/openssl/crypto/bf/bf_enc.c',



More information about the vc mailing list