diff options
author | Adam Langley <alangley@gmail.com> | 2016-01-25 02:58:39 +0300 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2016-01-27 02:23:42 +0300 |
commit | ce9d85eedd4888848148e3b855e85efb1009224c (patch) | |
tree | f090ce4abac17c5cce8eedf7f9f5c2e344b8e3d7 /decrepit | |
parent | eac0ce09d85f71c91561451887bdf68fce9f611e (diff) |
Tweaks for node.js
node.js is, effectively, another bindings library. However, it's better
written than most and, with these changes, only a couple of tiny fixes
are needed in node.js. Some of these changes are a little depressing
however so we'll need to push node.js to use APIs where possible.
Changes:
∙ Support verify_recover. This is very obscure and the motivation
appears to be https://github.com/nodejs/node/issues/477 – where it's
not clear that anyone understands what it means :(
∙ Add a few, no-op #defines
∙ Add some members to |SSL_CTX| and |SSL| – node.js needs to not
reach into these structs in the future.
∙ Add EC_get_builtin_curves.
∙ Add EVP_[CIPHER|MD]_do_all_sorted – these functions are limited to
decrepit.
Change-Id: I9a3566054260d6c4db9d430beb7c46cc970a9d46
Reviewed-on: https://boringssl-review.googlesource.com/6952
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'decrepit')
-rw-r--r-- | decrepit/CMakeLists.txt | 2 | ||||
-rw-r--r-- | decrepit/evp/CMakeLists.txt | 9 | ||||
-rw-r--r-- | decrepit/evp/evp_do_all.c | 77 |
3 files changed, 88 insertions, 0 deletions
diff --git a/decrepit/CMakeLists.txt b/decrepit/CMakeLists.txt index 0773f9a6..a7677d0a 100644 --- a/decrepit/CMakeLists.txt +++ b/decrepit/CMakeLists.txt @@ -2,6 +2,7 @@ add_subdirectory(bio) add_subdirectory(blowfish) add_subdirectory(cast) add_subdirectory(des) +add_subdirectory(evp) add_subdirectory(rsa) add_subdirectory(xts) @@ -12,6 +13,7 @@ add_library( $<TARGET_OBJECTS:blowfish> $<TARGET_OBJECTS:cast> $<TARGET_OBJECTS:des_decrepit> + $<TARGET_OBJECTS:evp_decrepit> $<TARGET_OBJECTS:rsa_decrepit> $<TARGET_OBJECTS:xts> ) diff --git a/decrepit/evp/CMakeLists.txt b/decrepit/evp/CMakeLists.txt new file mode 100644 index 00000000..ee3bf33b --- /dev/null +++ b/decrepit/evp/CMakeLists.txt @@ -0,0 +1,9 @@ +include_directories(../../include) + +add_library( + evp_decrepit + + OBJECT + + evp_do_all.c +) diff --git a/decrepit/evp/evp_do_all.c b/decrepit/evp/evp_do_all.c new file mode 100644 index 00000000..621c0b11 --- /dev/null +++ b/decrepit/evp/evp_do_all.c @@ -0,0 +1,77 @@ +/* Copyright (c) 2016, 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 <openssl/evp.h> + + +void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher, + const char *name, + const char *unused, void *arg), + void *arg) { + callback(EVP_aes_128_cbc(), "AES-128-CBC", NULL, arg); + callback(EVP_aes_128_ctr(), "AES-128-CTR", NULL, arg); + callback(EVP_aes_128_ecb(), "AES-128-ECB", NULL, arg); + callback(EVP_aes_128_ofb(), "AES-128-OFB", NULL, arg); + callback(EVP_aes_256_cbc(), "AES-256-CBC", NULL, arg); + callback(EVP_aes_256_ctr(), "AES-256-CTR", NULL, arg); + callback(EVP_aes_256_ecb(), "AES-256-ECB", NULL, arg); + callback(EVP_aes_256_ofb(), "AES-256-OFB", NULL, arg); + callback(EVP_aes_256_xts(), "AES-256-XTS", NULL, arg); + callback(EVP_des_cbc(), "DES-CBC", NULL, arg); + callback(EVP_des_ecb(), "DES-ECB", NULL, arg); + callback(EVP_des_ede(), "DES-EDE", NULL, arg); + callback(EVP_des_ede_cbc(), "DES-EDE-CBC", NULL, arg); + callback(EVP_des_ede3_cbc(), "DES-EDE3-CBC", NULL, arg); + callback(EVP_rc2_cbc(), "RC2-CBC", NULL, arg); + callback(EVP_rc4(), "RC4", NULL, arg); + + /* OpenSSL returns everything twice, the second time in lower case. */ + callback(EVP_aes_128_cbc(), "aes-128-cbc", NULL, arg); + callback(EVP_aes_128_ctr(), "aes-128-ctr", NULL, arg); + callback(EVP_aes_128_ecb(), "aes-128-ecb", NULL, arg); + callback(EVP_aes_128_ofb(), "aes-128-ofb", NULL, arg); + callback(EVP_aes_256_cbc(), "aes-256-cbc", NULL, arg); + callback(EVP_aes_256_ctr(), "aes-256-ctr", NULL, arg); + callback(EVP_aes_256_ecb(), "aes-256-ecb", NULL, arg); + callback(EVP_aes_256_ofb(), "aes-256-ofb", NULL, arg); + callback(EVP_aes_256_xts(), "aes-256-xts", NULL, arg); + callback(EVP_des_cbc(), "des-cbc", NULL, arg); + callback(EVP_des_ecb(), "des-ecb", NULL, arg); + callback(EVP_des_ede(), "des-ede", NULL, arg); + callback(EVP_des_ede_cbc(), "des-ede-cbc", NULL, arg); + callback(EVP_des_ede3_cbc(), "des-ede3-cbc", NULL, arg); + callback(EVP_rc2_cbc(), "rc2-cbc", NULL, arg); + callback(EVP_rc4(), "rc4", NULL, arg); +} + +void EVP_MD_do_all_sorted(void (*callback)(const EVP_MD *cipher, + const char *name, const char *unused, + void *arg), + void *arg) { + callback(EVP_md4(), "MD4", NULL, arg); + callback(EVP_md5(), "MD5", NULL, arg); + callback(EVP_sha1(), "SHA1", NULL, arg); + callback(EVP_sha224(), "SHA224", NULL, arg); + callback(EVP_sha256(), "SHA256", NULL, arg); + callback(EVP_sha384(), "SHA384", NULL, arg); + callback(EVP_sha512(), "SHA512", NULL, arg); + + callback(EVP_md4(), "md4", NULL, arg); + callback(EVP_md5(), "md5", NULL, arg); + callback(EVP_sha1(), "sha1", NULL, arg); + callback(EVP_sha224(), "sha224", NULL, arg); + callback(EVP_sha256(), "sha256", NULL, arg); + callback(EVP_sha384(), "sha384", NULL, arg); + callback(EVP_sha512(), "sha512", NULL, arg); +} |