diff options
author | David Benjamin <davidben@chromium.org> | 2016-10-18 06:36:38 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-10-18 06:36:38 +0000 |
commit | 5de55ee07633015693ca7faa33af9c184feb8d98 (patch) | |
tree | b5d46690440a5a3b3718e43fc0c64b7cf450e548 | |
parent | 309ccff6ae12972b1cd9ef936cfd848b4ae123b5 (diff) | |
parent | 1220bf946d0e44d24cef3f4a6c9f29c69ed6b463 (diff) | |
download | boringssl-5de55ee07633015693ca7faa33af9c184feb8d98.tar.gz |
DO NOT MERGE: Add a few more no-op stubs for cURL compatibility. am: 4177c9b481android-cts_7.1_r1android-cts-7.1_r3android-cts-7.1_r2android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r6android-7.1.1_r4android-7.1.1_r3android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1nougat-mr1.2-releasenougat-mr1-dev
am: 1220bf946d
Change-Id: I9add2c54dda8093efd7b3df79aef436bcaf2ddd7
-rw-r--r-- | src/crypto/conf/conf.c | 7 | ||||
-rw-r--r-- | src/crypto/crypto.c | 2 | ||||
-rw-r--r-- | src/crypto/rand/rand.c | 2 | ||||
-rw-r--r-- | src/include/openssl/conf.h | 22 | ||||
-rw-r--r-- | src/include/openssl/crypto.h | 3 | ||||
-rw-r--r-- | src/include/openssl/rand.h | 3 |
6 files changed, 39 insertions, 0 deletions
diff --git a/src/crypto/conf/conf.c b/src/crypto/conf/conf.c index e098a2ce..7512dd08 100644 --- a/src/crypto/conf/conf.c +++ b/src/crypto/conf/conf.c @@ -776,3 +776,10 @@ int CONF_parse_list(const char *list, char sep, int remove_whitespace, lstart = p + 1; } } + +int CONF_modules_load_file(CONF_MUST_BE_NULL *filename, const char *appname, + unsigned long flags) { + return 1; +} + +void CONF_modules_free(void) {} diff --git a/src/crypto/crypto.c b/src/crypto/crypto.c index ace1c82e..da8807db 100644 --- a/src/crypto/crypto.c +++ b/src/crypto/crypto.c @@ -138,3 +138,5 @@ int CRYPTO_malloc_init(void) { } void ENGINE_load_builtin_engines(void) {} + +void OPENSSL_load_builtin_modules(void) {} diff --git a/src/crypto/rand/rand.c b/src/crypto/rand/rand.c index 892b4ba8..82087ba2 100644 --- a/src/crypto/rand/rand.c +++ b/src/crypto/rand/rand.c @@ -209,6 +209,8 @@ int RAND_load_file(const char *path, long num) { } } +const char *RAND_file_name(char *buf, size_t num) { return NULL; } + void RAND_add(const void *buf, int num, double entropy) {} int RAND_egd(const char *path) { diff --git a/src/include/openssl/conf.h b/src/include/openssl/conf.h index a2741a8a..0d2b61d8 100644 --- a/src/include/openssl/conf.h +++ b/src/include/openssl/conf.h @@ -131,6 +131,28 @@ int CONF_parse_list(const char *list, char sep, int remove_whitespace, int (*list_cb)(const char *elem, int len, void *usr), void *arg); + +/* Deprecated functions */ + +/* These defines do nothing but are provided to make old code easier to + * compile. */ +#define CONF_MFLAGS_DEFAULT_SECTION 0 +#define CONF_MFLAGS_IGNORE_MISSING_FILE 0 + +typedef struct conf_must_be_null_st CONF_MUST_BE_NULL; + +/* CONF_modules_load_file returns one. |filename| was originally a string, with + * NULL indicating the default. BoringSSL does not support configuration files, + * so this stub emulates the "default" no-op file but intentionally breaks + * compilation of consumers actively attempting to use this subsystem. */ +OPENSSL_EXPORT int CONF_modules_load_file(CONF_MUST_BE_NULL *filename, + const char *appname, + unsigned long flags); + +/* CONF_modules_free does nothing. */ +OPENSSL_EXPORT void CONF_modules_free(void); + + #if defined(__cplusplus) } /* extern C */ #endif diff --git a/src/include/openssl/crypto.h b/src/include/openssl/crypto.h index b4218847..193c8c35 100644 --- a/src/include/openssl/crypto.h +++ b/src/include/openssl/crypto.h @@ -60,6 +60,9 @@ OPENSSL_EXPORT int CRYPTO_malloc_init(void); /* ENGINE_load_builtin_engines does nothing. */ OPENSSL_EXPORT void ENGINE_load_builtin_engines(void); +/* OPENSSL_load_builtin_modules does nothing. */ +OPENSSL_EXPORT void OPENSSL_load_builtin_modules(void); + #if defined(__cplusplus) } /* extern C */ diff --git a/src/include/openssl/rand.h b/src/include/openssl/rand.h index 3a8e357c..2c9c9697 100644 --- a/src/include/openssl/rand.h +++ b/src/include/openssl/rand.h @@ -75,6 +75,9 @@ OPENSSL_EXPORT void RAND_seed(const void *buf, int num); /* RAND_load_file returns a nonnegative number. */ OPENSSL_EXPORT int RAND_load_file(const char *path, long num); +/* RAND_file_name returns NULL. */ +OPENSSL_EXPORT const char *RAND_file_name(char *buf, size_t num); + /* RAND_add does nothing. */ OPENSSL_EXPORT void RAND_add(const void *buf, int num, double entropy); |