diff options
author | tb <> | 2023-12-14 15:33:09 +0000 |
---|---|---|
committer | tb <> | 2023-12-14 15:33:09 +0000 |
commit | 1dbbc360a2fa8c0514e9898ba43b71696c6fe58a (patch) | |
tree | 3a3fb30709e118aa5e4f7d34ff1560f4fb6e7ebf | |
parent | 32962333c6b8732ece37d23a17eec8bdba952aca (diff) | |
download | openbsd-1dbbc360a2fa8c0514e9898ba43b71696c6fe58a.tar.gz openbsd-1dbbc360a2fa8c0514e9898ba43b71696c6fe58a.tar.bz2 openbsd-1dbbc360a2fa8c0514e9898ba43b71696c6fe58a.zip |
OPENSSL_assert() that the passed nid is within range
discussed with deraadt and jsing
-rw-r--r-- | src/lib/libcrypto/objects/obj_dat.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c index a70f4cf5b4..bd8601c316 100644 --- a/src/lib/libcrypto/objects/obj_dat.c +++ b/src/lib/libcrypto/objects/obj_dat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: obj_dat.c,v 1.70 2023/12/14 14:45:45 tb Exp $ */ | 1 | /* $OpenBSD: obj_dat.c,v 1.71 2023/12/14 15:33:09 tb 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 | * |
@@ -339,6 +339,8 @@ obj_objs_cmp(const void *aobj, const void *b) | |||
339 | { | 339 | { |
340 | const unsigned int *nid = b; | 340 | const unsigned int *nid = b; |
341 | 341 | ||
342 | OPENSSL_assert(*nid >= 0 && *nid < NUM_NID); | ||
343 | |||
342 | return OBJ_cmp(aobj, &nid_objs[*nid]); | 344 | return OBJ_cmp(aobj, &nid_objs[*nid]); |
343 | } | 345 | } |
344 | 346 | ||
@@ -379,6 +381,8 @@ ln_objs_cmp(const void *ln, const void *b) | |||
379 | { | 381 | { |
380 | const unsigned int *nid = b; | 382 | const unsigned int *nid = b; |
381 | 383 | ||
384 | OPENSSL_assert(*nid >= 0 && *nid < NUM_NID); | ||
385 | |||
382 | return strcmp(ln, nid_objs[*nid].ln); | 386 | return strcmp(ln, nid_objs[*nid].ln); |
383 | } | 387 | } |
384 | 388 | ||
@@ -416,6 +420,8 @@ sn_objs_cmp(const void *sn, const void *b) | |||
416 | { | 420 | { |
417 | const unsigned int *nid = b; | 421 | const unsigned int *nid = b; |
418 | 422 | ||
423 | OPENSSL_assert(*nid >= 0 && *nid < NUM_NID); | ||
424 | |||
419 | return strcmp(sn, nid_objs[*nid].sn); | 425 | return strcmp(sn, nid_objs[*nid].sn); |
420 | } | 426 | } |
421 | 427 | ||