Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 21:37:17 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

don't compile compatibility code if openssl 1.1.1

Browse source
This commit is contained in:
orignal 2018-11-22 12:13:16 -05:00
parent c0e263abd3
commit cde989b59d
7 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libi2pd/ChaCha20.cpp
View file

@ -7,6 +7,8 @@
Kovri go write your own code Kovri go write your own code
*/ */
#if LEGACY_OPENSSL
namespace i2p namespace i2p
{ {
namespace crypto namespace crypto
@ -145,3 +147,5 @@ void chacha20(uint8_t * buf, size_t sz, const uint8_t * nonce, const uint8_t * k
} }
} }
#endif

3
libi2pd/ChaCha20.h
View file

@ -9,7 +9,9 @@
#define LIBI2PD_CHACHA20_H #define LIBI2PD_CHACHA20_H
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>
#include "Crypto.h"
#if LEGACY_OPENSSL
namespace i2p namespace i2p
{ {
namespace crypto namespace crypto
@ -22,5 +24,6 @@ namespace crypto
} }
} }
#endif
#endif #endif

2
libi2pd/Ed25519.cpp
View file

@ -411,6 +411,7 @@ namespace crypto
} }
} }
#if !OPENSSL_X25519
BIGNUM * Ed25519::ScalarMul (const BIGNUM * u, const BIGNUM * k, BN_CTX * ctx) const BIGNUM * Ed25519::ScalarMul (const BIGNUM * u, const BIGNUM * k, BN_CTX * ctx) const
{ {
BN_CTX_start (ctx); BN_CTX_start (ctx);
@ -488,6 +489,7 @@ namespace crypto
EncodeBN (q1, buf, 32); EncodeBN (q1, buf, 32);
BN_free (p1); BN_free (n); BN_free (q1); BN_free (p1); BN_free (n); BN_free (q1);
} }
#endif
void Ed25519::ExpandPrivateKey (const uint8_t * key, uint8_t * expandedKey) void Ed25519::ExpandPrivateKey (const uint8_t * key, uint8_t * expandedKey)
{ {

5
libi2pd/Ed25519.h
View file

@ -3,6 +3,7 @@
#include <memory> #include <memory>
#include <openssl/bn.h> #include <openssl/bn.h>
#include "Crypto.h"
namespace i2p namespace i2p
{ {
@ -75,8 +76,10 @@ namespace crypto
EDDSAPoint GeneratePublicKey (const uint8_t * expandedPrivateKey, BN_CTX * ctx) const; EDDSAPoint GeneratePublicKey (const uint8_t * expandedPrivateKey, BN_CTX * ctx) const;
EDDSAPoint DecodePublicKey (const uint8_t * buf, BN_CTX * ctx) const; EDDSAPoint DecodePublicKey (const uint8_t * buf, BN_CTX * ctx) const;
void EncodePublicKey (const EDDSAPoint& publicKey, uint8_t * buf, BN_CTX * ctx) const; void EncodePublicKey (const EDDSAPoint& publicKey, uint8_t * buf, BN_CTX * ctx) const;
#if !OPENSSL_X25519
void ScalarMul (const uint8_t * p, const uint8_t * e, uint8_t * buf, BN_CTX * ctx) const; // p is point, e is number for x25519 void ScalarMul (const uint8_t * p, const uint8_t * e, uint8_t * buf, BN_CTX * ctx) const; // p is point, e is number for x25519
void ScalarMulB (const uint8_t * e, uint8_t * buf, BN_CTX * ctx) const; void ScalarMulB (const uint8_t * e, uint8_t * buf, BN_CTX * ctx) const;
#endif
bool Verify (const EDDSAPoint& publicKey, const uint8_t * digest, const uint8_t * signature) const; bool Verify (const EDDSAPoint& publicKey, const uint8_t * digest, const uint8_t * signature) const;
void Sign (const uint8_t * expandedPrivateKey, const uint8_t * publicKeyEncoded, const uint8_t * buf, size_t len, uint8_t * signature) const; void Sign (const uint8_t * expandedPrivateKey, const uint8_t * publicKeyEncoded, const uint8_t * buf, size_t len, uint8_t * signature) const;
@ -100,8 +103,10 @@ namespace crypto
BIGNUM * DecodeBN (const uint8_t * buf) const; BIGNUM * DecodeBN (const uint8_t * buf) const;
void EncodeBN (const BIGNUM * bn, uint8_t * buf, size_t len) const; void EncodeBN (const BIGNUM * bn, uint8_t * buf, size_t len) const;
#if !OPENSSL_X25519
// for x25519 // for x25519
BIGNUM * ScalarMul (const BIGNUM * p, const BIGNUM * e, BN_CTX * ctx) const; BIGNUM * ScalarMul (const BIGNUM * p, const BIGNUM * e, BN_CTX * ctx) const;
#endif
private: private:

4
libi2pd/Poly1305.cpp
View file

@ -6,6 +6,8 @@
Kovri go write your own code Kovri go write your own code
*/ */
#if LEGACY_OPENSSL
namespace i2p namespace i2p
{ {
namespace crypto namespace crypto
@ -249,3 +251,5 @@ namespace crypto
} }
} }
} }
#endif

3
libi2pd/Poly1305.h
View file

@ -9,7 +9,9 @@
#define LIBI2PD_POLY1305_H #define LIBI2PD_POLY1305_H
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>
#include "Crypto.h"
#if LEGACY_OPENSSL
namespace i2p namespace i2p
{ {
namespace crypto namespace crypto
@ -24,5 +26,6 @@ namespace crypto
} }
} }
#endif
#endif #endif

3
libi2pd/Siphash.h
View file

@ -9,7 +9,9 @@
#define SIPHASH_H #define SIPHASH_H
#include <cstdint> #include <cstdint>
#include "Crypto.h"
#if !OPENSSL_SIPHASH
namespace i2p namespace i2p
{ {
namespace crypto namespace crypto
@ -148,5 +150,6 @@ namespace crypto
} }
} }
} }
#endif
#endif #endif