Skip to content

Commit

Permalink
Add a compatibility EVP_CIPH_OCB_MODE value.
Browse files Browse the repository at this point in the history
Node references it these days. Also replace the no-op modes with negative
numbers rather than zero. Stream ciphers like RC4 report a "mode" of zero, so
code comparing the mode to a dummy value will get confused.

(I came across nodejs/node#23635, though we'd have run
into it sooner or later anyway. Better to just define the value and avoid ifdef
proliferation.)

Change-Id: I223f25663e138480ad83f35aa16f5218f1425563
Reviewed-on: https://boringssl-review.googlesource.com/c/32464
Reviewed-by: Adam Langley <[email protected]>
Commit-Queue: Adam Langley <[email protected]>
CQ-Verified: CQ bot account: [email protected] <[email protected]>
  • Loading branch information
davidben authored and CQ bot account: [email protected] committed Oct 16, 2018
1 parent 0e15002 commit 4b96833
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions include/openssl/cipher.h
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,9 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_128_cfb128(void);

// The following flags do nothing and are included only to make it easier to
// compile code with BoringSSL.
#define EVP_CIPH_CCM_MODE 0
#define EVP_CIPH_WRAP_MODE 0
#define EVP_CIPH_CCM_MODE (-1)
#define EVP_CIPH_OCB_MODE (-2)
#define EVP_CIPH_WRAP_MODE (-3)
#define EVP_CIPHER_CTX_FLAG_WRAP_ALLOW 0

// EVP_CIPHER_CTX_set_flags does nothing.
Expand Down

0 comments on commit 4b96833

Please sign in to comment.