kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert bytestring_test to GTest.

Browse Source 
This also fixes TestGetUint to actually test CBS_get_last_u8's behavior.
Right now it can't distinguish CBS_get_last_u8 and CBS_get_u8.

BUG=129

Change-Id: Ie431bb1a828f1c6877938ba7e75c82305b54cf13
Reviewed-on: https://boringssl-review.googlesource.com/15007
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
David Benjamin 2017-04-11 23:07:13 -04:00 committed by CQ bot account: commit-bot@chromium.org
parent 76dd18008c
commit 2c45fa0b90
5 changed files with 343 additions and 567 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/CMakeLists.txt
View File

@ -236,6 +236,7 @@ add_executable(
asn1/asn1_test.cc asn1/asn1_test.cc
base64/base64_test.cc base64/base64_test.cc
bio/bio_test.cc bio/bio_test.cc
bytestring/bytestring_test.cc
chacha/chacha_test.cc chacha/chacha_test.cc
constant_time_test.cc constant_time_test.cc
curve25519/x25519_test.cc curve25519/x25519_test.cc

11
crypto/bytestring/CMakeLists.txt
View File

@ -10,14 +10,3 @@ add_library(
cbs.c cbs.c
cbb.c cbb.c
) )
add_executable(
bytestring_test
bytestring_test.cc
$<TARGET_OBJECTS:test_support>
)
target_link_libraries(bytestring_test crypto)
add_dependencies(all_tests bytestring_test)

841
crypto/bytestring/bytestring_test.cc
View File

File diff suppressed because it is too large Load Diff

56
include/openssl/bytestring.h
View File

