From: dlg Date: Tue, 30 Dec 2014 11:08:59 +0000 (+0000) Subject: add __bounded as appropriate. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b15a4f107109742167c4524c0a8e0475f9179560;p=openbsd add __bounded as appropriate. looks good to deraadt@ miod@ and tedu@ --- diff --git a/sys/crypto/siphash.h b/sys/crypto/siphash.h index 9a6664319dc..eb2be5e44c1 100644 --- a/sys/crypto/siphash.h +++ b/sys/crypto/siphash.h @@ -1,4 +1,4 @@ -/* $OpenBSD: siphash.h,v 1.2 2014/12/20 06:04:39 tedu Exp $ */ +/* $OpenBSD: siphash.h,v 1.3 2014/12/30 11:08:59 dlg Exp $ */ /*- * Copyright (c) 2013 Andre Oppermann * All rights reserved. @@ -64,10 +64,13 @@ typedef struct { } SIPHASH_KEY; void SipHash_Init(SIPHASH_CTX *, const SIPHASH_KEY *); -void SipHash_Update(SIPHASH_CTX *, int, int, const void *, size_t); +void SipHash_Update(SIPHASH_CTX *, int, int, const void *, size_t) + __bounded((__string__, 4, 5)); u_int64_t SipHash_End(SIPHASH_CTX *, int, int); -void SipHash_Final(void *, SIPHASH_CTX *, int, int); -u_int64_t SipHash(const SIPHASH_KEY *, int, int, const void *, size_t); +void SipHash_Final(void *, SIPHASH_CTX *, int, int) + __bounded((__minbytes__, 1, SIPHASH_DIGEST_LENGTH)); +u_int64_t SipHash(const SIPHASH_KEY *, int, int, const void *, size_t) + __bounded((__string__, 4, 5)); #define SipHash24_Init(_c, _k) SipHash_Init((_c), (_k)) #define SipHash24_Update(_c, _p, _l) SipHash_Update((_c), 2, 4, (_p), (_l))