From 8606a65ff8cf7df8afe3c513ae0d757a78832656 Mon Sep 17 00:00:00 2001 From: tb <> Date: Fri, 11 Aug 2023 04:45:27 +0000 Subject: Move EC_KEY and EC_KEY_METHOD typedefs to ossl_typ.h ok jsing --- src/lib/libcrypto/ec/ec.h | 5 +---- src/lib/libcrypto/ossl_typ.h | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/libcrypto/ec/ec.h b/src/lib/libcrypto/ec/ec.h index 85951f0b97..9e3354df46 100644 --- a/src/lib/libcrypto/ec/ec.h +++ b/src/lib/libcrypto/ec/ec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ec.h,v 1.45 2023/07/28 09:28:37 tb Exp $ */ +/* $OpenBSD: ec.h,v 1.46 2023/08/11 04:45:27 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -262,9 +262,6 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off); #endif int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off); -typedef struct ec_key_st EC_KEY; -typedef struct ec_key_method_st EC_KEY_METHOD; - #define EC_PKEY_NO_PARAMETERS 0x001 #define EC_PKEY_NO_PUBKEY 0x002 diff --git a/src/lib/libcrypto/ossl_typ.h b/src/lib/libcrypto/ossl_typ.h index 5da4243f80..4553a5ecff 100644 --- a/src/lib/libcrypto/ossl_typ.h +++ b/src/lib/libcrypto/ossl_typ.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ossl_typ.h,v 1.28 2023/07/28 10:21:01 tb Exp $ */ +/* $OpenBSD: ossl_typ.h,v 1.29 2023/08/11 04:45:26 tb Exp $ */ /* ==================================================================== * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. * @@ -118,6 +118,9 @@ typedef struct dh_method DH_METHOD; typedef struct dsa_st DSA; typedef struct dsa_method DSA_METHOD; +typedef struct ec_key_st EC_KEY; +typedef struct ec_key_method_st EC_KEY_METHOD; + typedef struct rsa_st RSA; typedef struct rsa_meth_st RSA_METHOD; typedef struct rsa_pss_params_st RSA_PSS_PARAMS; -- cgit v1.2.3-55-g6feb