exa/codecrypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

algos_enc: do not collide with library min() macro

Browse source
This commit is contained in:
Mirek Kratochvil 2013-09-15 15:09:01 +02:00
parent 4d3b95c2ab
commit 93dee89a4a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/algos_enc.cpp
View file

@ -218,7 +218,7 @@ static bool message_unpad (std::vector<byte> in, bvector&out)
* Fujisaki-okamoto part * Fujisaki-okamoto part
*/ */
#define min(a,b) ((a)<(b)?(a):(b)) #define MIN(a,b) ((a)<(b)?(a):(b))
#include "sha_hash.h" #include "sha_hash.h"
#include "arcfour.h" #include "arcfour.h"
@ -292,7 +292,7 @@ static int fo_encrypt (const bvector&plain, bvector&cipher,
//whole key must be tossed in, so split if when necessary //whole key must be tossed in, so split if when necessary
for (i = 0; i < (K.size() >> 8); ++i) { for (i = 0; i < (K.size() >> 8); ++i) {
std::vector<byte> subkey (K.begin() + (i << 8), std::vector<byte> subkey (K.begin() + (i << 8),
min (K.end(), MIN (K.end(),
K.begin() + ( (i + 1) << 8) ) ); K.begin() + ( (i + 1) << 8) ) );
arc.load_key (subkey); arc.load_key (subkey);
} }
@ -357,7 +357,7 @@ static int fo_decrypt (const bvector&cipher, bvector&plain,
//stuff in the whole key //stuff in the whole key
for (i = 0; i < (K.size() >> 8); ++i) { for (i = 0; i < (K.size() >> 8); ++i) {
std::vector<byte> subkey (K.begin() + (i << 8), std::vector<byte> subkey (K.begin() + (i << 8),
min (K.end(), MIN (K.end(),
K.begin() + ( (i + 1) << 8) ) ); K.begin() + ( (i + 1) << 8) ) );
arc.load_key (subkey); arc.load_key (subkey);
} }