summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto
diff options
context:
space:
mode:
authorjsg <>2024-10-23 01:57:19 +0000
committerjsg <>2024-10-23 01:57:19 +0000
commit8fc817eb78ff86fb4944c3b0ea974f111065a81a (patch)
tree45b306ffe59e24323524ad9d7a4f4c79cfb3391f /src/lib/libcrypto
parent6374d941af54c8305dee7afaab0a4198c1771cdb (diff)
downloadopenbsd-8fc817eb78ff86fb4944c3b0ea974f111065a81a.tar.gz
openbsd-8fc817eb78ff86fb4944c3b0ea974f111065a81a.tar.bz2
openbsd-8fc817eb78ff86fb4944c3b0ea974f111065a81a.zip
remove duplicate defines; ok tb@
Diffstat (limited to 'src/lib/libcrypto')
-rw-r--r--src/lib/libcrypto/pkcs7/pkcs7.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs7/pkcs7.h b/src/lib/libcrypto/pkcs7/pkcs7.h
index 00a094f5e4..6fd5adf457 100644
--- a/src/lib/libcrypto/pkcs7/pkcs7.h
+++ b/src/lib/libcrypto/pkcs7/pkcs7.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs7.h,v 1.21 2023/04/25 18:04:03 tb Exp $ */ 1/* $OpenBSD: pkcs7.h,v 1.22 2024/10/23 01:57:19 jsg Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -216,8 +216,6 @@ DECLARE_PKCS12_STACK_OF(PKCS7)
216#define PKCS7_type_is_encrypted(a) \ 216#define PKCS7_type_is_encrypted(a) \
217 (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted) 217 (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
218 218
219#define PKCS7_type_is_digest(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_digest)
220
221#define PKCS7_set_detached(p,v) \ 219#define PKCS7_set_detached(p,v) \
222 PKCS7_ctrl(p,PKCS7_OP_SET_DETACHED_SIGNATURE,v,NULL) 220 PKCS7_ctrl(p,PKCS7_OP_SET_DETACHED_SIGNATURE,v,NULL)
223#define PKCS7_get_detached(p) \ 221#define PKCS7_get_detached(p) \