kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
dc8b1abb75
boringssl/crypto/fipsmodule/des/internal.h

241 lines
10 KiB
C
Raw Normal View History

Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* This package is an SSL implementation written
* by Eric Young (eay@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@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@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@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.] */
#ifndef OPENSSL_HEADER_DES_INTERNAL_H
#define OPENSSL_HEADER_DES_INTERNAL_H
#include <openssl/base.h>
Move OPENSSL_FALLTHROUGH to internal headers. Having it in base.h pollutes the global namespace a bit and, in particular, causes clang to give unhelpful suggestions in consuming projects. Change-Id: I6ca1a88bdd1701f0c49192a0df56ac0953c7067c Reviewed-on: https://boringssl-review.googlesource.com/25464 Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2018-01-29 18:05:51 +00:00
#include "../../internal.h"
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
#if defined(__cplusplus)
extern "C" {
#endif
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
#define c2l(c, l) \
do { \
(l) = ((uint32_t)(*((c)++))); \
(l) |= ((uint32_t)(*((c)++))) << 8L; \
(l) |= ((uint32_t)(*((c)++))) << 16L; \
(l) |= ((uint32_t)(*((c)++))) << 24L; \
} while (0)
#define l2c(l, c) \
do { \
*((c)++) = (unsigned char)(((l)) & 0xff); \
*((c)++) = (unsigned char)(((l) >> 8L) & 0xff); \
*((c)++) = (unsigned char)(((l) >> 16L) & 0xff); \
*((c)++) = (unsigned char)(((l) >> 24L) & 0xff); \
} while (0)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
Run the comment converter on libcrypto. crypto/{asn1,x509,x509v3,pem} were skipped as they are still OpenSSL style. Change-Id: I3cd9a60e1cb483a981aca325041f3fbce294247c Reviewed-on: https://boringssl-review.googlesource.com/19504 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-08-18 19:06:02 +01:00
// NOTE - c is not incremented as per c2l
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
#define c2ln(c, l1, l2, n) \
do { \
(c) += (n); \
(l1) = (l2) = 0; \
switch (n) { \
case 8: \
(l2) = ((uint32_t)(*(--(c)))) << 24L; \
Explicit fallthrough on switch Fixes failed compile with [-Werror=implicit-fallthrough=], which is default on gcc-7.x on distributions like fedora. Enabling no implicit fallthrough for more than just clang as well to catch this going forward. Change-Id: I6cd880dac70ec126bd7812e2d9e5ff804d32cadd Signed-off-by: Vincent Batts <vbatts@redhat.com> Reviewed-on: https://boringssl-review.googlesource.com/20564 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
2017-09-20 16:51:54 +01:00
OPENSSL_FALLTHROUGH; \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
case 7: \
(l2) |= ((uint32_t)(*(--(c)))) << 16L; \
Explicit fallthrough on switch Fixes failed compile with [-Werror=implicit-fallthrough=], which is default on gcc-7.x on distributions like fedora. Enabling no implicit fallthrough for more than just clang as well to catch this going forward. Change-Id: I6cd880dac70ec126bd7812e2d9e5ff804d32cadd Signed-off-by: Vincent Batts <vbatts@redhat.com> Reviewed-on: https://boringssl-review.googlesource.com/20564 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
2017-09-20 16:51:54 +01:00
OPENSSL_FALLTHROUGH; \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
case 6: \
(l2) |= ((uint32_t)(*(--(c)))) << 8L; \
Explicit fallthrough on switch Fixes failed compile with [-Werror=implicit-fallthrough=], which is default on gcc-7.x on distributions like fedora. Enabling no implicit fallthrough for more than just clang as well to catch this going forward. Change-Id: I6cd880dac70ec126bd7812e2d9e5ff804d32cadd Signed-off-by: Vincent Batts <vbatts@redhat.com> Reviewed-on: https://boringssl-review.googlesource.com/20564 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
2017-09-20 16:51:54 +01:00
OPENSSL_FALLTHROUGH; \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
case 5: \
(l2) |= ((uint32_t)(*(--(c)))); \
Explicit fallthrough on switch Fixes failed compile with [-Werror=implicit-fallthrough=], which is default on gcc-7.x on distributions like fedora. Enabling no implicit fallthrough for more than just clang as well to catch this going forward. Change-Id: I6cd880dac70ec126bd7812e2d9e5ff804d32cadd Signed-off-by: Vincent Batts <vbatts@redhat.com> Reviewed-on: https://boringssl-review.googlesource.com/20564 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
2017-09-20 16:51:54 +01:00
OPENSSL_FALLTHROUGH; \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
case 4: \
(l1) = ((uint32_t)(*(--(c)))) << 24L; \
Explicit fallthrough on switch Fixes failed compile with [-Werror=implicit-fallthrough=], which is default on gcc-7.x on distributions like fedora. Enabling no implicit fallthrough for more than just clang as well to catch this going forward. Change-Id: I6cd880dac70ec126bd7812e2d9e5ff804d32cadd Signed-off-by: Vincent Batts <vbatts@redhat.com> Reviewed-on: https://boringssl-review.googlesource.com/20564 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
2017-09-20 16:51:54 +01:00
OPENSSL_FALLTHROUGH; \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
case 3: \
(l1) |= ((uint32_t)(*(--(c)))) << 16L; \
Explicit fallthrough on switch Fixes failed compile with [-Werror=implicit-fallthrough=], which is default on gcc-7.x on distributions like fedora. Enabling no implicit fallthrough for more than just clang as well to catch this going forward. Change-Id: I6cd880dac70ec126bd7812e2d9e5ff804d32cadd Signed-off-by: Vincent Batts <vbatts@redhat.com> Reviewed-on: https://boringssl-review.googlesource.com/20564 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
2017-09-20 16:51:54 +01:00
OPENSSL_FALLTHROUGH; \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
case 2: \
(l1) |= ((uint32_t)(*(--(c)))) << 8L; \
Explicit fallthrough on switch Fixes failed compile with [-Werror=implicit-fallthrough=], which is default on gcc-7.x on distributions like fedora. Enabling no implicit fallthrough for more than just clang as well to catch this going forward. Change-Id: I6cd880dac70ec126bd7812e2d9e5ff804d32cadd Signed-off-by: Vincent Batts <vbatts@redhat.com> Reviewed-on: https://boringssl-review.googlesource.com/20564 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
2017-09-20 16:51:54 +01:00
OPENSSL_FALLTHROUGH; \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
case 1: \
(l1) |= ((uint32_t)(*(--(c)))); \
} \
} while (0)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
Run the comment converter on libcrypto. crypto/{asn1,x509,x509v3,pem} were skipped as they are still OpenSSL style. Change-Id: I3cd9a60e1cb483a981aca325041f3fbce294247c Reviewed-on: https://boringssl-review.googlesource.com/19504 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-08-18 19:06:02 +01:00
// NOTE - c is not incremented as per l2c
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
#define l2cn(l1, l2, c, n) \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
do { \
(c) += (n); \
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
switch (n) { \
case 8: \
*(--(c)) = (unsigned char)(((l2) >> 24L) & 0xff); \
Explicit fallthrough on switch Fixes failed compile with [-Werror=implicit-fallthrough=], which is default on gcc-7.x on distributions like fedora. Enabling no implicit fallthrough for more than just clang as well to catch this going forward. Change-Id: I6cd880dac70ec126bd7812e2d9e5ff804d32cadd Signed-off-by: Vincent Batts <vbatts@redhat.com> Reviewed-on: https://boringssl-review.googlesource.com/20564 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
2017-09-20 16:51:54 +01:00
OPENSSL_FALLTHROUGH; \
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
case 7: \
*(--(c)) = (unsigned char)(((l2) >> 16L) & 0xff); \
Explicit fallthrough on switch Fixes failed compile with [-Werror=implicit-fallthrough=], which is default on gcc-7.x on distributions like fedora. Enabling no implicit fallthrough for more than just clang as well to catch this going forward. Change-Id: I6cd880dac70ec126bd7812e2d9e5ff804d32cadd Signed-off-by: Vincent Batts <vbatts@redhat.com> Reviewed-on: https://boringssl-review.googlesource.com/20564 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
2017-09-20 16:51:54 +01:00
OPENSSL_FALLTHROUGH; \
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
case 6: \
*(--(c)) = (unsigned char)(((l2) >> 8L) & 0xff); \
Explicit fallthrough on switch Fixes failed compile with [-Werror=implicit-fallthrough=], which is default on gcc-7.x on distributions like fedora. Enabling no implicit fallthrough for more than just clang as well to catch this going forward. Change-Id: I6cd880dac70ec126bd7812e2d9e5ff804d32cadd Signed-off-by: Vincent Batts <vbatts@redhat.com> Reviewed-on: https://boringssl-review.googlesource.com/20564 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
2017-09-20 16:51:54 +01:00
OPENSSL_FALLTHROUGH; \
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
case 5: \
*(--(c)) = (unsigned char)(((l2)) & 0xff); \
Explicit fallthrough on switch Fixes failed compile with [-Werror=implicit-fallthrough=], which is default on gcc-7.x on distributions like fedora. Enabling no implicit fallthrough for more than just clang as well to catch this going forward. Change-Id: I6cd880dac70ec126bd7812e2d9e5ff804d32cadd Signed-off-by: Vincent Batts <vbatts@redhat.com> Reviewed-on: https://boringssl-review.googlesource.com/20564 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
2017-09-20 16:51:54 +01:00
OPENSSL_FALLTHROUGH; \
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
case 4: \
*(--(c)) = (unsigned char)(((l1) >> 24L) & 0xff); \
Explicit fallthrough on switch Fixes failed compile with [-Werror=implicit-fallthrough=], which is default on gcc-7.x on distributions like fedora. Enabling no implicit fallthrough for more than just clang as well to catch this going forward. Change-Id: I6cd880dac70ec126bd7812e2d9e5ff804d32cadd Signed-off-by: Vincent Batts <vbatts@redhat.com> Reviewed-on: https://boringssl-review.googlesource.com/20564 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
2017-09-20 16:51:54 +01:00
OPENSSL_FALLTHROUGH; \
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
case 3: \
*(--(c)) = (unsigned char)(((l1) >> 16L) & 0xff); \
Explicit fallthrough on switch Fixes failed compile with [-Werror=implicit-fallthrough=], which is default on gcc-7.x on distributions like fedora. Enabling no implicit fallthrough for more than just clang as well to catch this going forward. Change-Id: I6cd880dac70ec126bd7812e2d9e5ff804d32cadd Signed-off-by: Vincent Batts <vbatts@redhat.com> Reviewed-on: https://boringssl-review.googlesource.com/20564 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
2017-09-20 16:51:54 +01:00
OPENSSL_FALLTHROUGH; \
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
case 2: \
*(--(c)) = (unsigned char)(((l1) >> 8L) & 0xff); \
Explicit fallthrough on switch Fixes failed compile with [-Werror=implicit-fallthrough=], which is default on gcc-7.x on distributions like fedora. Enabling no implicit fallthrough for more than just clang as well to catch this going forward. Change-Id: I6cd880dac70ec126bd7812e2d9e5ff804d32cadd Signed-off-by: Vincent Batts <vbatts@redhat.com> Reviewed-on: https://boringssl-review.googlesource.com/20564 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
2017-09-20 16:51:54 +01:00
OPENSSL_FALLTHROUGH; \
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
case 1: \
*(--(c)) = (unsigned char)(((l1)) & 0xff); \
} \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
} while (0)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
/* IP and FP
* The problem is more of a geometric problem that random bit fiddling.
0 1 2 3 4 5 6 7 62 54 46 38 30 22 14 6
8 9 10 11 12 13 14 15 60 52 44 36 28 20 12 4
16 17 18 19 20 21 22 23 58 50 42 34 26 18 10 2
24 25 26 27 28 29 30 31 to 56 48 40 32 24 16 8 0
32 33 34 35 36 37 38 39 63 55 47 39 31 23 15 7
40 41 42 43 44 45 46 47 61 53 45 37 29 21 13 5
48 49 50 51 52 53 54 55 59 51 43 35 27 19 11 3
56 57 58 59 60 61 62 63 57 49 41 33 25 17 9 1
The output has been subject to swaps of the form
0 1 -> 3 1 but the odd and even bits have been put into
2 3 2 0
different words. The main trick is to remember that
t=((l>>size)^r)&(mask);
r^=t;
l^=(t<<size);
can be used to swap and move bits between words.
So l = 0 1 2 3 r = 16 17 18 19
4 5 6 7 20 21 22 23
8 9 10 11 24 25 26 27
12 13 14 15 28 29 30 31
becomes (for size == 2 and mask == 0x3333)
t = 2^16 3^17 -- -- l = 0 1 16 17 r = 2 3 18 19
6^20 7^21 -- -- 4 5 20 21 6 7 22 23
10^24 11^25 -- -- 8 9 24 25 10 11 24 25
14^28 15^29 -- -- 12 13 28 29 14 15 28 29
Thanks for hints from Richard Outerbridge - he told me IP&FP
could be done in 15 xor, 10 shifts and 5 ands.
When I finally started to think of the problem in 2D
I first got ~42 operations without xors. When I remembered
how to use xors :-) I got it to its final state.
*/
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
#define PERM_OP(a, b, t, n, m) \
do { \
(t) = ((((a) >> (n)) ^ (b)) & (m)); \
(b) ^= (t); \
(a) ^= ((t) << (n)); \
} while (0)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
#define IP(l, r) \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
do { \
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
uint32_t tt; \
PERM_OP(r, l, tt, 4, 0x0f0f0f0fL); \
PERM_OP(l, r, tt, 16, 0x0000ffffL); \
PERM_OP(r, l, tt, 2, 0x33333333L); \
PERM_OP(l, r, tt, 8, 0x00ff00ffL); \
PERM_OP(r, l, tt, 1, 0x55555555L); \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
} while (0)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
#define FP(l, r) \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
do { \
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
uint32_t tt; \
PERM_OP(l, r, tt, 1, 0x55555555L); \
PERM_OP(r, l, tt, 8, 0x00ff00ffL); \
PERM_OP(l, r, tt, 2, 0x33333333L); \
PERM_OP(r, l, tt, 16, 0x0000ffffL); \
PERM_OP(l, r, tt, 4, 0x0f0f0f0fL); \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
} while (0)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
Clean up the DES_key_schedule logic. It's not clear why OpenSSL had a union. The comment says something about sizes of long, since OpenSSL doesn't use stdint.h. But the variable is treated as a bunch of uint32_t's, not DES_cblocks. The key schedule is also always used by iterating or indexing into a uint32_t*, treating the 16 2-word subkeys as a single uint32_t[32]. Instead, index into them properly shush any picky tools. The compiler should be able to figure out what's going on and optimize it appropriately. BUG=517495 Change-Id: I83d0e63ac2c6fb76fac1dceda9f2fd6762074341 Reviewed-on: https://boringssl-review.googlesource.com/5627 Reviewed-by: Adam Langley <agl@google.com>
2015-08-06 21:36:32 +01:00
#define LOAD_DATA(ks, R, S, u, t, E0, E1) \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
do { \
(u) = (R) ^ (ks)->subkeys[S][0]; \
(t) = (R) ^ (ks)->subkeys[S][1]; \
} while (0)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
Clean up the DES_key_schedule logic. It's not clear why OpenSSL had a union. The comment says something about sizes of long, since OpenSSL doesn't use stdint.h. But the variable is treated as a bunch of uint32_t's, not DES_cblocks. The key schedule is also always used by iterating or indexing into a uint32_t*, treating the 16 2-word subkeys as a single uint32_t[32]. Instead, index into them properly shush any picky tools. The compiler should be able to figure out what's going on and optimize it appropriately. BUG=517495 Change-Id: I83d0e63ac2c6fb76fac1dceda9f2fd6762074341 Reviewed-on: https://boringssl-review.googlesource.com/5627 Reviewed-by: Adam Langley <agl@google.com>
2015-08-06 21:36:32 +01:00
#define D_ENCRYPT(ks, LL, R, S) \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
do { \
Clean up the DES_key_schedule logic. It's not clear why OpenSSL had a union. The comment says something about sizes of long, since OpenSSL doesn't use stdint.h. But the variable is treated as a bunch of uint32_t's, not DES_cblocks. The key schedule is also always used by iterating or indexing into a uint32_t*, treating the 16 2-word subkeys as a single uint32_t[32]. Instead, index into them properly shush any picky tools. The compiler should be able to figure out what's going on and optimize it appropriately. BUG=517495 Change-Id: I83d0e63ac2c6fb76fac1dceda9f2fd6762074341 Reviewed-on: https://boringssl-review.googlesource.com/5627 Reviewed-by: Adam Langley <agl@google.com>
2015-08-06 21:36:32 +01:00
LOAD_DATA(ks, R, S, u, t, E0, E1); \
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
t = ROTATE(t, 4); \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
(LL) ^= \
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
DES_SPtrans[0][(u >> 2L) & 0x3f] ^ DES_SPtrans[2][(u >> 10L) & 0x3f] ^ \
DES_SPtrans[4][(u >> 18L) & 0x3f] ^ \
DES_SPtrans[6][(u >> 26L) & 0x3f] ^ DES_SPtrans[1][(t >> 2L) & 0x3f] ^ \
DES_SPtrans[3][(t >> 10L) & 0x3f] ^ \
DES_SPtrans[5][(t >> 18L) & 0x3f] ^ DES_SPtrans[7][(t >> 26L) & 0x3f]; \
Fix up macros. Macros need a healthy dose of parentheses to avoid expression-level misparses. Most of this comes from the clang-tidy CL here: https://android-review.googlesource.com/c/235696/ Also switch most of the macros to use do { ... } while (0) to avoid all the excessive comma operators and statement-level misparses. Change-Id: I4c2ee51e347d2aa8c74a2d82de63838b03bbb0f9 Reviewed-on: https://boringssl-review.googlesource.com/11660 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
2016-10-18 18:05:01 +01:00
} while (0)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
#define ITERATIONS 16
#define HALF_ITERATIONS 8
#define ROTATE(a, n) (((a) >> (n)) + ((a) << (32 - (n))))
#if defined(__cplusplus)
Run the comment converter on libcrypto. crypto/{asn1,x509,x509v3,pem} were skipped as they are still OpenSSL style. Change-Id: I3cd9a60e1cb483a981aca325041f3fbce294247c Reviewed-on: https://boringssl-review.googlesource.com/19504 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-08-18 19:06:02 +01:00
} // extern C
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
#endif
Run the comment converter on libcrypto. crypto/{asn1,x509,x509v3,pem} were skipped as they are still OpenSSL style. Change-Id: I3cd9a60e1cb483a981aca325041f3fbce294247c Reviewed-on: https://boringssl-review.googlesource.com/19504 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-08-18 19:06:02 +01:00
#endif // OPENSSL_HEADER_DES_INTERNAL_H
Reference in New Issue Copy Permalink