diff options
| author | inoguchi <> | 2019-11-02 16:06:25 +0000 |
|---|---|---|
| committer | inoguchi <> | 2019-11-02 16:06:25 +0000 |
| commit | ff09486d906c9da98b73480e4369dffd30b13a4d (patch) | |
| tree | 3bd8d1f154a577ffb06798e41951685aee572441 /src | |
| parent | 932e05e9e8e96db0bb2f1946a6f640eb84613761 (diff) | |
| download | openbsd-ff09486d906c9da98b73480e4369dffd30b13a4d.tar.gz openbsd-ff09486d906c9da98b73480e4369dffd30b13a4d.tar.bz2 openbsd-ff09486d906c9da98b73480e4369dffd30b13a4d.zip | |
Sort standard_methods by pkey_id.
ok jsing@
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/asn1/ameth_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/asn1/ameth_lib.c b/src/lib/libcrypto/asn1/ameth_lib.c index 212b86c5f7..8be82060ef 100644 --- a/src/lib/libcrypto/asn1/ameth_lib.c +++ b/src/lib/libcrypto/asn1/ameth_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ameth_lib.c,v 1.20 2019/11/01 15:08:36 jsing Exp $ */ | 1 | /* $OpenBSD: ameth_lib.c,v 1.21 2019/11/02 16:06:25 inoguchi Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2006. | 3 | * project 2006. |
| 4 | */ | 4 | */ |
| @@ -105,13 +105,13 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = { | |||
| 105 | #endif | 105 | #endif |
| 106 | &hmac_asn1_meth, | 106 | &hmac_asn1_meth, |
| 107 | &cmac_asn1_meth, | 107 | &cmac_asn1_meth, |
| 108 | #ifndef OPENSSL_NO_RSA | ||
| 109 | &rsa_pss_asn1_meth, | ||
| 110 | #endif | ||
| 108 | #ifndef OPENSSL_NO_GOST | 111 | #ifndef OPENSSL_NO_GOST |
| 109 | &gostr01_asn1_meths[1], | 112 | &gostr01_asn1_meths[1], |
| 110 | &gostr01_asn1_meths[2], | 113 | &gostr01_asn1_meths[2], |
| 111 | #endif | 114 | #endif |
| 112 | #ifndef OPENSSL_NO_RSA | ||
| 113 | &rsa_pss_asn1_meth, | ||
| 114 | #endif | ||
| 115 | }; | 115 | }; |
| 116 | 116 | ||
| 117 | typedef int sk_cmp_fn_type(const char * const *a, const char * const *b); | 117 | typedef int sk_cmp_fn_type(const char * const *a, const char * const *b); |
