diff options
| author | Adam Langley <agl@google.com> | 2014-09-19 10:49:56 -0700 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-09-20 00:10:03 +0000 |
| commit | 5127db3b4d59066126a1f8c8f7fdf4841a8c58b9 (patch) | |
| tree | 7a31618dc3251d389cba75d20b71bafc52b3d307 /tool/tool.cc | |
| parent | 588d2528d1e9e7d1c076563e47ecbfabc6e49cb1 (diff) | |
| download | boringssl-5127db3b4d59066126a1f8c8f7fdf4841a8c58b9.zip boringssl-5127db3b4d59066126a1f8c8f7fdf4841a8c58b9.tar.gz boringssl-5127db3b4d59066126a1f8c8f7fdf4841a8c58b9.tar.bz2 | |
Provide compatibility functions for PKCS#12 parsing.
In order to minimise the upstream diffs needed for bits of Android to
build with BoringSSL, this change implements the old style PKCS#12
functions as wrappers around the modern parser.
The function to read all the contents of a BIO could almost be a utility
function but I'll wait until there are two uses for it first.
The important change from the original functions is that these will
always read the complete buffer/BIO/FILE passed in. Based on a survey of
uses of d2i_PKCS12 that I found, this appears to be universally what
callers want anyway.
Change-Id: I3f5b84e710b161d975f91f4d16c83d44371368d1
Reviewed-on: https://boringssl-review.googlesource.com/1791
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'tool/tool.cc')
| -rw-r--r-- | tool/tool.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tool/tool.cc b/tool/tool.cc index bf79a47..a0866d7 100644 --- a/tool/tool.cc +++ b/tool/tool.cc @@ -20,7 +20,7 @@ bool Client(const std::vector<std::string> &args); -bool PKCS12(const std::vector<std::string> &args); +bool DoPKCS12(const std::vector<std::string> &args); bool Speed(const std::vector<std::string> &args); static void usage(const char *name) { @@ -45,7 +45,7 @@ int main(int argc, char **argv) { } else if (tool == "s_client" || tool == "client") { return !Client(args); } else if (tool == "pkcs12") { - return !PKCS12(args); + return !DoPKCS12(args); } else { usage(argv[0]); return 1; |