diff options
author | David Benjamin <davidben@chromium.org> | 2014-07-17 09:51:59 +0400 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2014-07-17 21:32:45 +0400 |
commit | 7b35b58ae671ac7da66c3407923c3b032fce22c2 (patch) | |
tree | 19def0eae29d59b7eec17498a305970432d7055c /crypto/base64 | |
parent | 045cc5590a214a0efb982d028a4f1f0e9dfe3314 (diff) |
Fix EVP_DecodeBlock and add tests.
Another signedness error. Leave a TODO to possibly resolve EVP_DecodeBlock's
ignoring padding. Document some of the Init/Update/Finish versions' behavior.
Change-Id: I78a72c3163f8543172a7008b2d09fb10e003d957
Reviewed-on: https://boringssl-review.googlesource.com/1230
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/base64')
-rw-r--r-- | crypto/base64/CMakeLists.txt | 8 | ||||
-rw-r--r-- | crypto/base64/base64.c | 3 | ||||
-rw-r--r-- | crypto/base64/base64_test.c | 104 |
3 files changed, 114 insertions, 1 deletions
diff --git a/crypto/base64/CMakeLists.txt b/crypto/base64/CMakeLists.txt index 2601abd9..dec67ea2 100644 --- a/crypto/base64/CMakeLists.txt +++ b/crypto/base64/CMakeLists.txt @@ -7,3 +7,11 @@ add_library( base64.c ) + +add_executable( + base64_test + + base64_test.c +) + +target_link_libraries(base64_test crypto) diff --git a/crypto/base64/base64.c b/crypto/base64/base64.c index 58e6151b..f5525b1b 100644 --- a/crypto/base64/base64.c +++ b/crypto/base64/base64.c @@ -63,6 +63,7 @@ static const unsigned char data_bin2ascii[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; #define conv_bin2ascii(a) (data_bin2ascii[(a) & 0x3f]) +/* TODO(davidben): This doesn't error on bytes above 127. */ #define conv_ascii2bin(a) (data_ascii2bin[(a) & 0x7f]) /* 64 char lines @@ -357,7 +358,7 @@ int EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, uint8_t *out, int *outl) { } } -size_t EVP_DecodeBlock(uint8_t *dst, const uint8_t *src, size_t src_len) { +ssize_t EVP_DecodeBlock(uint8_t *dst, const uint8_t *src, size_t src_len) { int a, b, c, d; uint32_t l; size_t i, ret = 0; diff --git a/crypto/base64/base64_test.c b/crypto/base64/base64_test.c new file mode 100644 index 00000000..ea0d3d14 --- /dev/null +++ b/crypto/base64/base64_test.c @@ -0,0 +1,104 @@ +/* Copyright (c) 2014, Google Inc. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + +#include <stdio.h> +#include <string.h> + +#include <openssl/base64.h> +#include <openssl/err.h> + +typedef struct { + const char *decoded; + const char *encoded; +} TEST_VECTOR; + +/* Test vectors from RFC 4648. */ +static const TEST_VECTOR test_vectors[] = { + { "", "" }, + { "f" , "Zg==" }, + { "fo", "Zm8=" }, + { "foo", "Zm9v" }, + { "foob", "Zm9vYg==" }, + { "fooba", "Zm9vYmE=" }, + { "foobar", "Zm9vYmFy" }, +}; +static const size_t kNumTests = sizeof(test_vectors) / sizeof(test_vectors[0]); + +static int test_encode() { + uint8_t out[8]; + size_t i; + ssize_t len; + + for (i = 0; i < kNumTests; i++) { + const TEST_VECTOR *t = &test_vectors[i]; + len = EVP_EncodeBlock(out, (const uint8_t*)t->decoded, strlen(t->decoded)); + if (len != strlen(t->encoded) || + memcmp(out, t->encoded, len) != 0) { + fprintf(stderr, "encode(\"%s\") = \"%.*s\", want \"%s\"\n", + t->decoded, (int)len, (const char*)out, t->encoded); + return 0; + } + } + return 1; +} + +static int test_decode() { + uint8_t out[6]; + size_t i; + ssize_t len; + + for (i = 0; i < kNumTests; i++) { + const TEST_VECTOR *t = &test_vectors[i]; + size_t expected_len = strlen(t->decoded); + len = EVP_DecodeBlock(out, (const uint8_t*)t->encoded, strlen(t->encoded)); + /* TODO(davidben): EVP_DecodeBlock doesn't take padding into account. Is + * this behavior we can change? */ + if (expected_len % 3 != 0) { + len -= 3 - (expected_len % 3); + } + if (len != strlen(t->decoded) || + memcmp(out, t->decoded, len) != 0) { + fprintf(stderr, "decode(\"%s\") = \"%.*s\", want \"%s\"\n", + t->encoded, (int)len, (const char*)out, t->decoded); + return 0; + } + } + + if (EVP_DecodeBlock(out, (const uint8_t*)"a!bc", 4) >= 0) { + fprintf(stderr, "Failed to reject invalid characters in the middle.\n"); + return 0; + } + + if (EVP_DecodeBlock(out, (const uint8_t*)"abc", 3) >= 0) { + fprintf(stderr, "Failed to reject invalid input length.\n"); + return 0; + } + + return 1; +} + +int main() { + ERR_load_crypto_strings(); + + if (!test_encode()) { + return 1; + } + + if (!test_decode()) { + return 1; + } + + printf("PASS\n"); + return 0; +} |