summaryrefslogtreecommitdiff
path: root/libavutil/des.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2009-01-13 23:44:16 +0000
committerAurelien Jacobs <aurel@gnuage.org>2009-01-13 23:44:16 +0000
commitb250f9c66d3ddd84652d158fb979a5f21e3f2c71 (patch)
treeef84366029d6f8af6ed82e90c5f188bb7dfc844d /libavutil/des.c
parent959da985b03570cfe7d239c0ba6d550ecb04c460 (diff)
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1. Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/des.c')
-rw-r--r--libavutil/des.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/des.c b/libavutil/des.c
index 43a14f6e6e..51d73a3c1e 100644
--- a/libavutil/des.c
+++ b/libavutil/des.c
@@ -74,7 +74,7 @@ static const uint8_t PC2_shuffle[] = {
};
#undef T
-#ifdef CONFIG_SMALL
+#if CONFIG_SMALL
static const uint8_t S_boxes[8][32] = {
{
0x0e, 0xf4, 0x7d, 0x41, 0xe2, 0x2f, 0xdb, 0x18, 0xa3, 0x6a, 0xc6, 0xbc, 0x95, 0x59, 0x30, 0x87,
@@ -218,7 +218,7 @@ static uint32_t f_func(uint32_t r, uint64_t k) {
// apply S-boxes, those compress the data again from 8 * 6 to 8 * 4 bits
for (i = 7; i >= 0; i--) {
uint8_t tmp = (r ^ k) & 0x3f;
-#ifdef CONFIG_SMALL
+#if CONFIG_SMALL
uint8_t v = S_boxes[i][tmp >> 1];
if (tmp & 1) v >>= 4;
out = (out >> 4) | (v << 28);
@@ -229,7 +229,7 @@ static uint32_t f_func(uint32_t r, uint64_t k) {
r = (r >> 4) | (r << 28);
k >>= 6;
}
-#ifdef CONFIG_SMALL
+#if CONFIG_SMALL
out = shuffle(out, P_shuffle, sizeof(P_shuffle));
#endif
return out;