diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-09-15 19:55:10 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-09-15 19:55:10 +1000 |
| commit | 7bb82f92d94375e7673fe02cb8186595b2c539f2 (patch) | |
| tree | 9ad368205615d359374430b91906e4c704135fae /include | |
| parent | dd11c5f0fa809063b152cd2851c4c1e56fbd20c8 (diff) | |
Add fips module integrity check
Add environment variable for setting CONF .include path
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9769)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/core_numbers.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/openssl/core_numbers.h b/include/openssl/core_numbers.h index 002582012e..d3189a3c18 100644 --- a/include/openssl/core_numbers.h +++ b/include/openssl/core_numbers.h @@ -123,13 +123,13 @@ OSSL_CORE_MAKE_FUNC(void, /* Bio functions provided by the core */ #define OSSL_FUNC_BIO_NEW_FILE 22 #define OSSL_FUNC_BIO_NEW_MEMBUF 23 -#define OSSL_FUNC_BIO_READ 24 +#define OSSL_FUNC_BIO_READ_EX 24 #define OSSL_FUNC_BIO_FREE 25 OSSL_CORE_MAKE_FUNC(BIO *, BIO_new_file, (const char *filename, const char *mode)) OSSL_CORE_MAKE_FUNC(BIO *, BIO_new_membuf, (const void *buf, int len)) -OSSL_CORE_MAKE_FUNC(int, BIO_read, (BIO *bio, void *data, size_t data_len, - size_t *bytes_read)) +OSSL_CORE_MAKE_FUNC(int, BIO_read_ex, (BIO *bio, void *data, size_t data_len, + size_t *bytes_read)) OSSL_CORE_MAKE_FUNC(int, BIO_free, (BIO *bio)) /* Functions provided by the provider to the Core, reserved numbers 1024-1535 */ |