summaryrefslogtreecommitdiff
path: root/security/heimdal/patches/patch-at
blob: ccdc1de2ee3bce7f775091273f11e83095f57e78 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
$NetBSD: patch-at,v 1.1 2010/11/30 07:12:49 obache Exp $

--- lib/hx509/crypto.c.orig	2008-01-24 13:13:22.000000000 +0000
+++ lib/hx509/crypto.c
@@ -841,6 +841,7 @@ md5_verify_signature(hx509_context conte
     return 0;
 }
 
+#ifndef OPENSSL_NO_MD2
 static int
 md2_verify_signature(hx509_context context,
 		     const struct signature_alg *sig_alg,
@@ -870,6 +871,7 @@ md2_verify_signature(hx509_context conte
 
     return 0;
 }
+#endif
 
 static const struct signature_alg heim_rsa_pkcs1_x509 = {
     "rsa-pkcs1-x509",
@@ -926,6 +928,7 @@ static const struct signature_alg rsa_wi
     rsa_create_signature
 };
 
+#ifndef OPENSSL_NO_MD2
 static const struct signature_alg rsa_with_md2_alg = {
     "rsa-with-md2",
     oid_id_pkcs1_md2WithRSAEncryption,
@@ -936,6 +939,7 @@ static const struct signature_alg rsa_wi
     rsa_verify_signature,
     rsa_create_signature
 };
+#endif
 
 static const struct signature_alg dsa_sha1_alg = {
     "dsa-with-sha1",
@@ -980,6 +984,7 @@ static const struct signature_alg md5_al
     md5_verify_signature
 };
 
+#ifndef OPENSSL_NO_MD2
 static const struct signature_alg md2_alg = {
     "rsa-md2",
     oid_id_rsa_digest_md2,
@@ -989,6 +994,7 @@ static const struct signature_alg md2_al
     SIG_DIGEST,
     md2_verify_signature
 };
+#endif
 
 /* 
  * Order matter in this structure, "best" first for each "key
@@ -1000,13 +1006,17 @@ static const struct signature_alg *sig_a
     &rsa_with_sha1_alg,
     &pkcs1_rsa_sha1_alg,
     &rsa_with_md5_alg,
+#ifndef OPENSSL_NO_MD2
     &rsa_with_md2_alg,
+#endif
     &heim_rsa_pkcs1_x509,
     &dsa_sha1_alg,
     &sha256_alg,
     &sha1_alg,
     &md5_alg,
+#ifndef OPENSSL_NO_MD2
     &md2_alg,
+#endif
     NULL
 };
 
@@ -1432,10 +1442,12 @@ const AlgorithmIdentifier _hx509_signatu
     { 6, rk_UNCONST(md5_oid_tree) }, rk_UNCONST(&null_entry_oid)
 };
 
+#ifndef OPENSSL_NO_MD2
 static const unsigned md2_oid_tree[] = { 1, 2, 840, 113549, 2, 2 };
 const AlgorithmIdentifier _hx509_signature_md2_data = { 
     { 6, rk_UNCONST(md2_oid_tree) }, rk_UNCONST(&null_entry_oid)
 };
+#endif
 
 static const unsigned rsa_with_sha512_oid[] ={ 1, 2, 840, 113549, 1, 1, 13 };
 const AlgorithmIdentifier _hx509_signature_rsa_with_sha512_data = { 
@@ -1462,10 +1474,12 @@ const AlgorithmIdentifier _hx509_signatu
     { 7, rk_UNCONST(rsa_with_md5_oid) }, NULL
 };
 
+#ifndef OPENSSL_NO_MD2
 static const unsigned rsa_with_md2_oid[] ={ 1, 2, 840, 113549, 1, 1, 2 };
 const AlgorithmIdentifier _hx509_signature_rsa_with_md2_data = { 
     { 7, rk_UNCONST(rsa_with_md2_oid) }, NULL
 };
+#endif
 
 static const unsigned rsa_oid[] ={ 1, 2, 840, 113549, 1, 1, 1 };
 const AlgorithmIdentifier _hx509_signature_rsa_data = { 
@@ -1512,9 +1526,11 @@ const AlgorithmIdentifier *
 hx509_signature_md5(void)
 { return &_hx509_signature_md5_data; }
 
+#ifndef OPENSSL_NO_MD2
 const AlgorithmIdentifier *
 hx509_signature_md2(void)
 { return &_hx509_signature_md2_data; }
+#endif
 
 const AlgorithmIdentifier *
 hx509_signature_rsa_with_sha512(void)
@@ -1536,9 +1552,11 @@ const AlgorithmIdentifier *
 hx509_signature_rsa_with_md5(void)
 { return &_hx509_signature_rsa_with_md5_data; }
 
+#ifndef OPENSSL_NO_MD2
 const AlgorithmIdentifier *
 hx509_signature_rsa_with_md2(void)
 { return &_hx509_signature_rsa_with_md2_data; }
+#endif
 
 const AlgorithmIdentifier *
 hx509_signature_rsa(void)