Rename bssl-ffi to bssl-sys
Test: TreeHugger
Change-Id: I7e8e1a73d47e2fbdf81a4d6b51d7d11cea56db35
diff --git a/libs/bssl/src/err.rs b/libs/bssl/src/err.rs
index 7040441..60bab98 100644
--- a/libs/bssl/src/err.rs
+++ b/libs/bssl/src/err.rs
@@ -15,7 +15,7 @@
//! Wrappers of the error handling functions in BoringSSL err.h.
use bssl_avf_error::{CipherError, EcError, EcdsaError, GlobalError, ReasonCode};
-use bssl_ffi::{self, ERR_get_error, ERR_GET_LIB_RUST, ERR_GET_REASON_RUST};
+use bssl_sys::{self, ERR_get_error, ERR_GET_LIB_RUST, ERR_GET_REASON_RUST};
const NO_ERROR_REASON_CODE: i32 = 0;
@@ -61,12 +61,12 @@
/// Global errors may occur in any library.
fn map_global_reason_code(reason: i32) -> Option<GlobalError> {
let reason = match reason {
- bssl_ffi::ERR_R_FATAL => GlobalError::Fatal,
- bssl_ffi::ERR_R_MALLOC_FAILURE => GlobalError::MallocFailure,
- bssl_ffi::ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED => GlobalError::ShouldNotHaveBeenCalled,
- bssl_ffi::ERR_R_PASSED_NULL_PARAMETER => GlobalError::PassedNullParameter,
- bssl_ffi::ERR_R_INTERNAL_ERROR => GlobalError::InternalError,
- bssl_ffi::ERR_R_OVERFLOW => GlobalError::Overflow,
+ bssl_sys::ERR_R_FATAL => GlobalError::Fatal,
+ bssl_sys::ERR_R_MALLOC_FAILURE => GlobalError::MallocFailure,
+ bssl_sys::ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED => GlobalError::ShouldNotHaveBeenCalled,
+ bssl_sys::ERR_R_PASSED_NULL_PARAMETER => GlobalError::PassedNullParameter,
+ bssl_sys::ERR_R_INTERNAL_ERROR => GlobalError::InternalError,
+ bssl_sys::ERR_R_OVERFLOW => GlobalError::Overflow,
_ => return None,
};
Some(reason)
@@ -74,40 +74,40 @@
fn map_library_reason_code(reason: i32, lib: i32) -> Option<ReasonCode> {
u32::try_from(lib).ok().and_then(|x| match x {
- bssl_ffi::ERR_LIB_CIPHER => map_cipher_reason_code(reason).map(ReasonCode::Cipher),
- bssl_ffi::ERR_LIB_EC => map_ec_reason_code(reason).map(ReasonCode::Ec),
- bssl_ffi::ERR_LIB_ECDSA => map_ecdsa_reason_code(reason).map(ReasonCode::Ecdsa),
+ bssl_sys::ERR_LIB_CIPHER => map_cipher_reason_code(reason).map(ReasonCode::Cipher),
+ bssl_sys::ERR_LIB_EC => map_ec_reason_code(reason).map(ReasonCode::Ec),
+ bssl_sys::ERR_LIB_ECDSA => map_ecdsa_reason_code(reason).map(ReasonCode::Ecdsa),
_ => None,
})
}
fn map_cipher_reason_code(reason: i32) -> Option<CipherError> {
let error = match reason {
- bssl_ffi::CIPHER_R_AES_KEY_SETUP_FAILED => CipherError::AesKeySetupFailed,
- bssl_ffi::CIPHER_R_BAD_DECRYPT => CipherError::BadDecrypt,
- bssl_ffi::CIPHER_R_BAD_KEY_LENGTH => CipherError::BadKeyLength,
- bssl_ffi::CIPHER_R_BUFFER_TOO_SMALL => CipherError::BufferTooSmall,
- bssl_ffi::CIPHER_R_CTRL_NOT_IMPLEMENTED => CipherError::CtrlNotImplemented,
- bssl_ffi::CIPHER_R_CTRL_OPERATION_NOT_IMPLEMENTED => {
+ bssl_sys::CIPHER_R_AES_KEY_SETUP_FAILED => CipherError::AesKeySetupFailed,
+ bssl_sys::CIPHER_R_BAD_DECRYPT => CipherError::BadDecrypt,
+ bssl_sys::CIPHER_R_BAD_KEY_LENGTH => CipherError::BadKeyLength,
+ bssl_sys::CIPHER_R_BUFFER_TOO_SMALL => CipherError::BufferTooSmall,
+ bssl_sys::CIPHER_R_CTRL_NOT_IMPLEMENTED => CipherError::CtrlNotImplemented,
+ bssl_sys::CIPHER_R_CTRL_OPERATION_NOT_IMPLEMENTED => {
CipherError::CtrlOperationNotImplemented
}
- bssl_ffi::CIPHER_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH => {
+ bssl_sys::CIPHER_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH => {
CipherError::DataNotMultipleOfBlockLength
}
- bssl_ffi::CIPHER_R_INITIALIZATION_ERROR => CipherError::InitializationError,
- bssl_ffi::CIPHER_R_INPUT_NOT_INITIALIZED => CipherError::InputNotInitialized,
- bssl_ffi::CIPHER_R_INVALID_AD_SIZE => CipherError::InvalidAdSize,
- bssl_ffi::CIPHER_R_INVALID_KEY_LENGTH => CipherError::InvalidKeyLength,
- bssl_ffi::CIPHER_R_INVALID_NONCE_SIZE => CipherError::InvalidNonceSize,
- bssl_ffi::CIPHER_R_INVALID_OPERATION => CipherError::InvalidOperation,
- bssl_ffi::CIPHER_R_IV_TOO_LARGE => CipherError::IvTooLarge,
- bssl_ffi::CIPHER_R_NO_CIPHER_SET => CipherError::NoCipherSet,
- bssl_ffi::CIPHER_R_OUTPUT_ALIASES_INPUT => CipherError::OutputAliasesInput,
- bssl_ffi::CIPHER_R_TAG_TOO_LARGE => CipherError::TagTooLarge,
- bssl_ffi::CIPHER_R_TOO_LARGE => CipherError::TooLarge,
- bssl_ffi::CIPHER_R_WRONG_FINAL_BLOCK_LENGTH => CipherError::WrongFinalBlockLength,
- bssl_ffi::CIPHER_R_NO_DIRECTION_SET => CipherError::NoDirectionSet,
- bssl_ffi::CIPHER_R_INVALID_NONCE => CipherError::InvalidNonce,
+ bssl_sys::CIPHER_R_INITIALIZATION_ERROR => CipherError::InitializationError,
+ bssl_sys::CIPHER_R_INPUT_NOT_INITIALIZED => CipherError::InputNotInitialized,
+ bssl_sys::CIPHER_R_INVALID_AD_SIZE => CipherError::InvalidAdSize,
+ bssl_sys::CIPHER_R_INVALID_KEY_LENGTH => CipherError::InvalidKeyLength,
+ bssl_sys::CIPHER_R_INVALID_NONCE_SIZE => CipherError::InvalidNonceSize,
+ bssl_sys::CIPHER_R_INVALID_OPERATION => CipherError::InvalidOperation,
+ bssl_sys::CIPHER_R_IV_TOO_LARGE => CipherError::IvTooLarge,
+ bssl_sys::CIPHER_R_NO_CIPHER_SET => CipherError::NoCipherSet,
+ bssl_sys::CIPHER_R_OUTPUT_ALIASES_INPUT => CipherError::OutputAliasesInput,
+ bssl_sys::CIPHER_R_TAG_TOO_LARGE => CipherError::TagTooLarge,
+ bssl_sys::CIPHER_R_TOO_LARGE => CipherError::TooLarge,
+ bssl_sys::CIPHER_R_WRONG_FINAL_BLOCK_LENGTH => CipherError::WrongFinalBlockLength,
+ bssl_sys::CIPHER_R_NO_DIRECTION_SET => CipherError::NoDirectionSet,
+ bssl_sys::CIPHER_R_INVALID_NONCE => CipherError::InvalidNonce,
_ => return None,
};
Some(error)
@@ -115,40 +115,40 @@
fn map_ec_reason_code(reason: i32) -> Option<EcError> {
let error = match reason {
- bssl_ffi::EC_R_BUFFER_TOO_SMALL => EcError::BufferTooSmall,
- bssl_ffi::EC_R_COORDINATES_OUT_OF_RANGE => EcError::CoordinatesOutOfRange,
- bssl_ffi::EC_R_D2I_ECPKPARAMETERS_FAILURE => EcError::D2IEcpkparametersFailure,
- bssl_ffi::EC_R_EC_GROUP_NEW_BY_NAME_FAILURE => EcError::EcGroupNewByNameFailure,
- bssl_ffi::EC_R_GROUP2PKPARAMETERS_FAILURE => EcError::Group2PkparametersFailure,
- bssl_ffi::EC_R_I2D_ECPKPARAMETERS_FAILURE => EcError::I2DEcpkparametersFailure,
- bssl_ffi::EC_R_INCOMPATIBLE_OBJECTS => EcError::IncompatibleObjects,
- bssl_ffi::EC_R_INVALID_COMPRESSED_POINT => EcError::InvalidCompressedPoint,
- bssl_ffi::EC_R_INVALID_COMPRESSION_BIT => EcError::InvalidCompressionBit,
- bssl_ffi::EC_R_INVALID_ENCODING => EcError::InvalidEncoding,
- bssl_ffi::EC_R_INVALID_FIELD => EcError::InvalidField,
- bssl_ffi::EC_R_INVALID_FORM => EcError::InvalidForm,
- bssl_ffi::EC_R_INVALID_GROUP_ORDER => EcError::InvalidGroupOrder,
- bssl_ffi::EC_R_INVALID_PRIVATE_KEY => EcError::InvalidPrivateKey,
- bssl_ffi::EC_R_MISSING_PARAMETERS => EcError::MissingParameters,
- bssl_ffi::EC_R_MISSING_PRIVATE_KEY => EcError::MissingPrivateKey,
- bssl_ffi::EC_R_NON_NAMED_CURVE => EcError::NonNamedCurve,
- bssl_ffi::EC_R_NOT_INITIALIZED => EcError::NotInitialized,
- bssl_ffi::EC_R_PKPARAMETERS2GROUP_FAILURE => EcError::Pkparameters2GroupFailure,
- bssl_ffi::EC_R_POINT_AT_INFINITY => EcError::PointAtInfinity,
- bssl_ffi::EC_R_POINT_IS_NOT_ON_CURVE => EcError::PointIsNotOnCurve,
- bssl_ffi::EC_R_SLOT_FULL => EcError::SlotFull,
- bssl_ffi::EC_R_UNDEFINED_GENERATOR => EcError::UndefinedGenerator,
- bssl_ffi::EC_R_UNKNOWN_GROUP => EcError::UnknownGroup,
- bssl_ffi::EC_R_UNKNOWN_ORDER => EcError::UnknownOrder,
- bssl_ffi::EC_R_WRONG_ORDER => EcError::WrongOrder,
- bssl_ffi::EC_R_BIGNUM_OUT_OF_RANGE => EcError::BignumOutOfRange,
- bssl_ffi::EC_R_WRONG_CURVE_PARAMETERS => EcError::WrongCurveParameters,
- bssl_ffi::EC_R_DECODE_ERROR => EcError::DecodeError,
- bssl_ffi::EC_R_ENCODE_ERROR => EcError::EncodeError,
- bssl_ffi::EC_R_GROUP_MISMATCH => EcError::GroupMismatch,
- bssl_ffi::EC_R_INVALID_COFACTOR => EcError::InvalidCofactor,
- bssl_ffi::EC_R_PUBLIC_KEY_VALIDATION_FAILED => EcError::PublicKeyValidationFailed,
- bssl_ffi::EC_R_INVALID_SCALAR => EcError::InvalidScalar,
+ bssl_sys::EC_R_BUFFER_TOO_SMALL => EcError::BufferTooSmall,
+ bssl_sys::EC_R_COORDINATES_OUT_OF_RANGE => EcError::CoordinatesOutOfRange,
+ bssl_sys::EC_R_D2I_ECPKPARAMETERS_FAILURE => EcError::D2IEcpkparametersFailure,
+ bssl_sys::EC_R_EC_GROUP_NEW_BY_NAME_FAILURE => EcError::EcGroupNewByNameFailure,
+ bssl_sys::EC_R_GROUP2PKPARAMETERS_FAILURE => EcError::Group2PkparametersFailure,
+ bssl_sys::EC_R_I2D_ECPKPARAMETERS_FAILURE => EcError::I2DEcpkparametersFailure,
+ bssl_sys::EC_R_INCOMPATIBLE_OBJECTS => EcError::IncompatibleObjects,
+ bssl_sys::EC_R_INVALID_COMPRESSED_POINT => EcError::InvalidCompressedPoint,
+ bssl_sys::EC_R_INVALID_COMPRESSION_BIT => EcError::InvalidCompressionBit,
+ bssl_sys::EC_R_INVALID_ENCODING => EcError::InvalidEncoding,
+ bssl_sys::EC_R_INVALID_FIELD => EcError::InvalidField,
+ bssl_sys::EC_R_INVALID_FORM => EcError::InvalidForm,
+ bssl_sys::EC_R_INVALID_GROUP_ORDER => EcError::InvalidGroupOrder,
+ bssl_sys::EC_R_INVALID_PRIVATE_KEY => EcError::InvalidPrivateKey,
+ bssl_sys::EC_R_MISSING_PARAMETERS => EcError::MissingParameters,
+ bssl_sys::EC_R_MISSING_PRIVATE_KEY => EcError::MissingPrivateKey,
+ bssl_sys::EC_R_NON_NAMED_CURVE => EcError::NonNamedCurve,
+ bssl_sys::EC_R_NOT_INITIALIZED => EcError::NotInitialized,
+ bssl_sys::EC_R_PKPARAMETERS2GROUP_FAILURE => EcError::Pkparameters2GroupFailure,
+ bssl_sys::EC_R_POINT_AT_INFINITY => EcError::PointAtInfinity,
+ bssl_sys::EC_R_POINT_IS_NOT_ON_CURVE => EcError::PointIsNotOnCurve,
+ bssl_sys::EC_R_SLOT_FULL => EcError::SlotFull,
+ bssl_sys::EC_R_UNDEFINED_GENERATOR => EcError::UndefinedGenerator,
+ bssl_sys::EC_R_UNKNOWN_GROUP => EcError::UnknownGroup,
+ bssl_sys::EC_R_UNKNOWN_ORDER => EcError::UnknownOrder,
+ bssl_sys::EC_R_WRONG_ORDER => EcError::WrongOrder,
+ bssl_sys::EC_R_BIGNUM_OUT_OF_RANGE => EcError::BignumOutOfRange,
+ bssl_sys::EC_R_WRONG_CURVE_PARAMETERS => EcError::WrongCurveParameters,
+ bssl_sys::EC_R_DECODE_ERROR => EcError::DecodeError,
+ bssl_sys::EC_R_ENCODE_ERROR => EcError::EncodeError,
+ bssl_sys::EC_R_GROUP_MISMATCH => EcError::GroupMismatch,
+ bssl_sys::EC_R_INVALID_COFACTOR => EcError::InvalidCofactor,
+ bssl_sys::EC_R_PUBLIC_KEY_VALIDATION_FAILED => EcError::PublicKeyValidationFailed,
+ bssl_sys::EC_R_INVALID_SCALAR => EcError::InvalidScalar,
_ => return None,
};
Some(error)
@@ -156,15 +156,15 @@
fn map_ecdsa_reason_code(reason: i32) -> Option<EcdsaError> {
let error = match reason {
- bssl_ffi::ECDSA_R_BAD_SIGNATURE => EcdsaError::BadSignature,
- bssl_ffi::ECDSA_R_MISSING_PARAMETERS => EcdsaError::MissingParameters,
- bssl_ffi::ECDSA_R_NEED_NEW_SETUP_VALUES => EcdsaError::NeedNewSetupValues,
- bssl_ffi::ECDSA_R_NOT_IMPLEMENTED => EcdsaError::NotImplemented,
- bssl_ffi::ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED => {
+ bssl_sys::ECDSA_R_BAD_SIGNATURE => EcdsaError::BadSignature,
+ bssl_sys::ECDSA_R_MISSING_PARAMETERS => EcdsaError::MissingParameters,
+ bssl_sys::ECDSA_R_NEED_NEW_SETUP_VALUES => EcdsaError::NeedNewSetupValues,
+ bssl_sys::ECDSA_R_NOT_IMPLEMENTED => EcdsaError::NotImplemented,
+ bssl_sys::ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED => {
EcdsaError::RandomNumberGenerationFailed
}
- bssl_ffi::ECDSA_R_ENCODE_ERROR => EcdsaError::EncodeError,
- bssl_ffi::ECDSA_R_TOO_MANY_ITERATIONS => EcdsaError::TooManyIterations,
+ bssl_sys::ECDSA_R_ENCODE_ERROR => EcdsaError::EncodeError,
+ bssl_sys::ECDSA_R_TOO_MANY_ITERATIONS => EcdsaError::TooManyIterations,
_ => return None,
};
Some(error)