summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2023-08-11 04:45:27 +0000
committertb <>2023-08-11 04:45:27 +0000
commit8606a65ff8cf7df8afe3c513ae0d757a78832656 (patch)
tree977542de5152846d9969e8316ad40267ad2b3323 /src
parentcfc6fda1cea3a524ffa03d0983d431358840d850 (diff)
downloadopenbsd-8606a65ff8cf7df8afe3c513ae0d757a78832656.tar.gz
openbsd-8606a65ff8cf7df8afe3c513ae0d757a78832656.tar.bz2
openbsd-8606a65ff8cf7df8afe3c513ae0d757a78832656.zip
Move EC_KEY and EC_KEY_METHOD typedefs to ossl_typ.h
ok jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/ec/ec.h5
-rw-r--r--src/lib/libcrypto/ossl_typ.h5
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 @@
1/* $OpenBSD: ec.h,v 1.45 2023/07/28 09:28:37 tb Exp $ */ 1/* $OpenBSD: ec.h,v 1.46 2023/08/11 04:45:27 tb Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller for the OpenSSL project. 3 * Originally written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
@@ -262,9 +262,6 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off);
262#endif 262#endif
263int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off); 263int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off);
264 264
265typedef struct ec_key_st EC_KEY;
266typedef struct ec_key_method_st EC_KEY_METHOD;
267
268#define EC_PKEY_NO_PARAMETERS 0x001 265#define EC_PKEY_NO_PARAMETERS 0x001
269#define EC_PKEY_NO_PUBKEY 0x002 266#define EC_PKEY_NO_PUBKEY 0x002
270 267
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 @@
1/* $OpenBSD: ossl_typ.h,v 1.28 2023/07/28 10:21:01 tb Exp $ */ 1/* $OpenBSD: ossl_typ.h,v 1.29 2023/08/11 04:45:26 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -118,6 +118,9 @@ typedef struct dh_method DH_METHOD;
118typedef struct dsa_st DSA; 118typedef struct dsa_st DSA;
119typedef struct dsa_method DSA_METHOD; 119typedef struct dsa_method DSA_METHOD;
120 120
121typedef struct ec_key_st EC_KEY;
122typedef struct ec_key_method_st EC_KEY_METHOD;
123
121typedef struct rsa_st RSA; 124typedef struct rsa_st RSA;
122typedef struct rsa_meth_st RSA_METHOD; 125typedef struct rsa_meth_st RSA_METHOD;
123typedef struct rsa_pss_params_st RSA_PSS_PARAMS; 126typedef struct rsa_pss_params_st RSA_PSS_PARAMS;