diff options
| author | Jack Lloyd <[email protected]> | 2015-09-11 22:44:45 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2015-09-11 22:44:45 -0400 |
| commit | 72719f52640d2ac3ff00fce46a72082e5938d212 (patch) | |
| tree | 51018f639724326c0e967eb7372a762ce0b89e53 /src/lib/pubkey | |
| parent | 8211fdc11fa3bbe692b50d42126f74d259a4a96a (diff) | |
Fix pbkdf, pk padding and ECDH registration for static linking.
With this change the tests pass when linked against a static library
built in the normal (non-amalgamation) fashion.
Remove the restriction in configure.py, and have circleci build the
clang static build as a non-amalg.
Diffstat (limited to 'src/lib/pubkey')
| -rw-r--r-- | src/lib/pubkey/ecdh/ecdh.cpp | 2 | ||||
| -rw-r--r-- | src/lib/pubkey/ecdh/ecdh.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/pubkey/ecdh/ecdh.cpp b/src/lib/pubkey/ecdh/ecdh.cpp index bad0f2c0b..6b589df9b 100644 --- a/src/lib/pubkey/ecdh/ecdh.cpp +++ b/src/lib/pubkey/ecdh/ecdh.cpp @@ -12,6 +12,8 @@ namespace Botan { +ECDH_PublicKey::ECDH_PublicKey() {} + namespace { /** diff --git a/src/lib/pubkey/ecdh/ecdh.h b/src/lib/pubkey/ecdh/ecdh.h index ef3e8ef7a..2f892436c 100644 --- a/src/lib/pubkey/ecdh/ecdh.h +++ b/src/lib/pubkey/ecdh/ecdh.h @@ -56,7 +56,7 @@ class BOTAN_DLL ECDH_PublicKey : public virtual EC_PublicKey { return unlock(EC2OSP(public_point(), PointGFp::UNCOMPRESSED)); } protected: - ECDH_PublicKey() {} + ECDH_PublicKey(); }; /** |