diff options
author | Kenny Root <kroot@google.com> | 2015-11-05 19:56:07 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-11-05 19:56:07 +0000 |
commit | 80043196325becce95d8fae59b7a8eb498839f40 (patch) | |
tree | b4e43f0c1d2161af97e2b7e030644ca1d54a839c /src/include/openssl/ecdsa.h | |
parent | 849819d0477d239d23321236bd2324563606d64d (diff) | |
parent | 307714c70648c5d1caa23193f59a78f2ff72d2ea (diff) | |
download | external_boringssl-80043196325becce95d8fae59b7a8eb498839f40.zip external_boringssl-80043196325becce95d8fae59b7a8eb498839f40.tar.gz external_boringssl-80043196325becce95d8fae59b7a8eb498839f40.tar.bz2 |
Merge "external/boringssl: sync with upstream."
am: 307714c706
* commit '307714c70648c5d1caa23193f59a78f2ff72d2ea':
external/boringssl: sync with upstream.
Diffstat (limited to 'src/include/openssl/ecdsa.h')
-rw-r--r-- | src/include/openssl/ecdsa.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/include/openssl/ecdsa.h b/src/include/openssl/ecdsa.h index 84702c3..b7f15c4 100644 --- a/src/include/openssl/ecdsa.h +++ b/src/include/openssl/ecdsa.h @@ -161,7 +161,7 @@ OPENSSL_EXPORT ECDSA_SIG *ECDSA_SIG_from_bytes(const uint8_t *in, * the result to |cbb|. It returns one on success and zero on error. */ OPENSSL_EXPORT int ECDSA_SIG_marshal(CBB *cbb, const ECDSA_SIG *sig); -/* ECDSA_SIG_to_asn1 marshals |sig| as a DER-encoded ECDSA-Sig-Value and, on +/* ECDSA_SIG_to_bytes marshals |sig| as a DER-encoded ECDSA-Sig-Value and, on * success, sets |*out_bytes| to a newly allocated buffer containing the result * and returns one. Otherwise, it returns zero. The result should be freed with * |OPENSSL_free|. */ |