From 28fd80a9189b82d0223c35153f8ed6f9cfb59161 Mon Sep 17 00:00:00 2001 From: tb <> Date: Thu, 4 Jan 2024 17:01:26 +0000 Subject: Replace .pkey_base_id with a .base_method pointer Every EVP_PKEY_ASN1_METHOD is either an ASN.1 method or an alias. As such it resolves to an underlying ASN.1 method (in one step). This information can be stored in a base_method pointer in allusion to the pkey_base_id, which is the name for the nid (aka pkey_id aka type) of the underlying method. For an ASN.1 method, the base method is itself, so the base method is set as a pointer to itself. For an alias it is of course a pointer to the underlying method. Then obviously ameth->pkey_base_id is the same as ameth->base_method->pkey_id, so rework all ASN.1 methods to follow that. ok jsing --- src/lib/libcrypto/ec/ecx_methods.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/libcrypto/ec/ecx_methods.c') diff --git a/src/lib/libcrypto/ec/ecx_methods.c b/src/lib/libcrypto/ec/ecx_methods.c index 75988d99ad..cd512a447f 100644 --- a/src/lib/libcrypto/ec/ecx_methods.c +++ b/src/lib/libcrypto/ec/ecx_methods.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecx_methods.c,v 1.10 2023/11/09 11:39:13 tb Exp $ */ +/* $OpenBSD: ecx_methods.c,v 1.11 2024/01/04 17:01:26 tb Exp $ */ /* * Copyright (c) 2022 Joel Sing * @@ -813,8 +813,8 @@ pkey_ecx_ed_ctrl(EVP_PKEY_CTX *pkey_ctx, int op, int arg1, void *arg2) } const EVP_PKEY_ASN1_METHOD x25519_asn1_meth = { + .base_method = &x25519_asn1_meth, .pkey_id = EVP_PKEY_X25519, - .pkey_base_id = EVP_PKEY_X25519, .pkey_flags = 0, .pem_str = "X25519", .info = "OpenSSL X25519 algorithm", @@ -851,8 +851,8 @@ const EVP_PKEY_METHOD x25519_pkey_meth = { }; const EVP_PKEY_ASN1_METHOD ed25519_asn1_meth = { + .base_method = &ed25519_asn1_meth, .pkey_id = EVP_PKEY_ED25519, - .pkey_base_id = EVP_PKEY_ED25519, .pkey_flags = 0, .pem_str = "ED25519", .info = "OpenSSL ED25519 algorithm", -- cgit v1.2.3-55-g6feb