@ -126,33 +126,33 @@ OPENSSL_EXPORT int CBS_get_u24_length_prefixed(CBS *cbs, CBS *out);
/* Parsing ASN.1 */ /* Parsing ASN.1 */
/* The following values are tag numbers for UNIVERSAL elements. */ /* The following values are tag numbers for UNIVERSAL elements. */
#define CBS_ASN1_BOOLEAN 0x1 #define CBS_ASN1_BOOLEAN 0x1u
#define CBS_ASN1_INTEGER 0x2 #define CBS_ASN1_INTEGER 0x2u
#define CBS_ASN1_BITSTRING 0x3 #define CBS_ASN1_BITSTRING 0x3u
#define CBS_ASN1_OCTETSTRING 0x4 #define CBS_ASN1_OCTETSTRING 0x4u
#define CBS_ASN1_NULL 0x5 #define CBS_ASN1_NULL 0x5u
#define CBS_ASN1_OBJECT 0x6 #define CBS_ASN1_OBJECT 0x6u
#define CBS_ASN1_ENUMERATED 0xa #define CBS_ASN1_ENUMERATED 0xau
#define CBS_ASN1_UTF8STRING 0xc #define CBS_ASN1_UTF8STRING 0xcu
#define CBS_ASN1_SEQUENCE (0x10 | CBS_ASN1_CONSTRUCTED) #define CBS_ASN1_SEQUENCE (0x10u | CBS_ASN1_CONSTRUCTED)
#define CBS_ASN1_SET (0x11 | CBS_ASN1_CONSTRUCTED) #define CBS_ASN1_SET (0x11u | CBS_ASN1_CONSTRUCTED)
#define CBS_ASN1_NUMERICSTRING 0x12 #define CBS_ASN1_NUMERICSTRING 0x12u
#define CBS_ASN1_PRINTABLESTRING 0x13 #define CBS_ASN1_PRINTABLESTRING 0x13u
#define CBS_ASN1_T61STRING 0x14 #define CBS_ASN1_T61STRING 0x14u
#define CBS_ASN1_VIDEOTEXSTRING 0x15 #define CBS_ASN1_VIDEOTEXSTRING 0x15u
#define CBS_ASN1_IA5STRING 0x16 #define CBS_ASN1_IA5STRING 0x16u
#define CBS_ASN1_UTCTIME 0x17 #define CBS_ASN1_UTCTIME 0x17u
#define CBS_ASN1_GENERALIZEDTIME 0x18 #define CBS_ASN1_GENERALIZEDTIME 0x18u
#define CBS_ASN1_GRAPHICSTRING 0x19 #define CBS_ASN1_GRAPHICSTRING 0x19u
#define CBS_ASN1_VISIBLESTRING 0x1a #define CBS_ASN1_VISIBLESTRING 0x1au
#define CBS_ASN1_GENERALSTRING 0x1b #define CBS_ASN1_GENERALSTRING 0x1bu
#define CBS_ASN1_UNIVERSALSTRING 0x1c #define CBS_ASN1_UNIVERSALSTRING 0x1cu
#define CBS_ASN1_BMPSTRING 0x1e #define CBS_ASN1_BMPSTRING 0x1eu
/* CBS_ASN1_CONSTRUCTED may be ORed into a tag to toggle the constructed /* CBS_ASN1_CONSTRUCTED may be ORed into a tag to toggle the constructed
* bit. |CBS| and |CBB| APIs consider the constructed bit to be part of the * bit. |CBS| and |CBB| APIs consider the constructed bit to be part of the
* tag. */ * tag. */
#define CBS_ASN1_CONSTRUCTED 0x20 #define CBS_ASN1_CONSTRUCTED 0x20u
/* The following values specify the constructed bit or tag class and may be ORed /* The following values specify the constructed bit or tag class and may be ORed
* into a tag number to produce the final tag. If none is used, the tag will be * into a tag number to produce the final tag. If none is used, the tag will be
@ -161,15 +161,15 @@ OPENSSL_EXPORT int CBS_get_u24_length_prefixed(CBS *cbs, CBS *out);
* Note that although they currently match the DER serialization, consumers must * Note that although they currently match the DER serialization, consumers must
* use these bits rather than make assumptions about the representation. This is * use these bits rather than make assumptions about the representation. This is
* to allow for tag numbers beyond 31 in the future. */ * to allow for tag numbers beyond 31 in the future. */
#define CBS_ASN1_APPLICATION 0x40 #define CBS_ASN1_APPLICATION 0x40u
#define CBS_ASN1_CONTEXT_SPECIFIC 0x80 #define CBS_ASN1_CONTEXT_SPECIFIC 0x80u
#define CBS_ASN1_PRIVATE 0xc0 #define CBS_ASN1_PRIVATE 0xc0u
/* CBS_ASN1_CLASS_MASK may be ANDed with a tag to query its class. */ /* CBS_ASN1_CLASS_MASK may be ANDed with a tag to query its class. */
#define CBS_ASN1_CLASS_MASK 0xc0 #define CBS_ASN1_CLASS_MASK 0xc0u
/* CBS_ASN1_TAG_NUMBER_MASK may be ANDed with a tag to query its number. */ /* CBS_ASN1_TAG_NUMBER_MASK may be ANDed with a tag to query its number. */
#define CBS_ASN1_TAG_NUMBER_MASK 0x1f #define CBS_ASN1_TAG_NUMBER_MASK 0x1fu
/* CBS_get_asn1 sets |*out| to the contents of DER-encoded, ASN.1 element (not /* CBS_get_asn1 sets |*out| to the contents of DER-encoded, ASN.1 element (not
* including tag and length bytes) and advances |cbs| over it. The ASN.1 * including tag and length bytes) and advances |cbs| over it. The ASN.1

1
util/all_tests.json
View File

@ -1,7 +1,6 @@
[ [
["crypto/fipsmodule/aes_test", "crypto/fipsmodule/aes/aes_tests.txt"], ["crypto/fipsmodule/aes_test", "crypto/fipsmodule/aes/aes_tests.txt"],
["crypto/bn/bn_test", "crypto/bn/bn_tests.txt"], ["crypto/bn/bn_test", "crypto/bn/bn_tests.txt"],
["crypto/bytestring/bytestring_test"],
["crypto/cipher/aead_test", "aes-128-gcm", "crypto/cipher/test/aes_128_gcm_tests.txt"], ["crypto/cipher/aead_test", "aes-128-gcm", "crypto/cipher/test/aes_128_gcm_tests.txt"],
["crypto/cipher/aead_test", "aes-256-gcm", "crypto/cipher/test/aes_256_gcm_tests.txt"], ["crypto/cipher/aead_test", "aes-256-gcm", "crypto/cipher/test/aes_256_gcm_tests.txt"],
["crypto/cipher/aead_test", "aes-128-gcm-siv", "crypto/cipher/test/aes_128_gcm_siv_tests.txt"], ["crypto/cipher/aead_test", "aes-128-gcm-siv", "crypto/cipher/test/aes_128_gcm_siv_tests.txt"],