Skip to content

Commit da52c3f

Browse files
codebyterejasnell
authored andcommitted
src: remove OCB support ifdef OPENSSL_NO_OCB
Electron uses BoringSSL which does not support OCB . It is also possible to build OpenSSL without support for OCB for Node.js. This commit disables OCB if OPENSSL_NO_OCB is defined. PR-URL: #23635 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Anna Henningsen <anna@addaleax.net>
1 parent e2258ad commit da52c3f

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/node_crypto.cc

+8-3
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ using v8::Uint32;
8484
using v8::Undefined;
8585
using v8::Value;
8686

87+
#ifdef OPENSSL_NO_OCB
88+
# define IS_OCB_MODE(mode) false
89+
#else
90+
# define IS_OCB_MODE(mode) ((mode) == EVP_CIPH_OCB_MODE)
91+
#endif
8792

8893
struct StackOfX509Deleter {
8994
void operator()(STACK_OF(X509)* p) const { sk_X509_pop_free(p, X509_free); }
@@ -2544,7 +2549,7 @@ int VerifyCallback(int preverify_ok, X509_STORE_CTX* ctx) {
25442549
static bool IsSupportedAuthenticatedMode(int mode) {
25452550
return mode == EVP_CIPH_CCM_MODE ||
25462551
mode == EVP_CIPH_GCM_MODE ||
2547-
mode == EVP_CIPH_OCB_MODE;
2552+
IS_OCB_MODE(mode);
25482553
}
25492554

25502555
void CipherBase::Initialize(Environment* env, Local<Object> target) {
@@ -2769,7 +2774,7 @@ bool CipherBase::InitAuthenticated(const char* cipher_type, int iv_len,
27692774
}
27702775

27712776
const int mode = EVP_CIPHER_CTX_mode(ctx_.get());
2772-
if (mode == EVP_CIPH_CCM_MODE || mode == EVP_CIPH_OCB_MODE) {
2777+
if (mode == EVP_CIPH_CCM_MODE || IS_OCB_MODE(mode)) {
27732778
if (auth_tag_len == kNoAuthTagLength) {
27742779
char msg[128];
27752780
snprintf(msg, sizeof(msg), "authTagLength required for %s", cipher_type);
@@ -2885,7 +2890,7 @@ void CipherBase::SetAuthTag(const FunctionCallbackInfo<Value>& args) {
28852890
} else {
28862891
// At this point, the tag length is already known and must match the
28872892
// length of the given authentication tag.
2888-
CHECK(mode == EVP_CIPH_CCM_MODE || mode == EVP_CIPH_OCB_MODE);
2893+
CHECK(mode == EVP_CIPH_CCM_MODE || IS_OCB_MODE(mode));
28892894
CHECK_NE(cipher->auth_tag_len_, kNoAuthTagLength);
28902895
is_valid = cipher->auth_tag_len_ == tag_len;
28912896
}

0 commit comments

Comments
 (0)