diff options
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-pkcs11.patch')
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-pkcs11.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-pkcs11.patch b/meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-pkcs11.patch new file mode 100644 index 0000000000..bd02028816 --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-pkcs11.patch | |||
@@ -0,0 +1,70 @@ | |||
1 | From 04cfd84423f693d879dc3ffebb0f6fe2680c254f Mon Sep 17 00:00:00 2001 | ||
2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> | ||
3 | Date: Fri, 18 Mar 2016 15:59:21 +0800 | ||
4 | Subject: [PATCH 3/3] remove des in pkcs11. | ||
5 | |||
6 | Upstream-status: Pending | ||
7 | |||
8 | Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> | ||
9 | |||
10 | --- | ||
11 | pkcs11.h | 8 ++++++++ | ||
12 | 1 file changed, 8 insertions(+) | ||
13 | |||
14 | diff --git a/pkcs11.h b/pkcs11.h | ||
15 | index b01d58f..98b36e6 100644 | ||
16 | --- a/pkcs11.h | ||
17 | +++ b/pkcs11.h | ||
18 | @@ -342,9 +342,11 @@ typedef unsigned long ck_key_type_t; | ||
19 | #define CKK_GENERIC_SECRET (0x10) | ||
20 | #define CKK_RC2 (0x11) | ||
21 | #define CKK_RC4 (0x12) | ||
22 | +#ifndef OPENSSL_NO_DES | ||
23 | #define CKK_DES (0x13) | ||
24 | #define CKK_DES2 (0x14) | ||
25 | #define CKK_DES3 (0x15) | ||
26 | +#endif /* OPENSSL_NO_DES */ | ||
27 | #define CKK_CAST (0x16) | ||
28 | #define CKK_CAST3 (0x17) | ||
29 | #define CKK_CAST128 (0x18) | ||
30 | @@ -512,6 +514,7 @@ typedef unsigned long ck_mechanism_type_t; | ||
31 | #define CKM_RC2_CBC_PAD (0x105) | ||
32 | #define CKM_RC4_KEY_GEN (0x110) | ||
33 | #define CKM_RC4 (0x111) | ||
34 | +#ifndef OPENSSL_NO_DES | ||
35 | #define CKM_DES_KEY_GEN (0x120) | ||
36 | #define CKM_DES_ECB (0x121) | ||
37 | #define CKM_DES_CBC (0x122) | ||
38 | @@ -525,6 +528,7 @@ typedef unsigned long ck_mechanism_type_t; | ||
39 | #define CKM_DES3_MAC (0x134) | ||
40 | #define CKM_DES3_MAC_GENERAL (0x135) | ||
41 | #define CKM_DES3_CBC_PAD (0x136) | ||
42 | +#endif /* OPENSSL_NO_DES */ | ||
43 | #define CKM_CDMF_KEY_GEN (0x140) | ||
44 | #define CKM_CDMF_ECB (0x141) | ||
45 | #define CKM_CDMF_CBC (0x142) | ||
46 | @@ -610,8 +614,10 @@ typedef unsigned long ck_mechanism_type_t; | ||
47 | #define CKM_MD5_KEY_DERIVATION (0x390) | ||
48 | #define CKM_MD2_KEY_DERIVATION (0x391) | ||
49 | #define CKM_SHA1_KEY_DERIVATION (0x392) | ||
50 | +#ifndef OPENSSL_NO_DES | ||
51 | #define CKM_PBE_MD2_DES_CBC (0x3a0) | ||
52 | #define CKM_PBE_MD5_DES_CBC (0x3a1) | ||
53 | +#endif /* OPENSSL_NO_DES */ | ||
54 | #define CKM_PBE_MD5_CAST_CBC (0x3a2) | ||
55 | #define CKM_PBE_MD5_CAST3_CBC (0x3a3) | ||
56 | #define CKM_PBE_MD5_CAST5_CBC (0x3a4) | ||
57 | @@ -620,8 +626,10 @@ typedef unsigned long ck_mechanism_type_t; | ||
58 | #define CKM_PBE_SHA1_CAST128_CBC (0x3a5) | ||
59 | #define CKM_PBE_SHA1_RC4_128 (0x3a6) | ||
60 | #define CKM_PBE_SHA1_RC4_40 (0x3a7) | ||
61 | +#ifndef OPENSSL_NO_DES | ||
62 | #define CKM_PBE_SHA1_DES3_EDE_CBC (0x3a8) | ||
63 | #define CKM_PBE_SHA1_DES2_EDE_CBC (0x3a9) | ||
64 | +#endif /* OPENSSL_NO_DES */ | ||
65 | #define CKM_PBE_SHA1_RC2_128_CBC (0x3aa) | ||
66 | #define CKM_PBE_SHA1_RC2_40_CBC (0x3ab) | ||
67 | #define CKM_PKCS5_PBKD2 (0x3b0) | ||
68 | -- | ||
69 | 1.9.1 | ||
70 | |||