Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-12-18 15:18:42 +0100
committerMichal Suchanek <msuchanek@suse.de>2019-12-18 15:22:59 +0100
commita30af001ad0d4a7d632d94946f704ea84d53e8ac (patch)
treebc1a238f74098b6ae83e668a42536a21a4eb53c9
parentf001dbe2d8db5681d649e7928b40bbdc9fcc518b (diff)
Refresh patches.kabi/kABI-add-_q-suffix-to-exports-that-take-struct-dh.patch.
Adjust for change of DH_KPP_SECRET_MIN_SIZE in 35f7d5225ffcbf1b759f641aec1735e3a89b1914
-rw-r--r--patches.kabi/kABI-add-_q-suffix-to-exports-that-take-struct-dh.patch20
1 files changed, 11 insertions, 9 deletions
diff --git a/patches.kabi/kABI-add-_q-suffix-to-exports-that-take-struct-dh.patch b/patches.kabi/kABI-add-_q-suffix-to-exports-that-take-struct-dh.patch
index cb67810d81..9174e15c33 100644
--- a/patches.kabi/kABI-add-_q-suffix-to-exports-that-take-struct-dh.patch
+++ b/patches.kabi/kABI-add-_q-suffix-to-exports-that-take-struct-dh.patch
@@ -1,4 +1,4 @@
-From 63437ba2267245ddd03d37676fcf55b3460eb4ed Mon Sep 17 00:00:00 2001
+From a7c78c2c918a30e889fa167b7e6d901688a741d0 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Mon, 16 Dec 2019 19:05:35 +0100
Subject: [PATCH] kABI: add _q suffix to exports that take struct dh
@@ -10,15 +10,15 @@ Also provide the old API with exports without suffix.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
- crypto/dh_helper.c | 51 +++++++++++++++++++++++++++++++++++++++++++++
- include/crypto/dh.h | 25 ++++++++++++++++++++++
- 2 files changed, 76 insertions(+)
+ crypto/dh_helper.c | 53 +++++++++++++++++++++++++++++++++++++++++++++
+ include/crypto/dh.h | 25 +++++++++++++++++++++
+ 2 files changed, 78 insertions(+)
diff --git a/crypto/dh_helper.c b/crypto/dh_helper.c
-index 14539904416e..2959a16cfdf6 100644
+index 14539904416e..cea667d370cc 100644
--- a/crypto/dh_helper.c
+++ b/crypto/dh_helper.c
-@@ -109,3 +109,54 @@ int crypto_dh_decode_key(const char *buf, unsigned int len, struct dh *params)
+@@ -109,3 +109,56 @@ int crypto_dh_decode_key(const char *buf, unsigned int len, struct dh *params)
return 0;
}
EXPORT_SYMBOL_GPL(crypto_dh_decode_key);
@@ -29,6 +29,8 @@ index 14539904416e..2959a16cfdf6 100644
+#undef crypto_dh_encode_key
+#undef crypto_dh_decode_key
+
++#define DH_KPP_SECRET_MIN_SIZE_NO_Q (sizeof(struct kpp_secret) + 3 * sizeof(int))
++
+static inline int dh_data_size_no_q(const struct dh *p)
+{
+ return p->key_size + p->p_size + p->g_size;
@@ -36,7 +38,7 @@ index 14539904416e..2959a16cfdf6 100644
+
+int crypto_dh_key_len(const struct dh *p)
+{
-+ return DH_KPP_SECRET_MIN_SIZE + dh_data_size_no_q(p);
++ return DH_KPP_SECRET_MIN_SIZE_NO_Q + dh_data_size_no_q(p);
+}
+EXPORT_SYMBOL_GPL(crypto_dh_key_len);
+
@@ -74,7 +76,7 @@ index 14539904416e..2959a16cfdf6 100644
+}
+EXPORT_SYMBOL_GPL(crypto_dh_decode_key);
diff --git a/include/crypto/dh.h b/include/crypto/dh.h
-index 6b424ad3482e..0a7f95b00b98 100644
+index 6b424ad3482e..5ad8690a3a9e 100644
--- a/include/crypto/dh.h
+++ b/include/crypto/dh.h
@@ -13,6 +13,31 @@
@@ -101,10 +103,10 @@ index 6b424ad3482e..0a7f95b00b98 100644
+};
+
+/* kABI we added the q parameter to struct dh so interface of these functions changed. */
++#define dh dh_q
+#define crypto_dh_key_len crypto_dh_key_len_q
+#define crypto_dh_encode_key crypto_dh_encode_key_q
+#define crypto_dh_decode_key crypto_dh_decode_key_q
-+#define dh dh_q
+
/**
* DOC: DH Helper Functions