diff options
| author | harti <harti@FreeBSD.org> | 2004-01-23 10:44:47 +0000 |
|---|---|---|
| committer | harti <harti@FreeBSD.org> | 2004-01-23 10:44:47 +0000 |
| commit | 37f8604ae2d6123aca70878041cfad4e857aae0a (patch) | |
| tree | 064e02524b69deb956e22716b5e049d1e4c9f066 /contrib/bsnmp/lib/asn1.c | |
| parent | ca3ba04f7363860ece02c8042bffc3db8c209dfb (diff) | |
| download | FreeBSD-src-37f8604ae2d6123aca70878041cfad4e857aae0a.zip FreeBSD-src-37f8604ae2d6123aca70878041cfad4e857aae0a.tar.gz | |
Virgin import of bsnmpd 1.5a
Diffstat (limited to 'contrib/bsnmp/lib/asn1.c')
| -rw-r--r-- | contrib/bsnmp/lib/asn1.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/contrib/bsnmp/lib/asn1.c b/contrib/bsnmp/lib/asn1.c index 533b9dd..75d5300 100644 --- a/contrib/bsnmp/lib/asn1.c +++ b/contrib/bsnmp/lib/asn1.c @@ -30,7 +30,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.c,v 1.24 2003/01/28 13:44:34 hbb Exp $ + * $Begemot: bsnmp/lib/asn1.c,v 1.27 2003/12/08 17:11:58 hbb Exp $ * * ASN.1 for SNMP. */ @@ -244,6 +244,13 @@ asn_get_real_integer(struct asn_buf *b, asn_len_t len, int64_t *vp) err = ASN_ERR_OK; if (len > 8) err = ASN_ERR_RANGE; + else if (len > 1 && + ((*b->asn_cptr == 0x00 && (b->asn_cptr[1] & 0x80) == 0) || + (*b->asn_cptr == 0xff && (b->asn_cptr[1] & 0x80) == 0x80))) { + asn_error(b, "non-minimal integer"); + err = ASN_ERR_BADLEN; + } + if (*b->asn_cptr & 0x80) neg = 1; val = 0; @@ -332,6 +339,10 @@ asn_get_real_unsigned(struct asn_buf *b, asn_len_t len, u_int64_t *vp) /* negative integer or too larger */ *vp = 0xffffffffffffffffULL; err = ASN_ERR_RANGE; + } else if (len > 1 && + *b->asn_cptr == 0x00 && (b->asn_cptr[1] & 0x80) == 0) { + asn_error(b, "non-minimal unsigned"); + err = ASN_ERR_BADLEN; } while (len--) { @@ -718,7 +729,6 @@ asn_get_sequence(struct asn_buf *b, asn_len_t *len) return (ASN_ERR_OK); } - /* * Application types * |
