diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crypto.gyp | 12 | ||||
| -rw-r--r-- | crypto/rsa_private_key.cc | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 3a56631..416f64c 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -22,7 +22,7 @@ 4018, ], 'conditions': [ - [ 'os_posix == 1 and OS != "mac"', { + [ 'os_posix == 1 and OS != "mac" and OS != "android"', { 'dependencies': [ '../build/linux/system.gyp:ssl', ], @@ -35,7 +35,7 @@ }, ], ], - }, { # os_posix != 1 or OS == "mac" + }, { # os_posix != 1 or OS == "mac" or OS == "android" 'sources/': [ ['exclude', '_nss\.cc$'], ['include', 'ec_private_key_nss\.cc$'], @@ -44,6 +44,14 @@ 'openpgp_symmetric_encryption.cc', ], }], + [ 'OS == "android"', { + 'dependencies': [ + '../build/android/system.gyp:ssl', + ], + 'sources/': [ + ['exclude', 'ec_private_key_nss\.cc$'], + ], + }], [ 'OS == "freebsd" or OS == "openbsd"', { 'link_settings': { 'libraries': [ diff --git a/crypto/rsa_private_key.cc b/crypto/rsa_private_key.cc index 2d849cd..62eb996 100644 --- a/crypto/rsa_private_key.cc +++ b/crypto/rsa_private_key.cc @@ -185,7 +185,7 @@ void PrivateKeyInfoCodec::PrependIntegerImpl(uint8* val, std::vector<uint8> tmp; if (!big_endian) { tmp.assign(val, val + num_bytes); - reverse(tmp.begin(), tmp.end()); + std::reverse(tmp.begin(), tmp.end()); val = &tmp.front(); } @@ -240,7 +240,7 @@ bool PrivateKeyInfoCodec::ReadIntegerWithExpectedSize(uint8** pos, // Reverse output if little-endian. if (!big_endian_) - reverse(out->begin(), out->end()); + std::reverse(out->begin(), out->end()); return true; } @@ -265,7 +265,7 @@ bool PrivateKeyInfoCodec::ReadIntegerImpl(uint8** pos, // Reverse output if little-endian. if (!big_endian) - reverse(out->begin(), out->end()); + std::reverse(out->begin(), out->end()); return true; } |