diff options
| author | jsing <> | 2018-08-16 18:39:37 +0000 |
|---|---|---|
| committer | jsing <> | 2018-08-16 18:39:37 +0000 |
| commit | 376676d240a487534ae7527150946472cd5c131b (patch) | |
| tree | b684aa413b2e8885211605da1b8bc777c08a8161 | |
| parent | 94c33ed9a2151b8f686fd432b0630b6275986330 (diff) | |
| download | openbsd-376676d240a487534ae7527150946472cd5c131b.tar.gz openbsd-376676d240a487534ae7527150946472cd5c131b.tar.bz2 openbsd-376676d240a487534ae7527150946472cd5c131b.zip | |
Provide CBB_add_u32(), as needed for an upcoming conversion.
ok tb@
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/bs_cbb.c | 11 | ||||
| -rw-r--r-- | src/lib/libssl/bytestring.h | 8 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/lib/libssl/bs_cbb.c b/src/lib/libssl/bs_cbb.c index bf7de3fd33..beb588fe25 100644 --- a/src/lib/libssl/bs_cbb.c +++ b/src/lib/libssl/bs_cbb.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bs_cbb.c,v 1.18 2017/11/28 16:34:20 jsing Exp $ */ | 1 | /* $OpenBSD: bs_cbb.c,v 1.19 2018/08/16 18:39:37 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014, Google Inc. | 3 | * Copyright (c) 2014, Google Inc. |
| 4 | * | 4 | * |
| @@ -406,6 +406,15 @@ CBB_add_u24(CBB *cbb, size_t value) | |||
| 406 | } | 406 | } |
| 407 | 407 | ||
| 408 | int | 408 | int |
| 409 | CBB_add_u32(CBB *cbb, size_t value) | ||
| 410 | { | ||
| 411 | if (value > 0xffffffffUL) | ||
| 412 | return 0; | ||
| 413 | |||
| 414 | return cbb_add_u(cbb, (uint32_t)value, 4); | ||
| 415 | } | ||
| 416 | |||
| 417 | int | ||
| 409 | CBB_add_asn1_uint64(CBB *cbb, uint64_t value) | 418 | CBB_add_asn1_uint64(CBB *cbb, uint64_t value) |
| 410 | { | 419 | { |
| 411 | CBB child; | 420 | CBB child; |
diff --git a/src/lib/libssl/bytestring.h b/src/lib/libssl/bytestring.h index 2e89a5791a..20ee43999d 100644 --- a/src/lib/libssl/bytestring.h +++ b/src/lib/libssl/bytestring.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bytestring.h,v 1.16 2017/11/28 16:34:20 jsing Exp $ */ | 1 | /* $OpenBSD: bytestring.h,v 1.17 2018/08/16 18:39:37 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014, Google Inc. | 3 | * Copyright (c) 2014, Google Inc. |
| 4 | * | 4 | * |
| @@ -462,6 +462,12 @@ int CBB_add_u16(CBB *cbb, size_t value); | |||
| 462 | int CBB_add_u24(CBB *cbb, size_t value); | 462 | int CBB_add_u24(CBB *cbb, size_t value); |
| 463 | 463 | ||
| 464 | /* | 464 | /* |
| 465 | * CBB_add_u32 appends a 32-bit, big-endian number from |value| to |cbb|. It | ||
| 466 | * returns one on success and zero otherwise. | ||
| 467 | */ | ||
| 468 | int CBB_add_u32(CBB *cbb, size_t value); | ||
| 469 | |||
| 470 | /* | ||
| 465 | * CBB_add_asn1_uint64 writes an ASN.1 INTEGER into |cbb| using |CBB_add_asn1| | 471 | * CBB_add_asn1_uint64 writes an ASN.1 INTEGER into |cbb| using |CBB_add_asn1| |
| 466 | * and writes |value| in its contents. It returns one on success and zero on | 472 | * and writes |value| in its contents. It returns one on success and zero on |
| 467 | * error. | 473 | * error. |
