diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_sigalgs.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/libssl/ssl_sigalgs.c b/src/lib/libssl/ssl_sigalgs.c index 2612d5ac1d..17ac1f84ff 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.24 2021/05/16 08:24:21 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_sigalgs.c,v 1.25 2021/06/27 17:45:16 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2018-2020 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2018-2020 Bob Beck <beck@openbsd.org> |
| 4 | * | 4 | * |
| @@ -28,101 +28,101 @@ | |||
| 28 | const struct ssl_sigalg sigalgs[] = { | 28 | const struct ssl_sigalg sigalgs[] = { |
| 29 | { | 29 | { |
| 30 | .value = SIGALG_RSA_PKCS1_SHA512, | 30 | .value = SIGALG_RSA_PKCS1_SHA512, |
| 31 | .md = EVP_sha512, | ||
| 32 | .key_type = EVP_PKEY_RSA, | 31 | .key_type = EVP_PKEY_RSA, |
| 32 | .md = EVP_sha512, | ||
| 33 | }, | 33 | }, |
| 34 | { | 34 | { |
| 35 | .value = SIGALG_ECDSA_SECP521R1_SHA512, | 35 | .value = SIGALG_ECDSA_SECP521R1_SHA512, |
| 36 | .md = EVP_sha512, | ||
| 37 | .key_type = EVP_PKEY_EC, | 36 | .key_type = EVP_PKEY_EC, |
| 37 | .md = EVP_sha512, | ||
| 38 | .curve_nid = NID_secp521r1, | 38 | .curve_nid = NID_secp521r1, |
| 39 | }, | 39 | }, |
| 40 | #ifndef OPENSSL_NO_GOST | 40 | #ifndef OPENSSL_NO_GOST |
| 41 | { | 41 | { |
| 42 | .value = SIGALG_GOSTR12_512_STREEBOG_512, | 42 | .value = SIGALG_GOSTR12_512_STREEBOG_512, |
| 43 | .md = EVP_streebog512, | ||
| 44 | .key_type = EVP_PKEY_GOSTR12_512, | 43 | .key_type = EVP_PKEY_GOSTR12_512, |
| 44 | .md = EVP_streebog512, | ||
| 45 | }, | 45 | }, |
| 46 | #endif | 46 | #endif |
| 47 | { | 47 | { |
| 48 | .value = SIGALG_RSA_PKCS1_SHA384, | 48 | .value = SIGALG_RSA_PKCS1_SHA384, |
| 49 | .md = EVP_sha384, | ||
| 50 | .key_type = EVP_PKEY_RSA, | 49 | .key_type = EVP_PKEY_RSA, |
| 50 | .md = EVP_sha384, | ||
| 51 | }, | 51 | }, |
| 52 | { | 52 | { |
| 53 | .value = SIGALG_ECDSA_SECP384R1_SHA384, | 53 | .value = SIGALG_ECDSA_SECP384R1_SHA384, |
| 54 | .md = EVP_sha384, | ||
| 55 | .key_type = EVP_PKEY_EC, | 54 | .key_type = EVP_PKEY_EC, |
| 55 | .md = EVP_sha384, | ||
| 56 | .curve_nid = NID_secp384r1, | 56 | .curve_nid = NID_secp384r1, |
| 57 | }, | 57 | }, |
| 58 | { | 58 | { |
| 59 | .value = SIGALG_RSA_PKCS1_SHA256, | 59 | .value = SIGALG_RSA_PKCS1_SHA256, |
| 60 | .md = EVP_sha256, | ||
| 61 | .key_type = EVP_PKEY_RSA, | 60 | .key_type = EVP_PKEY_RSA, |
| 61 | .md = EVP_sha256, | ||
| 62 | }, | 62 | }, |
| 63 | { | 63 | { |
| 64 | .value = SIGALG_ECDSA_SECP256R1_SHA256, | 64 | .value = SIGALG_ECDSA_SECP256R1_SHA256, |
| 65 | .md = EVP_sha256, | ||
| 66 | .key_type = EVP_PKEY_EC, | 65 | .key_type = EVP_PKEY_EC, |
| 66 | .md = EVP_sha256, | ||
| 67 | .curve_nid = NID_X9_62_prime256v1, | 67 | .curve_nid = NID_X9_62_prime256v1, |
| 68 | }, | 68 | }, |
| 69 | #ifndef OPENSSL_NO_GOST | 69 | #ifndef OPENSSL_NO_GOST |
| 70 | { | 70 | { |
| 71 | .value = SIGALG_GOSTR12_256_STREEBOG_256, | 71 | .value = SIGALG_GOSTR12_256_STREEBOG_256, |
| 72 | .md = EVP_streebog256, | ||
| 73 | .key_type = EVP_PKEY_GOSTR12_256, | 72 | .key_type = EVP_PKEY_GOSTR12_256, |
| 73 | .md = EVP_streebog256, | ||
| 74 | }, | 74 | }, |
| 75 | { | 75 | { |
| 76 | .value = SIGALG_GOSTR01_GOST94, | 76 | .value = SIGALG_GOSTR01_GOST94, |
| 77 | .md = EVP_gostr341194, | ||
| 78 | .key_type = EVP_PKEY_GOSTR01, | 77 | .key_type = EVP_PKEY_GOSTR01, |
| 78 | .md = EVP_gostr341194, | ||
| 79 | }, | 79 | }, |
| 80 | #endif | 80 | #endif |
| 81 | { | 81 | { |
| 82 | .value = SIGALG_RSA_PSS_RSAE_SHA256, | 82 | .value = SIGALG_RSA_PSS_RSAE_SHA256, |
| 83 | .md = EVP_sha256, | ||
| 84 | .key_type = EVP_PKEY_RSA, | 83 | .key_type = EVP_PKEY_RSA, |
| 84 | .md = EVP_sha256, | ||
| 85 | .flags = SIGALG_FLAG_RSA_PSS, | 85 | .flags = SIGALG_FLAG_RSA_PSS, |
| 86 | }, | 86 | }, |
| 87 | { | 87 | { |
| 88 | .value = SIGALG_RSA_PSS_RSAE_SHA384, | 88 | .value = SIGALG_RSA_PSS_RSAE_SHA384, |
| 89 | .md = EVP_sha384, | ||
| 90 | .key_type = EVP_PKEY_RSA, | 89 | .key_type = EVP_PKEY_RSA, |
| 90 | .md = EVP_sha384, | ||
| 91 | .flags = SIGALG_FLAG_RSA_PSS, | 91 | .flags = SIGALG_FLAG_RSA_PSS, |
| 92 | }, | 92 | }, |
| 93 | { | 93 | { |
| 94 | .value = SIGALG_RSA_PSS_RSAE_SHA512, | 94 | .value = SIGALG_RSA_PSS_RSAE_SHA512, |
| 95 | .md = EVP_sha512, | ||
| 96 | .key_type = EVP_PKEY_RSA, | 95 | .key_type = EVP_PKEY_RSA, |
| 96 | .md = EVP_sha512, | ||
| 97 | .flags = SIGALG_FLAG_RSA_PSS, | 97 | .flags = SIGALG_FLAG_RSA_PSS, |
| 98 | }, | 98 | }, |
| 99 | { | 99 | { |
| 100 | .value = SIGALG_RSA_PSS_PSS_SHA256, | 100 | .value = SIGALG_RSA_PSS_PSS_SHA256, |
| 101 | .md = EVP_sha256, | ||
| 102 | .key_type = EVP_PKEY_RSA, | 101 | .key_type = EVP_PKEY_RSA, |
| 102 | .md = EVP_sha256, | ||
| 103 | .flags = SIGALG_FLAG_RSA_PSS, | 103 | .flags = SIGALG_FLAG_RSA_PSS, |
| 104 | }, | 104 | }, |
| 105 | { | 105 | { |
| 106 | .value = SIGALG_RSA_PSS_PSS_SHA384, | 106 | .value = SIGALG_RSA_PSS_PSS_SHA384, |
| 107 | .md = EVP_sha384, | ||
| 108 | .key_type = EVP_PKEY_RSA, | 107 | .key_type = EVP_PKEY_RSA, |
| 108 | .md = EVP_sha384, | ||
| 109 | .flags = SIGALG_FLAG_RSA_PSS, | 109 | .flags = SIGALG_FLAG_RSA_PSS, |
| 110 | }, | 110 | }, |
| 111 | { | 111 | { |
| 112 | .value = SIGALG_RSA_PSS_PSS_SHA512, | 112 | .value = SIGALG_RSA_PSS_PSS_SHA512, |
| 113 | .md = EVP_sha512, | ||
| 114 | .key_type = EVP_PKEY_RSA, | 113 | .key_type = EVP_PKEY_RSA, |
| 114 | .md = EVP_sha512, | ||
| 115 | .flags = SIGALG_FLAG_RSA_PSS, | 115 | .flags = SIGALG_FLAG_RSA_PSS, |
| 116 | }, | 116 | }, |
| 117 | { | 117 | { |
| 118 | .value = SIGALG_RSA_PKCS1_SHA224, | 118 | .value = SIGALG_RSA_PKCS1_SHA224, |
| 119 | .md = EVP_sha224, | ||
| 120 | .key_type = EVP_PKEY_RSA, | 119 | .key_type = EVP_PKEY_RSA, |
| 120 | .md = EVP_sha224, | ||
| 121 | }, | 121 | }, |
| 122 | { | 122 | { |
| 123 | .value = SIGALG_ECDSA_SECP224R1_SHA224, | 123 | .value = SIGALG_ECDSA_SECP224R1_SHA224, |
| 124 | .md = EVP_sha224, | ||
| 125 | .key_type = EVP_PKEY_EC, | 124 | .key_type = EVP_PKEY_EC, |
| 125 | .md = EVP_sha224, | ||
| 126 | }, | 126 | }, |
| 127 | { | 127 | { |
| 128 | .value = SIGALG_RSA_PKCS1_SHA1, | 128 | .value = SIGALG_RSA_PKCS1_SHA1, |
