From 727d040aad78fde5a0f1d575255736d37d0c721c Mon Sep 17 00:00:00 2001
From: tb <>
Date: Thu, 30 Jun 2022 11:14:47 +0000
Subject: Replace obj_mac.h with object.h

Pointed out by and ok jsing
---
 src/lib/libcrypto/ct/ct_sct_ctx.c  | 4 ++--
 src/lib/libcrypto/ec/ec_curve.c    | 7 ++++---
 src/lib/libcrypto/ec/ec_lcl.h      | 6 +++---
 src/lib/libcrypto/ec/ecp_nist.c    | 5 +++--
 src/lib/libcrypto/ecdh/ech_key.c   | 4 ++--
 src/lib/libcrypto/ecdsa/ecs_ossl.c | 6 +++---
 6 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/ct/ct_sct_ctx.c b/src/lib/libcrypto/ct/ct_sct_ctx.c
index 1863058ded..b2b6d4e269 100644
--- a/src/lib/libcrypto/ct/ct_sct_ctx.c
+++ b/src/lib/libcrypto/ct/ct_sct_ctx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ct_sct_ctx.c,v 1.5 2021/12/18 16:34:52 tb Exp $ */
+/*	$OpenBSD: ct_sct_ctx.c,v 1.6 2022/06/30 11:14:47 tb Exp $ */
 /*
  * Written by Rob Stradling (rob@comodo.com) and Stephen Henson
  * (steve@openssl.org) for the OpenSSL project 2014.
@@ -65,7 +65,7 @@
 #include <string.h>
 
 #include <openssl/err.h>
-#include <openssl/obj_mac.h>
+#include <openssl/objects.h>
 #include <openssl/x509.h>
 
 #include "ct_local.h"
diff --git a/src/lib/libcrypto/ec/ec_curve.c b/src/lib/libcrypto/ec/ec_curve.c
index b575f7bac2..09f8cfe9d8 100644
--- a/src/lib/libcrypto/ec/ec_curve.c
+++ b/src/lib/libcrypto/ec/ec_curve.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_curve.c,v 1.21 2021/04/20 17:16:37 tb Exp $ */
+/* $OpenBSD: ec_curve.c,v 1.22 2022/06/30 11:14:47 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -73,9 +73,10 @@
 
 #include <openssl/opensslconf.h>
 
-#include "ec_lcl.h"
 #include <openssl/err.h>
-#include <openssl/obj_mac.h>
+#include <openssl/objects.h>
+
+#include "ec_lcl.h"
 
 typedef struct {
 	int field_type,		/* either NID_X9_62_prime_field or
diff --git a/src/lib/libcrypto/ec/ec_lcl.h b/src/lib/libcrypto/ec/ec_lcl.h
index 7a7469968c..f0a5618be2 100644
--- a/src/lib/libcrypto/ec/ec_lcl.h
+++ b/src/lib/libcrypto/ec/ec_lcl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_lcl.h,v 1.19 2021/12/04 16:08:32 tb Exp $ */
+/* $OpenBSD: ec_lcl.h,v 1.20 2022/06/30 11:14:47 tb Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -71,10 +71,10 @@
 
 #include <stdlib.h>
 
-#include <openssl/obj_mac.h>
+#include <openssl/bn.h>
 #include <openssl/ec.h>
 #include <openssl/ecdsa.h>
-#include <openssl/bn.h>
+#include <openssl/objects.h>
 
 #include "bn_lcl.h"
 
diff --git a/src/lib/libcrypto/ec/ecp_nist.c b/src/lib/libcrypto/ec/ecp_nist.c
index f7dae16e47..b3cea0c4c0 100644
--- a/src/lib/libcrypto/ec/ecp_nist.c
+++ b/src/lib/libcrypto/ec/ecp_nist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecp_nist.c,v 1.18 2021/09/08 17:29:21 tb Exp $ */
+/* $OpenBSD: ecp_nist.c,v 1.19 2022/06/30 11:14:47 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -64,7 +64,8 @@
 #include <limits.h>
 
 #include <openssl/err.h>
-#include <openssl/obj_mac.h>
+#include <openssl/objects.h>
+
 #include "ec_lcl.h"
 
 const EC_METHOD *
diff --git a/src/lib/libcrypto/ecdh/ech_key.c b/src/lib/libcrypto/ecdh/ech_key.c
index 797cb01891..ee78905848 100644
--- a/src/lib/libcrypto/ecdh/ech_key.c
+++ b/src/lib/libcrypto/ecdh/ech_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ech_key.c,v 1.12 2021/12/04 16:08:32 tb Exp $ */
+/* $OpenBSD: ech_key.c,v 1.13 2022/06/30 11:14:47 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -74,7 +74,7 @@
 
 #include <openssl/bn.h>
 #include <openssl/err.h>
-#include <openssl/obj_mac.h>
+#include <openssl/objects.h>
 #include <openssl/sha.h>
 
 #include "bn_lcl.h"
diff --git a/src/lib/libcrypto/ecdsa/ecs_ossl.c b/src/lib/libcrypto/ecdsa/ecs_ossl.c
index 0203b01bb5..48ef131217 100644
--- a/src/lib/libcrypto/ecdsa/ecs_ossl.c
+++ b/src/lib/libcrypto/ecdsa/ecs_ossl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecs_ossl.c,v 1.24 2022/04/07 17:37:25 tb Exp $ */
+/* $OpenBSD: ecs_ossl.c,v 1.25 2022/06/30 11:14:47 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project
  */
@@ -60,9 +60,9 @@
 
 #include <openssl/opensslconf.h>
 
-#include <openssl/err.h>
-#include <openssl/obj_mac.h>
 #include <openssl/bn.h>
+#include <openssl/err.h>
+#include <openssl/objects.h>
 
 #include "bn_lcl.h"
 #include "ecs_locl.h"
-- 
cgit v1.2.3-55-g6feb