forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/net/xfrm/xfrm_algo.c
....@@ -1,12 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23  * xfrm algorithm interface
34  *
45  * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
5
- *
6
- * This program is free software; you can redistribute it and/or modify it
7
- * under the terms of the GNU General Public License as published by the Free
8
- * Software Foundation; either version 2 of the License, or (at your option)
9
- * any later version.
106  */
117 
128 #include <crypto/hash.h>
....@@ -241,7 +237,7 @@
241237 
242238 	.uinfo = {
243239 		.auth = {
244
-			.icv_truncbits = 128,
240
+			.icv_truncbits = IS_ENABLED(CONFIG_ANDROID) ? 128 : 96,
245241 			.icv_fullbits = 256,
246242 		}
247243 	},
....@@ -630,8 +626,8 @@
630626 static const struct xfrm_algo_list xfrm_ealg_list = {
631627 	.algs = ealg_list,
632628 	.entries = ARRAY_SIZE(ealg_list),
633
-	.type = CRYPTO_ALG_TYPE_BLKCIPHER,
634
-	.mask = CRYPTO_ALG_TYPE_BLKCIPHER_MASK,
629
+	.type = CRYPTO_ALG_TYPE_SKCIPHER,
630
+	.mask = CRYPTO_ALG_TYPE_MASK,
635631 };
636632 
637633 static const struct xfrm_algo_list xfrm_calg_list = {