summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/sm2
diff options
context:
space:
mode:
authortb <>2023-07-28 15:50:33 +0000
committertb <>2023-07-28 15:50:33 +0000
commit0a9b2eebd959bd9a2fe64f36f8389266a7c0b88b (patch)
tree919fa2c577092b41cb1ba147c14b98991a0eacca /src/lib/libcrypto/sm2
parentb5b5f9335614fcce5146d82ce069cfb3d23cc5a8 (diff)
downloadopenbsd-0a9b2eebd959bd9a2fe64f36f8389266a7c0b88b.tar.gz
openbsd-0a9b2eebd959bd9a2fe64f36f8389266a7c0b88b.tar.bz2
openbsd-0a9b2eebd959bd9a2fe64f36f8389266a7c0b88b.zip
Stop including ecdsa.h and ecdh.h internally
These headers are now reduced to #include <openssl/ec.h> and are provided for compatiblity only. There's no point in using them. At the same time garbage collect the last uses of OPENSSL_NO_{ECDSA,ECDH} in our tree. ok jsing
Diffstat (limited to 'src/lib/libcrypto/sm2')
-rw-r--r--src/lib/libcrypto/sm2/sm2.h3
-rw-r--r--src/lib/libcrypto/sm2/sm2_local.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libcrypto/sm2/sm2.h b/src/lib/libcrypto/sm2/sm2.h
index dee75eb68b..2f14fe666e 100644
--- a/src/lib/libcrypto/sm2/sm2.h
+++ b/src/lib/libcrypto/sm2/sm2.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sm2.h,v 1.2 2022/07/12 14:42:50 kn Exp $ */ 1/* $OpenBSD: sm2.h,v 1.3 2023/07/28 15:50:33 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2017, 2019 Ribose Inc 3 * Copyright (c) 2017, 2019 Ribose Inc
4 * 4 *
@@ -21,7 +21,6 @@
21#include <openssl/opensslconf.h> 21#include <openssl/opensslconf.h>
22 22
23#include <openssl/ec.h> 23#include <openssl/ec.h>
24#include <openssl/ecdsa.h>
25 24
26#ifdef OPENSSL_NO_SM2 25#ifdef OPENSSL_NO_SM2
27#error SM2 is disabled. 26#error SM2 is disabled.
diff --git a/src/lib/libcrypto/sm2/sm2_local.h b/src/lib/libcrypto/sm2/sm2_local.h
index ad97f2c771..388c468ef2 100644
--- a/src/lib/libcrypto/sm2/sm2_local.h
+++ b/src/lib/libcrypto/sm2/sm2_local.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sm2_local.h,v 1.2 2022/11/26 17:23:18 tb Exp $ */ 1/* $OpenBSD: sm2_local.h,v 1.3 2023/07/28 15:50:33 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2017, 2019 Ribose Inc 3 * Copyright (c) 2017, 2019 Ribose Inc
4 * 4 *
@@ -19,7 +19,6 @@
19#define HEADER_SM2_LOCAL_H 19#define HEADER_SM2_LOCAL_H
20 20
21#include <openssl/ec.h> 21#include <openssl/ec.h>
22#include <openssl/ecdsa.h>
23 22
24__BEGIN_HIDDEN_DECLS 23__BEGIN_HIDDEN_DECLS
25 24