From 1355e20716dafad2c7891a7ce9ab86a96c2403e6 Mon Sep 17 00:00:00 2001 From: martijn <> Date: Tue, 31 Dec 2019 10:34:14 +0000 Subject: [PATCH] Increase BER_MAX_OID_LEN from 32 to 64. Not every snmp OID found in the wild fits inside 32 elements, like UsmUserEntry objects. OK rob@, claudio@ --- src/lib/libutil/ber.h | 4 ++-- src/lib/libutil/ober_oid_cmp.3 | 6 +++--- src/lib/libutil/shlib_version | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/libutil/ber.h b/src/lib/libutil/ber.h index 37352a74..e89deb46 100644 --- a/src/lib/libutil/ber.h +++ b/src/lib/libutil/ber.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ber.h,v 1.2 2019/10/24 12:39:26 tb Exp $ */ +/* $OpenBSD: ber.h,v 1.3 2019/12/31 10:34:14 martijn Exp $ */ /* * Copyright (c) 2007, 2012 Reyk Floeter @@ -81,7 +81,7 @@ struct ber { /* common definitions */ #define BER_MIN_OID_LEN 2 /* OBJECT */ -#define BER_MAX_OID_LEN 32 /* OBJECT */ +#define BER_MAX_OID_LEN 64 /* OBJECT */ #define BER_MAX_SEQ_ELEMENTS USHRT_MAX /* 65535 */ struct ber_oid { diff --git a/src/lib/libutil/ober_oid_cmp.3 b/src/lib/libutil/ober_oid_cmp.3 index 4e32432b..391fbbcf 100644 --- a/src/lib/libutil/ober_oid_cmp.3 +++ b/src/lib/libutil/ober_oid_cmp.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ober_oid_cmp.3,v 1.1 2019/10/24 12:39:26 tb Exp $ +.\" $OpenBSD: ober_oid_cmp.3,v 1.2 2019/12/31 10:34:14 martijn Exp $ .\" .\" Copyright (c) 2007, 2012 Reyk Floeter .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: October 24 2019 $ +.Dd $Mdocdate: December 31 2019 $ .Dt OBER_OID_CMP 3 .Os .Sh NAME @@ -39,7 +39,7 @@ For internal representation of OIDs, the following structure is being used: .Bd -literal #define BER_MIN_OID_LEN 2 -#define BER_MAX_OID_LEN 32 +#define BER_MAX_OID_LEN 64 struct ber_oid { u_int32_t bo_id[BER_MAX_OID_LEN + 1]; diff --git a/src/lib/libutil/shlib_version b/src/lib/libutil/shlib_version index d85251eb..77913220 100644 --- a/src/lib/libutil/shlib_version +++ b/src/lib/libutil/shlib_version @@ -1,2 +1,2 @@ -major=14 +major=15 minor=0