Hello community, here is the log from the commit of package mipv6d for openSUSE:Factory checked in at 2017-12-14 11:03:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mipv6d (Old) and /work/SRC/openSUSE:Factory/.mipv6d.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mipv6d" Thu Dec 14 11:03:49 2017 rev:27 rq:556835 version:2.0.2.umip.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/mipv6d/mipv6d.changes 2017-12-12 21:23:30.288877278 +0100 +++ /work/SRC/openSUSE:Factory/.mipv6d.new/mipv6d.changes 2017-12-14 11:03:54.752992591 +0100 @@ -1,0 +2,5 @@ +Tue Dec 12 09:43:31 UTC 2017 - [email protected] + +- mipv6d-openssl11.patch: mipv6d ported to openssl 1.1. + +------------------------------------------------------------------- New: ---- mipv6d-openssl11.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mipv6d.spec ++++++ --- /var/tmp/diff_new_pack.GBcCO5/_old 2017-12-14 11:03:55.596951849 +0100 +++ /var/tmp/diff_new_pack.GBcCO5/_new 2017-12-14 11:03:55.600951656 +0100 @@ -26,12 +26,13 @@ Source0: mipv6-2.0.2-umip-0.4.tar.bz2 Source1: mipv6d.service Patch1: mipv6-2.0.2-umip-0.4.diff +Patch2: mipv6d-openssl11.patch BuildRequires: automake BuildRequires: bison BuildRequires: flex BuildRequires: indent #BuildRequires: libnetlink-devel -BuildRequires: libopenssl-1_0_0-devel +BuildRequires: openssl-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,6 +50,7 @@ %prep %setup -q -n mipv6-2.0.2-umip-0.4 %patch1 -p0 +%patch2 -p1 %build aclocal ++++++ mipv6d-openssl11.patch ++++++ Index: mipv6-2.0.2-umip-0.4/src/mh.c =================================================================== --- mipv6-2.0.2-umip-0.4.orig/src/mh.c +++ mipv6-2.0.2-umip-0.4/src/mh.c @@ -518,19 +518,19 @@ static int calculate_auth_data(const str #ifdef HAVE_LIBCRYPTO unsigned int len = HMAC_SHA1_HASH_LEN; - HMAC_CTX ctx; + HMAC_CTX *ctx; const EVP_MD *evp_md = EVP_sha1(); - HMAC_CTX_init(&ctx); - HMAC_Init_ex(&ctx, key, HMAC_SHA1_KEY_SIZE, evp_md, NULL); + ctx = HMAC_CTX_new(); + HMAC_Init_ex(ctx, key, HMAC_SHA1_KEY_SIZE, evp_md, NULL); - HMAC_Update(&ctx, (uint8_t *)coa, sizeof(*coa)); - HMAC_Update(&ctx, (uint8_t *)cn, sizeof(*coa)); + HMAC_Update(ctx, (uint8_t *)coa, sizeof(*coa)); + HMAC_Update(ctx, (uint8_t *)cn, sizeof(*coa)); for (i = 0; i < iovlen; i++) { - HMAC_Update(&ctx, (uint8_t *)iov[i].iov_base, iov[i].iov_len); + HMAC_Update(ctx, (uint8_t *)iov[i].iov_base, iov[i].iov_len); } - HMAC_Final(&ctx, buf, &len); - HMAC_CTX_cleanup(&ctx); + HMAC_Final(ctx, buf, &len); + HMAC_CTX_free(ctx); #else HMAC_SHA1_CTX ctx; Index: mipv6-2.0.2-umip-0.4/src/keygen.c =================================================================== --- mipv6-2.0.2-umip-0.4.orig/src/keygen.c +++ mipv6-2.0.2-umip-0.4/src/keygen.c @@ -172,15 +172,15 @@ static void build_kgen_token(struct in6_ uint8_t tmp[20]; #ifdef HAVE_LIBCRYPTO unsigned int len = 20; - HMAC_CTX ctx; + HMAC_CTX *ctx; - HMAC_CTX_init(&ctx); - HMAC_Init_ex(&ctx, key_cn, sizeof(key_cn), EVP_sha1(), NULL); - HMAC_Update(&ctx, (unsigned char *)addr, sizeof(*addr)); - HMAC_Update(&ctx, nonce, NONCE_LENGTH); - HMAC_Update(&ctx, &id, sizeof(id)); - HMAC_Final(&ctx, tmp, &len); - HMAC_CTX_cleanup(&ctx); + ctx = HMAC_CTX_new(); + HMAC_Init_ex(ctx, key_cn, sizeof(key_cn), EVP_sha1(), NULL); + HMAC_Update(ctx, (unsigned char *)addr, sizeof(*addr)); + HMAC_Update(ctx, nonce, NONCE_LENGTH); + HMAC_Update(ctx, &id, sizeof(id)); + HMAC_Final(ctx, tmp, &len); + HMAC_CTX_free(ctx); #else HMAC_SHA1_CTX ctx;
