diff options
author | jsing <> | 2019-03-25 17:33:26 +0000 |
---|---|---|
committer | jsing <> | 2019-03-25 17:33:26 +0000 |
commit | 1d1c5f97809275aae99e2af9b38c37e3b1eb8410 (patch) | |
tree | 24293956674de119dfead3f60d3bf76b67c7b924 /src/lib/libssl/ssl_sigalgs.c | |
parent | adc85e649c82873f1fac3486fcd2504dcdeb3d41 (diff) | |
download | openbsd-1d1c5f97809275aae99e2af9b38c37e3b1eb8410.tar.gz openbsd-1d1c5f97809275aae99e2af9b38c37e3b1eb8410.tar.bz2 openbsd-1d1c5f97809275aae99e2af9b38c37e3b1eb8410.zip |
Strip out all of the pkey to sigalg and sigalg to pkey linkages.
These are no longer used now that we defer signature algorithm selection.
ok beck@
Diffstat (limited to 'src/lib/libssl/ssl_sigalgs.c')
-rw-r--r-- | src/lib/libssl/ssl_sigalgs.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/lib/libssl/ssl_sigalgs.c b/src/lib/libssl/ssl_sigalgs.c index 50f4802fdb..129ccccfbc 100644 --- a/src/lib/libssl/ssl_sigalgs.c +++ b/src/lib/libssl/ssl_sigalgs.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_sigalgs.c,v 1.18 2019/03/25 17:21:18 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_sigalgs.c,v 1.19 2019/03/25 17:33:26 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018-2019 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2018-2019 Bob Beck <beck@openbsd.org> |
4 | * | 4 | * |
@@ -29,13 +29,11 @@ const struct ssl_sigalg sigalgs[] = { | |||
29 | .value = SIGALG_RSA_PKCS1_SHA512, | 29 | .value = SIGALG_RSA_PKCS1_SHA512, |
30 | .md = EVP_sha512, | 30 | .md = EVP_sha512, |
31 | .key_type = EVP_PKEY_RSA, | 31 | .key_type = EVP_PKEY_RSA, |
32 | .pkey_idx = SSL_PKEY_RSA_SIGN, | ||
33 | }, | 32 | }, |
34 | { | 33 | { |
35 | .value = SIGALG_ECDSA_SECP521R1_SHA512, | 34 | .value = SIGALG_ECDSA_SECP521R1_SHA512, |
36 | .md = EVP_sha512, | 35 | .md = EVP_sha512, |
37 | .key_type = EVP_PKEY_EC, | 36 | .key_type = EVP_PKEY_EC, |
38 | .pkey_idx = SSL_PKEY_ECC, | ||
39 | .curve_nid = NID_secp521r1, | 37 | .curve_nid = NID_secp521r1, |
40 | }, | 38 | }, |
41 | #ifndef OPENSSL_NO_GOST | 39 | #ifndef OPENSSL_NO_GOST |
@@ -43,33 +41,28 @@ const struct ssl_sigalg sigalgs[] = { | |||
43 | .value = SIGALG_GOSTR12_512_STREEBOG_512, | 41 | .value = SIGALG_GOSTR12_512_STREEBOG_512, |
44 | .md = EVP_streebog512, | 42 | .md = EVP_streebog512, |
45 | .key_type = EVP_PKEY_GOSTR12_512, | 43 | .key_type = EVP_PKEY_GOSTR12_512, |
46 | .pkey_idx = SSL_PKEY_GOST01, /* XXX */ | ||
47 | }, | 44 | }, |
48 | #endif | 45 | #endif |
49 | { | 46 | { |
50 | .value = SIGALG_RSA_PKCS1_SHA384, | 47 | .value = SIGALG_RSA_PKCS1_SHA384, |
51 | .md = EVP_sha384, | 48 | .md = EVP_sha384, |
52 | .key_type = EVP_PKEY_RSA, | 49 | .key_type = EVP_PKEY_RSA, |
53 | .pkey_idx = SSL_PKEY_RSA_SIGN, | ||
54 | }, | 50 | }, |
55 | { | 51 | { |
56 | .value = SIGALG_ECDSA_SECP384R1_SHA384, | 52 | .value = SIGALG_ECDSA_SECP384R1_SHA384, |
57 | .md = EVP_sha384, | 53 | .md = EVP_sha384, |
58 | .key_type = EVP_PKEY_EC, | 54 | .key_type = EVP_PKEY_EC, |
59 | .pkey_idx = SSL_PKEY_ECC, | ||
60 | .curve_nid = NID_secp384r1, | 55 | .curve_nid = NID_secp384r1, |
61 | }, | 56 | }, |
62 | { | 57 | { |
63 | .value = SIGALG_RSA_PKCS1_SHA256, | 58 | .value = SIGALG_RSA_PKCS1_SHA256, |
64 | .md = EVP_sha256, | 59 | .md = EVP_sha256, |
65 | .key_type = EVP_PKEY_RSA, | 60 | .key_type = EVP_PKEY_RSA, |
66 | .pkey_idx = SSL_PKEY_RSA_SIGN, | ||
67 | }, | 61 | }, |
68 | { | 62 | { |
69 | .value = SIGALG_ECDSA_SECP256R1_SHA256, | 63 | .value = SIGALG_ECDSA_SECP256R1_SHA256, |
70 | .md = EVP_sha256, | 64 | .md = EVP_sha256, |
71 | .key_type = EVP_PKEY_EC, | 65 | .key_type = EVP_PKEY_EC, |
72 | .pkey_idx = SSL_PKEY_ECC, | ||
73 | .curve_nid = NID_X9_62_prime256v1, | 66 | .curve_nid = NID_X9_62_prime256v1, |
74 | }, | 67 | }, |
75 | #ifndef OPENSSL_NO_GOST | 68 | #ifndef OPENSSL_NO_GOST |
@@ -77,85 +70,72 @@ const struct ssl_sigalg sigalgs[] = { | |||
77 | .value = SIGALG_GOSTR12_256_STREEBOG_256, | 70 | .value = SIGALG_GOSTR12_256_STREEBOG_256, |
78 | .md = EVP_streebog256, | 71 | .md = EVP_streebog256, |
79 | .key_type = EVP_PKEY_GOSTR12_256, | 72 | .key_type = EVP_PKEY_GOSTR12_256, |
80 | .pkey_idx = SSL_PKEY_GOST01, /* XXX */ | ||
81 | }, | 73 | }, |
82 | { | 74 | { |
83 | .value = SIGALG_GOSTR01_GOST94, | 75 | .value = SIGALG_GOSTR01_GOST94, |
84 | .md = EVP_gostr341194, | 76 | .md = EVP_gostr341194, |
85 | .key_type = EVP_PKEY_GOSTR01, | 77 | .key_type = EVP_PKEY_GOSTR01, |
86 | .pkey_idx = SSL_PKEY_GOST01, | ||
87 | }, | 78 | }, |
88 | #endif | 79 | #endif |
89 | { | 80 | { |
90 | .value = SIGALG_RSA_PSS_RSAE_SHA256, | 81 | .value = SIGALG_RSA_PSS_RSAE_SHA256, |
91 | .md = EVP_sha256, | 82 | .md = EVP_sha256, |
92 | .key_type = EVP_PKEY_RSA, | 83 | .key_type = EVP_PKEY_RSA, |
93 | .pkey_idx = SSL_PKEY_RSA_SIGN, | ||
94 | .flags = SIGALG_FLAG_RSA_PSS, | 84 | .flags = SIGALG_FLAG_RSA_PSS, |
95 | }, | 85 | }, |
96 | { | 86 | { |
97 | .value = SIGALG_RSA_PSS_RSAE_SHA384, | 87 | .value = SIGALG_RSA_PSS_RSAE_SHA384, |
98 | .md = EVP_sha384, | 88 | .md = EVP_sha384, |
99 | .key_type = EVP_PKEY_RSA, | 89 | .key_type = EVP_PKEY_RSA, |
100 | .pkey_idx = SSL_PKEY_RSA_SIGN, | ||
101 | .flags = SIGALG_FLAG_RSA_PSS, | 90 | .flags = SIGALG_FLAG_RSA_PSS, |
102 | }, | 91 | }, |
103 | { | 92 | { |
104 | .value = SIGALG_RSA_PSS_RSAE_SHA512, | 93 | .value = SIGALG_RSA_PSS_RSAE_SHA512, |
105 | .md = EVP_sha512, | 94 | .md = EVP_sha512, |
106 | .key_type = EVP_PKEY_RSA, | 95 | .key_type = EVP_PKEY_RSA, |
107 | .pkey_idx = SSL_PKEY_RSA_SIGN, | ||
108 | .flags = SIGALG_FLAG_RSA_PSS, | 96 | .flags = SIGALG_FLAG_RSA_PSS, |
109 | }, | 97 | }, |
110 | { | 98 | { |
111 | .value = SIGALG_RSA_PSS_PSS_SHA256, | 99 | .value = SIGALG_RSA_PSS_PSS_SHA256, |
112 | .md = EVP_sha256, | 100 | .md = EVP_sha256, |
113 | .key_type = EVP_PKEY_RSA, | 101 | .key_type = EVP_PKEY_RSA, |
114 | .pkey_idx = SSL_PKEY_RSA_SIGN, | ||
115 | .flags = SIGALG_FLAG_RSA_PSS, | 102 | .flags = SIGALG_FLAG_RSA_PSS, |
116 | }, | 103 | }, |
117 | { | 104 | { |
118 | .value = SIGALG_RSA_PSS_PSS_SHA384, | 105 | .value = SIGALG_RSA_PSS_PSS_SHA384, |
119 | .md = EVP_sha384, | 106 | .md = EVP_sha384, |
120 | .key_type = EVP_PKEY_RSA, | 107 | .key_type = EVP_PKEY_RSA, |
121 | .pkey_idx = SSL_PKEY_RSA_SIGN, | ||
122 | .flags = SIGALG_FLAG_RSA_PSS, | 108 | .flags = SIGALG_FLAG_RSA_PSS, |
123 | }, | 109 | }, |
124 | { | 110 | { |
125 | .value = SIGALG_RSA_PSS_PSS_SHA512, | 111 | .value = SIGALG_RSA_PSS_PSS_SHA512, |
126 | .md = EVP_sha512, | 112 | .md = EVP_sha512, |
127 | .key_type = EVP_PKEY_RSA, | 113 | .key_type = EVP_PKEY_RSA, |
128 | .pkey_idx = SSL_PKEY_RSA_SIGN, | ||
129 | .flags = SIGALG_FLAG_RSA_PSS, | 114 | .flags = SIGALG_FLAG_RSA_PSS, |
130 | }, | 115 | }, |
131 | { | 116 | { |
132 | .value = SIGALG_RSA_PKCS1_SHA224, | 117 | .value = SIGALG_RSA_PKCS1_SHA224, |
133 | .md = EVP_sha224, | 118 | .md = EVP_sha224, |
134 | .key_type = EVP_PKEY_RSA, | 119 | .key_type = EVP_PKEY_RSA, |
135 | .pkey_idx = SSL_PKEY_RSA_SIGN, | ||
136 | }, | 120 | }, |
137 | { | 121 | { |
138 | .value = SIGALG_ECDSA_SECP224R1_SHA224, | 122 | .value = SIGALG_ECDSA_SECP224R1_SHA224, |
139 | .md = EVP_sha224, | 123 | .md = EVP_sha224, |
140 | .key_type = EVP_PKEY_EC, | 124 | .key_type = EVP_PKEY_EC, |
141 | .pkey_idx = SSL_PKEY_ECC, | ||
142 | }, | 125 | }, |
143 | { | 126 | { |
144 | .value = SIGALG_RSA_PKCS1_SHA1, | 127 | .value = SIGALG_RSA_PKCS1_SHA1, |
145 | .key_type = EVP_PKEY_RSA, | 128 | .key_type = EVP_PKEY_RSA, |
146 | .pkey_idx = SSL_PKEY_RSA_SIGN, | ||
147 | .md = EVP_sha1, | 129 | .md = EVP_sha1, |
148 | }, | 130 | }, |
149 | { | 131 | { |
150 | .value = SIGALG_ECDSA_SHA1, | 132 | .value = SIGALG_ECDSA_SHA1, |
151 | .key_type = EVP_PKEY_EC, | 133 | .key_type = EVP_PKEY_EC, |
152 | .md = EVP_sha1, | 134 | .md = EVP_sha1, |
153 | .pkey_idx = SSL_PKEY_ECC, | ||
154 | }, | 135 | }, |
155 | { | 136 | { |
156 | .value = SIGALG_RSA_PKCS1_MD5_SHA1, | 137 | .value = SIGALG_RSA_PKCS1_MD5_SHA1, |
157 | .key_type = EVP_PKEY_RSA, | 138 | .key_type = EVP_PKEY_RSA, |
158 | .pkey_idx = SSL_PKEY_RSA_SIGN, | ||
159 | .md = EVP_md5_sha1, | 139 | .md = EVP_md5_sha1, |
160 | }, | 140 | }, |
161 | { | 141 | { |