summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinoguchi <>2019-11-02 16:06:25 +0000
committerinoguchi <>2019-11-02 16:06:25 +0000
commit1627473b661f1890e2f1015ee2798cec3659b8d1 (patch)
tree3bd8d1f154a577ffb06798e41951685aee572441
parent570774d41aa759f0585c5a4ad0d5d5a4d69ad028 (diff)
downloadopenbsd-1627473b661f1890e2f1015ee2798cec3659b8d1.tar.gz
openbsd-1627473b661f1890e2f1015ee2798cec3659b8d1.tar.bz2
openbsd-1627473b661f1890e2f1015ee2798cec3659b8d1.zip
Sort standard_methods by pkey_id.
ok jsing@
-rw-r--r--src/lib/libcrypto/asn1/ameth_lib.c8
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
117typedef int sk_cmp_fn_type(const char * const *a, const char * const *b); 117typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);