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/tool/server.cc | |
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/tool/server.cc')
-rw-r--r-- | src/tool/server.cc | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/src/tool/server.cc b/src/tool/server.cc index abc71cf..164d6a5 100644 --- a/src/tool/server.cc +++ b/src/tool/server.cc @@ -35,54 +35,10 @@ static const struct argument kArguments[] = { "Private-key file to use (default is server.pem)", }, { - "-ocsp-response", kOptionalArgument, - "OCSP response file to send", - }, - { "", kOptionalArgument, "", }, }; -static bool LoadOCSPResponse(SSL_CTX *ctx, const char *filename) { - void *data = NULL; - bool ret = false; - size_t bytes_read; - long length; - - FILE *f = fopen(filename, "rb"); - - if (f == NULL || - fseek(f, 0, SEEK_END) != 0) { - goto out; - } - - length = ftell(f); - if (length < 0) { - goto out; - } - - data = malloc(length); - if (data == NULL) { - goto out; - } - rewind(f); - - bytes_read = fread(data, 1, length, f); - if (ferror(f) != 0 || - bytes_read != (size_t)length || - !SSL_CTX_set_ocsp_response(ctx, (uint8_t*)data, bytes_read)) { - goto out; - } - - ret = true; -out: - if (f != NULL) { - fclose(f); - } - free(data); - return ret; -} - bool Server(const std::vector<std::string> &args) { if (!InitSocketLibrary()) { return false; @@ -118,12 +74,6 @@ bool Server(const std::vector<std::string> &args) { return false; } - if (args_map.count("-ocsp-response") != 0 && - !LoadOCSPResponse(ctx, args_map["-ocsp-response"].c_str())) { - fprintf(stderr, "Failed to load OCSP response: %s\n", args_map["-ocsp-response"].c_str()); - return false; - } - int sock = -1; if (!Accept(&sock, args_map["-accept"])) { return false; |