mirror of
https://github.com/breeze303/nss-packages.git
synced 2025-12-16 08:44:52 +00:00
8d54d726c2
To keep fork as closely synced with upstream, move NSS packages back into repository. Not sure why they were moved out from my original fork. * nss-firmware * qca-nss-crypto * qca-nss-cfi Removed the following: * mhz (already available in packages repo) * qrtr (unecessary, and has been broken for years) Also moved packages out of `qca` and back into root directory.
63 lines
1.7 KiB
Diff
63 lines
1.7 KiB
Diff
From 1569ac3b6bbcae9c3f4898e0d34aec8f88297ee6 Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Sun, 22 Jan 2023 21:45:23 +0100
|
|
Subject: [PATCH 1/5] cryptoapi: v2.0: fix SHA1 header include
|
|
|
|
SHA1 header has been merged to the generic SHA one,
|
|
and with that the cryptohash.h was dropped.
|
|
|
|
So, fix include in kernels 5.8 and newer.
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
---
|
|
cryptoapi/v2.0/nss_cryptoapi.c | 5 +++++
|
|
cryptoapi/v2.0/nss_cryptoapi_aead.c | 5 +++++
|
|
cryptoapi/v2.0/nss_cryptoapi_ahash.c | 5 +++++
|
|
3 files changed, 15 insertions(+)
|
|
|
|
--- a/cryptoapi/v2.0/nss_cryptoapi.c
|
|
+++ b/cryptoapi/v2.0/nss_cryptoapi.c
|
|
@@ -39,7 +39,12 @@
|
|
|
|
#include <crypto/aes.h>
|
|
#include <crypto/des.h>
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
|
|
#include <crypto/sha.h>
|
|
+#else
|
|
+#include <crypto/sha1.h>
|
|
+#include <crypto/sha2.h>
|
|
+#endif
|
|
#include <crypto/hash.h>
|
|
#include <crypto/md5.h>
|
|
#include <crypto/ghash.h>
|
|
--- a/cryptoapi/v2.0/nss_cryptoapi_aead.c
|
|
+++ b/cryptoapi/v2.0/nss_cryptoapi_aead.c
|
|
@@ -39,7 +39,12 @@
|
|
|
|
#include <crypto/aes.h>
|
|
#include <crypto/des.h>
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
|
|
#include <crypto/sha.h>
|
|
+#else
|
|
+#include <crypto/sha1.h>
|
|
+#include <crypto/sha2.h>
|
|
+#endif
|
|
#include <crypto/hash.h>
|
|
#include <crypto/algapi.h>
|
|
#include <crypto/aead.h>
|
|
--- a/cryptoapi/v2.0/nss_cryptoapi_ahash.c
|
|
+++ b/cryptoapi/v2.0/nss_cryptoapi_ahash.c
|
|
@@ -38,7 +38,12 @@
|
|
|
|
#include <crypto/aes.h>
|
|
#include <crypto/des.h>
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
|
|
#include <crypto/sha.h>
|
|
+#else
|
|
+#include <crypto/sha1.h>
|
|
+#include <crypto/sha2.h>
|
|
+#endif
|
|
#include <crypto/hash.h>
|
|
#include <crypto/algapi.h>
|
|
#include <crypto/aead.h>
|