generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-13 10:32:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'poco-1.10.1' into devel

Browse Source
This commit is contained in:
Günter Obiltschnig 2020-02-04 15:48:34 +01:00
commit 49959d1d88
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NetSSL_OpenSSL/src/Context.cpp
View File

@ -774,7 +774,7 @@ void Context::initECDH(const std::string& curve)
#if OPENSSL_VERSION_NUMBER >= 0x1000200fL #if OPENSSL_VERSION_NUMBER >= 0x1000200fL
const std::string groups(curve.empty() ? const std::string groups(curve.empty() ?
#if OPENSSL_VERSION_NUMBER >= 0x1010100fL #if OPENSSL_VERSION_NUMBER >= 0x1010100fL
"X448:X25519:ffdhe4096:ffdhe3072:ffdhe2048:ffdhe6144:ffdhe8192:P-521:P-384:P-256" "X448:X25519:P-521:P-384:P-256"
#elif OPENSSL_VERSION_NUMBER >= 0x1010000fL #elif OPENSSL_VERSION_NUMBER >= 0x1010000fL
// while OpenSSL 1.1.0 didn't support Ed25519 (EdDSA using Curve25519), // while OpenSSL 1.1.0 didn't support Ed25519 (EdDSA using Curve25519),
// it did support X25519 (ECDH using Curve25516). // it did support X25519 (ECDH using Curve25516).

4
README.md
View File

@ -1,8 +1,8 @@
![alt text][logo] ![alt text][logo]
[![Travis Build Status](https://travis-ci.org/pocoproject/poco.png?branch=master)](https://travis-ci.org/pocoproject/poco) [![Travis Build Status](https://travis-ci.org/pocoproject/poco.png?branch=devel)](https://travis-ci.org/pocoproject/poco)
[![Build status](https://ci.appveyor.com/api/projects/status/7iyrx3f233s3akae/branch/master?svg=true)](https://ci.appveyor.com/project/obiltschnig/poco/branch/master) [![Build status](https://ci.appveyor.com/api/projects/status/7iyrx3f233s3akae/branch/master?svg=true)](https://ci.appveyor.com/project/obiltschnig/poco/branch/devel)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/370/badge)](https://bestpractices.coreinfrastructure.org/projects/370) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/370/badge)](https://bestpractices.coreinfrastructure.org/projects/370)