Add some OpenSSL-compatibility aliases Change-Id: I808f37c2980e36843b5b5d29174b4f27a030738a Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/44924 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: David Benjamin <davidben@google.com>
diff --git a/crypto/fipsmodule/ec/ec.c b/crypto/fipsmodule/ec/ec.c index ab2fd89..b250123 100644 --- a/crypto/fipsmodule/ec/ec.c +++ b/crypto/fipsmodule/ec/ec.c
@@ -879,6 +879,12 @@ return 1; } +int EC_POINT_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point, + const BIGNUM *x, const BIGNUM *y, + BN_CTX *ctx) { + return EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx); +} + int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx) { if (EC_GROUP_cmp(group, r->group, NULL) != 0 ||
diff --git a/crypto/rand_extra/rand_extra.c b/crypto/rand_extra/rand_extra.c index bed9e1e..596605a 100644 --- a/crypto/rand_extra/rand_extra.c +++ b/crypto/rand_extra/rand_extra.c
@@ -63,6 +63,10 @@ return (RAND_METHOD*) &kSSLeayMethod; } +RAND_METHOD *RAND_OpenSSL(void) { + return RAND_SSLeay(); +} + const RAND_METHOD *RAND_get_rand_method(void) { return RAND_SSLeay(); } void RAND_set_rand_method(const RAND_METHOD *method) {}
diff --git a/decrepit/cfb/cfb.c b/decrepit/cfb/cfb.c index 441ebe6..380d4ee 100644 --- a/decrepit/cfb/cfb.c +++ b/decrepit/cfb/cfb.c
@@ -65,4 +65,6 @@ }; const EVP_CIPHER *EVP_aes_128_cfb128(void) { return &aes_128_cfb128; } +const EVP_CIPHER *EVP_aes_128_cfb(void) { return &aes_128_cfb128; } const EVP_CIPHER *EVP_aes_256_cfb128(void) { return &aes_256_cfb128; } +const EVP_CIPHER *EVP_aes_256_cfb(void) { return &aes_256_cfb128; }
diff --git a/include/openssl/cipher.h b/include/openssl/cipher.h index 31390a3..81018db 100644 --- a/include/openssl/cipher.h +++ b/include/openssl/cipher.h
@@ -431,9 +431,17 @@ // EVP_aes_128_cfb128 is only available in decrepit. OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_128_cfb128(void); +// EVP_aes_128_cfb is an alias for |EVP_aes_128_cfb128| and is only available in +// decrepit. +OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_128_cfb(void); + // EVP_aes_256_cfb128 is only available in decrepit. OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_256_cfb128(void); +// EVP_aes_256_cfb is an alias for |EVP_aes_256_cfb128| and is only available in +// decrepit. +OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_256_cfb(void); + // EVP_bf_ecb is Blowfish in ECB mode and is only available in decrepit. OPENSSL_EXPORT const EVP_CIPHER *EVP_bf_ecb(void);
diff --git a/include/openssl/ec.h b/include/openssl/ec.h index cfad93e..bd0c0f3 100644 --- a/include/openssl/ec.h +++ b/include/openssl/ec.h
@@ -237,6 +237,14 @@ const BIGNUM *y, BN_CTX *ctx); +// EC_POINT_set_affine_coordinates is an alias of +// |EC_POINT_set_affine_coordinates_GFp|. +OPENSSL_EXPORT int EC_POINT_set_affine_coordinates(const EC_GROUP *group, + EC_POINT *point, + const BIGNUM *x, + const BIGNUM *y, + BN_CTX *ctx); + // EC_POINT_point2oct serialises |point| into the X9.62 form given by |form| // into, at most, |len| bytes at |buf|. It returns the number of bytes written // or zero on error if |buf| is non-NULL, else the number of bytes needed. The
diff --git a/include/openssl/rand.h b/include/openssl/rand.h index 4847eb7..b07015b 100644 --- a/include/openssl/rand.h +++ b/include/openssl/rand.h
@@ -97,6 +97,9 @@ // RAND_SSLeay returns a pointer to a dummy |RAND_METHOD|. OPENSSL_EXPORT RAND_METHOD *RAND_SSLeay(void); +// RAND_OpenSSL returns a pointer to a dummy |RAND_METHOD|. +OPENSSL_EXPORT RAND_METHOD *RAND_OpenSSL(void); + // RAND_get_rand_method returns |RAND_SSLeay()|. OPENSSL_EXPORT const RAND_METHOD *RAND_get_rand_method(void);