Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 62784e8b6df8ff3a907c1f816154808bea9d7064 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Tue, 25 Sep 2018 14:38:14 +0800 |
| 4 | Subject: [PATCH] support openssl 1.1.x |
| 5 | |
| 6 | Long time no maintain from upstream since 2013 |
| 7 | (git://git.umip.org/umip/umip.git), backport a |
| 8 | fix from openSUSE |
| 9 | |
| 10 | Upstream-Status: Backport [openSUSE] |
| 11 | http://ftp.gwdg.de/pub/opensuse/source/distribution/leap/15.0/repo/oss/src/mipv6d-2.0.2.umip.0.4-lp150.1.2.src.rpm |
| 12 | |
| 13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 14 | --- |
| 15 | src/keygen.c | 12 ++++++++++++ |
| 16 | src/mh.c | 17 ++++++++++++++++- |
| 17 | 2 files changed, 28 insertions(+), 1 deletion(-) |
| 18 | |
| 19 | diff --git a/src/keygen.c b/src/keygen.c |
| 20 | index e434a38..b902644 100644 |
| 21 | --- a/src/keygen.c |
| 22 | +++ b/src/keygen.c |
| 23 | @@ -172,6 +172,7 @@ static void build_kgen_token(struct in6_addr *addr, uint8_t *nonce, |
| 24 | uint8_t tmp[20]; |
| 25 | #ifdef HAVE_LIBCRYPTO |
| 26 | unsigned int len = 20; |
| 27 | +#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL |
| 28 | HMAC_CTX ctx; |
| 29 | |
| 30 | HMAC_CTX_init(&ctx); |
| 31 | @@ -182,6 +183,17 @@ static void build_kgen_token(struct in6_addr *addr, uint8_t *nonce, |
| 32 | HMAC_Final(&ctx, tmp, &len); |
| 33 | HMAC_CTX_cleanup(&ctx); |
| 34 | #else |
| 35 | + HMAC_CTX *ctx; |
| 36 | + ctx = HMAC_CTX_new(); |
| 37 | + HMAC_Init_ex(ctx, key_cn, sizeof(key_cn), EVP_sha1(), NULL); |
| 38 | + HMAC_Update(ctx, (unsigned char *)addr, sizeof(*addr)); |
| 39 | + HMAC_Update(ctx, nonce, NONCE_LENGTH); |
| 40 | + HMAC_Update(ctx, &id, sizeof(id)); |
| 41 | + HMAC_Final(ctx, tmp, &len); |
| 42 | + HMAC_CTX_free(ctx); |
| 43 | +#endif // End of defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL |
| 44 | + |
| 45 | +#else |
| 46 | HMAC_SHA1_CTX ctx; |
| 47 | |
| 48 | HMAC_SHA1_init(&ctx, key_cn, sizeof(key_cn)); |
| 49 | diff --git a/src/mh.c b/src/mh.c |
| 50 | index cba9a33..212eb5a 100644 |
| 51 | --- a/src/mh.c |
| 52 | +++ b/src/mh.c |
| 53 | @@ -518,9 +518,10 @@ static int calculate_auth_data(const struct iovec *iov, int iovlen, |
| 54 | |
| 55 | #ifdef HAVE_LIBCRYPTO |
| 56 | unsigned int len = HMAC_SHA1_HASH_LEN; |
| 57 | - HMAC_CTX ctx; |
| 58 | const EVP_MD *evp_md = EVP_sha1(); |
| 59 | |
| 60 | +#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL |
| 61 | + HMAC_CTX ctx; |
| 62 | HMAC_CTX_init(&ctx); |
| 63 | HMAC_Init_ex(&ctx, key, HMAC_SHA1_KEY_SIZE, evp_md, NULL); |
| 64 | |
| 65 | @@ -532,6 +533,20 @@ static int calculate_auth_data(const struct iovec *iov, int iovlen, |
| 66 | HMAC_Final(&ctx, buf, &len); |
| 67 | HMAC_CTX_cleanup(&ctx); |
| 68 | #else |
| 69 | + HMAC_CTX *ctx; |
| 70 | + ctx = HMAC_CTX_new(); |
| 71 | + HMAC_Init_ex(ctx, key, HMAC_SHA1_KEY_SIZE, evp_md, NULL); |
| 72 | + |
| 73 | + HMAC_Update(ctx, (uint8_t *)coa, sizeof(*coa)); |
| 74 | + HMAC_Update(ctx, (uint8_t *)cn, sizeof(*coa)); |
| 75 | + for (i = 0; i < iovlen; i++) { |
| 76 | + HMAC_Update(ctx, (uint8_t *)iov[i].iov_base, iov[i].iov_len); |
| 77 | + } |
| 78 | + HMAC_Final(ctx, buf, &len); |
| 79 | + HMAC_CTX_free(ctx); |
| 80 | +#endif |
| 81 | + |
| 82 | +#else |
| 83 | HMAC_SHA1_CTX ctx; |
| 84 | |
| 85 | HMAC_SHA1_init(&ctx, key, HMAC_SHA1_KEY_SIZE); |
| 86 | -- |
| 87 | 2.7.4 |
| 88 | |