strongswan: 5.5.3 -> 5.6.2

1.Upgrade strongswan from 5.5.3 to 5.6.2.
2.Modify fix-funtion-parameter.patch, since the data has been changed.

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Huang Qiyu 2018-03-21 11:36:07 +08:00 committed by Joe MacDonald
parent 4e15ee3855
commit fd77663ea9
2 changed files with 5 additions and 5 deletions

View File

@ -50,7 +50,7 @@ index ff33824..bd21446 100644
*/
-openssl_diffie_hellman_t *openssl_diffie_hellman_create(
+openssl_diffie_hellman_t *openssl_diffie_hellman_create_custom(
diffie_hellman_group_t group, chunk_t g, chunk_t p)
diffie_hellman_group_t group, ...)
{
private_openssl_diffie_hellman_t *this;
@@ -197,5 +197,11 @@ openssl_diffie_hellman_t *openssl_diffie_hellman_create(
@ -70,12 +70,12 @@ index 53dc59c..eb69eaa 100644
--- a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h
+++ b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h
@@ -44,8 +44,10 @@ struct openssl_diffie_hellman_t {
* @param p custom prime, if MODP_CUSTOM
* @param ... expects generator and prime as chunk_t if MODP_CUSTOM
* @return openssl_diffie_hellman_t object, NULL if not supported
*/
-openssl_diffie_hellman_t *openssl_diffie_hellman_create(
+openssl_diffie_hellman_t *openssl_diffie_hellman_create_custom(
diffie_hellman_group_t group, chunk_t g, chunk_t p);
diffie_hellman_group_t group, ...);
+openssl_diffie_hellman_t *openssl_diffie_hellman_create(
+ diffie_hellman_group_t group);

View File

@ -12,8 +12,8 @@ SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \
file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \
"
SRC_URI[md5sum] = "4afffe3c219bb2e04f09510905af836b"
SRC_URI[sha256sum] = "c5ea54b199174708de11af9b8f4ecf28b5b0743d4bc0e380e741f25b28c0f8d4"
SRC_URI[md5sum] = "46aa3aa18fbc4bd528f9a0345ce79913"
SRC_URI[sha256sum] = "e0a60a30ebf3c534c223559e1686497a21ded709a5d605c5123c2f52bcc22e92"
EXTRA_OECONF = " \
--without-lib-prefix \