diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 00:37:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 00:37:00 +0000 |
| commit | 00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872 (patch) | |
| tree | dc62c249d595198e0d99e43890019d21e901fbec /src/include/openssl/conf.h | |
| parent | 3781a60670f92c3c6fca860cb4589495cefa2e56 (diff) | |
| parent | a04d78d392463df4e69a64360c952ffa5abd22f7 (diff) | |
| download | external_boringssl-00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872.zip external_boringssl-00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872.tar.gz external_boringssl-00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872.tar.bz2 | |
am a04d78d3: Revert "external/boringssl: sync with upstream."
* commit 'a04d78d392463df4e69a64360c952ffa5abd22f7':
Revert "external/boringssl: sync with upstream."
Diffstat (limited to 'src/include/openssl/conf.h')
| -rw-r--r-- | src/include/openssl/conf.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/include/openssl/conf.h b/src/include/openssl/conf.h index a2741a8..84fc94f 100644 --- a/src/include/openssl/conf.h +++ b/src/include/openssl/conf.h @@ -135,6 +135,10 @@ int CONF_parse_list(const char *list, char sep, int remove_whitespace, } /* extern C */ #endif +#define CONF_F_CONF_parse_list 100 +#define CONF_F_NCONF_load 101 +#define CONF_F_def_load_bio 102 +#define CONF_F_str_copy 103 #define CONF_R_LIST_CANNOT_BE_NULL 100 #define CONF_R_MISSING_CLOSE_SQUARE_BRACKET 101 #define CONF_R_MISSING_EQUAL_SIGN 102 |