diff options
| author | Adam Langley <agl@google.com> | 2014-09-19 21:49:56 +0400 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-09-20 04:10:03 +0400 |
| commit | 5127db3b4d59066126a1f8c8f7fdf4841a8c58b9 (patch) | |
| tree | 7a31618dc3251d389cba75d20b71bafc52b3d307 /tool/pkcs12.cc | |
| parent | 588d2528d1e9e7d1c076563e47ecbfabc6e49cb1 (diff) | |
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/pkcs12.cc')
| -rw-r--r-- | tool/pkcs12.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/pkcs12.cc b/tool/pkcs12.cc index 10ff630f..d35ba0bc 100644 --- a/tool/pkcs12.cc +++ b/tool/pkcs12.cc @@ -40,7 +40,7 @@ static const struct argument kArguments[] = { }, }; -bool PKCS12(const std::vector<std::string> &args) { +bool DoPKCS12(const std::vector<std::string> &args) { std::map<std::string, std::string> args_map; if (!ParseKeyValueArguments(&args_map, args, kArguments) || |