diff options
author | doug <> | 2015-04-29 02:02:46 +0000 |
---|---|---|
committer | doug <> | 2015-04-29 02:02:46 +0000 |
commit | d79e6451e5386f81e8223bb4eb91bdc37afa60d4 (patch) | |
tree | 2fb5af7b657d5ae943c63473102b32da8b944200 | |
parent | 20823711d95a786dfa8d460def82955cd75c3a7b (diff) | |
download | openbsd-d79e6451e5386f81e8223bb4eb91bdc37afa60d4.tar.gz openbsd-d79e6451e5386f81e8223bb4eb91bdc37afa60d4.tar.bz2 openbsd-d79e6451e5386f81e8223bb4eb91bdc37afa60d4.zip |
Call CBB_add_space() rather than reimplementing it.
ok jsing@
-rw-r--r-- | src/lib/libssl/bs_cbb.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/ssl/bs_cbb.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/bs_cbb.c b/src/lib/libssl/bs_cbb.c index 07315e86bb..b766e850d3 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.7 2015/04/29 01:49:28 doug Exp $ */ | 1 | /* $OpenBSD: bs_cbb.c,v 1.8 2015/04/29 02:02:46 doug Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014, Google Inc. | 3 | * Copyright (c) 2014, Google Inc. |
4 | * | 4 | * |
@@ -324,7 +324,7 @@ CBB_add_bytes(CBB *cbb, const uint8_t *data, size_t len) | |||
324 | { | 324 | { |
325 | uint8_t *dest; | 325 | uint8_t *dest; |
326 | 326 | ||
327 | if (!CBB_flush(cbb) || !cbb_buffer_add(cbb->base, &dest, len)) | 327 | if (!CBB_add_space(cbb, &dest, len)) |
328 | return 0; | 328 | return 0; |
329 | 329 | ||
330 | memcpy(dest, data, len); | 330 | memcpy(dest, data, len); |
diff --git a/src/lib/libssl/src/ssl/bs_cbb.c b/src/lib/libssl/src/ssl/bs_cbb.c index 07315e86bb..b766e850d3 100644 --- a/src/lib/libssl/src/ssl/bs_cbb.c +++ b/src/lib/libssl/src/ssl/bs_cbb.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bs_cbb.c,v 1.7 2015/04/29 01:49:28 doug Exp $ */ | 1 | /* $OpenBSD: bs_cbb.c,v 1.8 2015/04/29 02:02:46 doug Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014, Google Inc. | 3 | * Copyright (c) 2014, Google Inc. |
4 | * | 4 | * |
@@ -324,7 +324,7 @@ CBB_add_bytes(CBB *cbb, const uint8_t *data, size_t len) | |||
324 | { | 324 | { |
325 | uint8_t *dest; | 325 | uint8_t *dest; |
326 | 326 | ||
327 | if (!CBB_flush(cbb) || !cbb_buffer_add(cbb->base, &dest, len)) | 327 | if (!CBB_add_space(cbb, &dest, len)) |
328 | return 0; | 328 | return 0; |
329 | 329 | ||
330 | memcpy(dest, data, len); | 330 | memcpy(dest, data, len); |