summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2017-01-21 04:53:22 +0000
committerjsing <>2017-01-21 04:53:22 +0000
commit6411419e3be11551c026699bf2afb5e17fdd57c4 (patch)
tree63e36f3cc47be592d9e7477ee335b334ff2ed656
parentcf9904a4b13d79f0e11e7db5209260a381b4a83f (diff)
downloadopenbsd-6411419e3be11551c026699bf2afb5e17fdd57c4.tar.gz
openbsd-6411419e3be11551c026699bf2afb5e17fdd57c4.tar.bz2
openbsd-6411419e3be11551c026699bf2afb5e17fdd57c4.zip
Place {DECLARE,IMPLEMENT}_OBJ_BSEARCH{_GLOBAL,}_CMP_FN macros undef
LIBRESSL_INTERNAL.
-rw-r--r--src/lib/libcrypto/objects/objects.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/libcrypto/objects/objects.h b/src/lib/libcrypto/objects/objects.h
index a4ce4ec220..c40991b5e3 100644
--- a/src/lib/libcrypto/objects/objects.h
+++ b/src/lib/libcrypto/objects/objects.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: objects.h,v 1.11 2014/06/12 15:49:30 deraadt Exp $ */ 1/* $OpenBSD: objects.h,v 1.12 2017/01/21 04:53:22 jsing 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 *
@@ -1016,6 +1016,8 @@ const void * OBJ_bsearch_ex_(const void *key, const void *base, int num,
1016 int size, int (*cmp)(const void *, const void *), 1016 int size, int (*cmp)(const void *, const void *),
1017 int flags); 1017 int flags);
1018 1018
1019#ifndef LIBRESSL_INTERNAL
1020
1019#define _DECLARE_OBJ_BSEARCH_CMP_FN(scope, type1, type2, nm) \ 1021#define _DECLARE_OBJ_BSEARCH_CMP_FN(scope, type1, type2, nm) \
1020 static int nm##_cmp_BSEARCH_CMP_FN(const void *, const void *); \ 1022 static int nm##_cmp_BSEARCH_CMP_FN(const void *, const void *); \
1021 static int nm##_cmp(type1 const *, type2 const *); \ 1023 static int nm##_cmp(type1 const *, type2 const *); \
@@ -1095,6 +1097,8 @@ const void * OBJ_bsearch_ex_(const void *key, const void *base, int num,
1095 (void)type_2=CHECKED_PTR_OF(type2,cmp##_type_2), \ 1097 (void)type_2=CHECKED_PTR_OF(type2,cmp##_type_2), \
1096 cmp##_BSEARCH_CMP_FN)),flags) 1098 cmp##_BSEARCH_CMP_FN)),flags)
1097 1099
1100#endif /* !LIBRESSL_INTERNAL */
1101
1098int OBJ_new_nid(int num); 1102int OBJ_new_nid(int num);
1099int OBJ_add_object(const ASN1_OBJECT *obj); 1103int OBJ_add_object(const ASN1_OBJECT *obj);
1100int OBJ_create(const char *oid, const char *sn, const char *ln); 1104int OBJ_create(const char *oid, const char *sn, const char *ln);