external/boringssl: bump revision.

This change bumps the BoringSSL revision to the current tip-of-tree.

Change-Id: I91d5bf467e16e8d86cb19a4de873985f524e5faa

6 files changed, 384 insertions, 402 deletions

diff --git a/src/crypto/ecdsa/CMakeLists.txt b/src/crypto/ecdsa/CMakeLists.txt
index 4bddd27..c8645d1 100644
--- a/src/crypto/ecdsa/CMakeLists.txt
+++ b/src/crypto/ecdsa/CMakeLists.txt
@@ -7,14 +7,13 @@ add_library(
 
   ecdsa.c
   ecdsa_asn1.c
-  ecdsa_error.c
 )
 
 
 add_executable(
   ecdsa_test
 
-  ecdsa_test.c
+  ecdsa_test.cc
 )
 
 target_link_libraries(ecdsa_test crypto)
diff --git a/src/crypto/ecdsa/ecdsa.c b/src/crypto/ecdsa/ecdsa.c
index d389799..b71799e 100644
--- a/src/crypto/ecdsa/ecdsa.c
+++ b/src/crypto/ecdsa/ecdsa.c
@@ -57,7 +57,6 @@
 #include <openssl/bn.h>
 #include <openssl/err.h>
 #include <openssl/mem.h>
-#include <openssl/thread.h>
 
 #include "../ec/internal.h"
 
@@ -98,12 +97,8 @@ int ECDSA_verify(int type, const uint8_t *digest, size_t digest_len,
   ret = ECDSA_do_verify(digest, digest_len, s, eckey);
 
 err:
-  if (der != NULL) {
-    OPENSSL_free(der);
-  }
-  if (s != NULL) {
-    ECDSA_SIG_free(s);
-  }
+  OPENSSL_free(der);
+  ECDSA_SIG_free(s);
   return ret;
 }
 
@@ -232,9 +227,7 @@ int ECDSA_do_verify(const uint8_t *digest, size_t digest_len,
 err:
   BN_CTX_end(ctx);
   BN_CTX_free(ctx);
-  if (point) {
-    EC_POINT_free(point);
-  }
+  EC_POINT_free(point);
   return ret;
 }
 
@@ -334,12 +327,8 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
     goto err;
   }
   /* clear old values if necessary */
-  if (*rp != NULL) {
-    BN_clear_free(*rp);
-  }
-  if (*kinvp != NULL) {
-    BN_clear_free(*kinvp);
-  }
+  BN_clear_free(*rp);
+  BN_clear_free(*kinvp);
 
   /* save the pre-computed values  */
   *rp = r;
@@ -348,21 +337,15 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
 
 err:
   if (!ret) {
-    if (k != NULL) {
-      BN_clear_free(k);
-    }
-    if (r != NULL) {
-      BN_clear_free(r);
-    }
+    BN_clear_free(k);
+    BN_clear_free(r);
   }
-  if (ctx_in == NULL)
+  if (ctx_in == NULL) {
     BN_CTX_free(ctx);
-  if (order != NULL)
-    BN_free(order);
-  if (tmp_point != NULL)
-    EC_POINT_free(tmp_point);
-  if (X)
-    BN_clear_free(X);
+  }
+  BN_free(order);
+  EC_POINT_free(tmp_point);
+  BN_clear_free(X);
   return ret;
 }
 
@@ -461,16 +444,11 @@ err:
     ECDSA_SIG_free(ret);
     ret = NULL;
   }
-  if (ctx)
-    BN_CTX_free(ctx);
-  if (m)
-    BN_clear_free(m);
-  if (tmp)
-    BN_clear_free(tmp);
-  if (order)
-    BN_free(order);
-  if (kinv)
-    BN_clear_free(kinv);
+  BN_CTX_free(ctx);
+  BN_clear_free(m);
+  BN_clear_free(tmp);
+  BN_free(order);
+  BN_clear_free(kinv);
   return ret;
 }
 
diff --git a/src/crypto/ecdsa/ecdsa_asn1.c b/src/crypto/ecdsa/ecdsa_asn1.c
index b3c6a87..f557ca7 100644
--- a/src/crypto/ecdsa/ecdsa_asn1.c
+++ b/src/crypto/ecdsa/ecdsa_asn1.c
@@ -55,6 +55,7 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/ec_key.h>
+#include <openssl/mem.h>
 
 #include "../ec/internal.h"
 
@@ -67,7 +68,7 @@ ASN1_SEQUENCE(ECDSA_SIG) = {
     ASN1_SIMPLE(ECDSA_SIG, s, CBIGNUM),
 } ASN1_SEQUENCE_END(ECDSA_SIG);
 
-IMPLEMENT_ASN1_FUNCTIONS_const(ECDSA_SIG);
+IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(ECDSA_SIG, ECDSA_SIG, ECDSA_SIG);
 
 size_t ECDSA_size(const EC_KEY *key) {
   size_t ret, i, group_order_size;
@@ -114,3 +115,27 @@ size_t ECDSA_size(const EC_KEY *key) {
   BN_clear_free(order);
   return ret;
 }
+
+ECDSA_SIG *ECDSA_SIG_new(void) {
+  ECDSA_SIG *sig = OPENSSL_malloc(sizeof(ECDSA_SIG));
+  if (sig == NULL) {
+    return NULL;
+  }
+  sig->r = BN_new();
+  sig->s = BN_new();
+  if (sig->r == NULL || sig->s == NULL) {
+    ECDSA_SIG_free(sig);
+    return NULL;
+  }
+  return sig;
+}
+
+void ECDSA_SIG_free(ECDSA_SIG *sig) {
+  if (sig == NULL) {
+    return;
+  }
+
+  BN_free(sig->r);
+  BN_free(sig->s);
+  OPENSSL_free(sig);
+}
diff --git a/src/crypto/ecdsa/ecdsa_error.c b/src/crypto/ecdsa/ecdsa_error.c
deleted file mode 100644
index cbd69ce..0000000
--- a/src/crypto/ecdsa/ecdsa_error.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (c) 2014, Google Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
-
-#include <openssl/err.h>
-
-#include <openssl/ecdsa.h>
-
-const ERR_STRING_DATA ECDSA_error_string_data[] = {
-  {ERR_PACK(ERR_LIB_ECDSA, ECDSA_F_ECDSA_do_sign_ex, 0), "ECDSA_do_sign_ex"},
-  {ERR_PACK(ERR_LIB_ECDSA, ECDSA_F_ECDSA_do_verify, 0), "ECDSA_do_verify"},
-  {ERR_PACK(ERR_LIB_ECDSA, ECDSA_F_ECDSA_sign_ex, 0), "ECDSA_sign_ex"},
-  {ERR_PACK(ERR_LIB_ECDSA, ECDSA_F_ECDSA_sign_setup, 0), "ECDSA_sign_setup"},
-  {ERR_PACK(ERR_LIB_ECDSA, ECDSA_F_digest_to_bn, 0), "digest_to_bn"},
-  {ERR_PACK(ERR_LIB_ECDSA, ECDSA_F_ecdsa_sign_setup, 0), "ecdsa_sign_setup"},
-  {ERR_PACK(ERR_LIB_ECDSA, 0, ECDSA_R_BAD_SIGNATURE), "BAD_SIGNATURE"},
-  {ERR_PACK(ERR_LIB_ECDSA, 0, ECDSA_R_MISSING_PARAMETERS), "MISSING_PARAMETERS"},
-  {ERR_PACK(ERR_LIB_ECDSA, 0, ECDSA_R_NEED_NEW_SETUP_VALUES), "NEED_NEW_SETUP_VALUES"},
-  {ERR_PACK(ERR_LIB_ECDSA, 0, ECDSA_R_NOT_IMPLEMENTED), "NOT_IMPLEMENTED"},
-  {ERR_PACK(ERR_LIB_ECDSA, 0, ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED), "RANDOM_NUMBER_GENERATION_FAILED"},
-  {0, NULL},
-};
diff --git a/src/crypto/ecdsa/ecdsa_test.c b/src/crypto/ecdsa/ecdsa_test.c
deleted file mode 100644
index d48f9c3..0000000
--- a/src/crypto/ecdsa/ecdsa_test.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com). */
-
-#include <openssl/ecdsa.h>
-
-#include <openssl/bio.h>
-#include <openssl/bn.h>
-#include <openssl/crypto.h>
-#include <openssl/ec.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/obj.h>
-#include <openssl/rand.h>
-
-
-int test_builtin(BIO *out) {
-  size_t n = 0;
-  EC_KEY *eckey = NULL, *wrong_eckey = NULL;
-  EC_GROUP *group;
-  BIGNUM *order = NULL;
-  ECDSA_SIG *ecdsa_sig = NULL;
-  unsigned char digest[20], wrong_digest[20];
-  unsigned char *signature = NULL;
-  const unsigned char *sig_ptr;
-  unsigned char *sig_ptr2;
-  unsigned char *raw_buf = NULL;
-  unsigned int sig_len, r_len, s_len, bn_len, buf_len;
-  int nid, ret = 0;
-
-  /* fill digest values with some random data */
-  if (!RAND_bytes(digest, 20) || !RAND_bytes(wrong_digest, 20)) {
-    BIO_printf(out, "ERROR: unable to get random data\n");
-    goto builtin_err;
-  }
-
-  order = BN_new();
-  if (order == NULL) {
-    goto builtin_err;
-  }
-
-  /* create and verify a ecdsa signature with every availble curve
-   * (with ) */
-  BIO_printf(out,
-             "\ntesting ECDSA_sign() and ECDSA_verify() "
-             "with some internal curves:\n");
-
-  static const int kCurveNIDs[] = {NID_secp224r1, NID_X9_62_prime256v1,
-                                   NID_secp384r1, NID_secp521r1, NID_undef};
-
-  /* now create and verify a signature for every curve */
-  for (n = 0; kCurveNIDs[n] != NID_undef; n++) {
-    unsigned char dirt, offset;
-
-    nid = kCurveNIDs[n];
-    /* create new ecdsa key (== EC_KEY) */
-    eckey = EC_KEY_new();
-    if (eckey == NULL) {
-      goto builtin_err;
-    }
-    group = EC_GROUP_new_by_curve_name(nid);
-    if (group == NULL) {
-      goto builtin_err;
-    }
-    if (!EC_KEY_set_group(eckey, group)) {
-      goto builtin_err;
-    }
-    EC_GROUP_free(group);
-    if (!EC_GROUP_get_order(EC_KEY_get0_group(eckey), order, NULL)) {
-      goto builtin_err;
-    }
-    if (BN_num_bits(order) < 160) {
-      /* Too small to test. */
-      EC_KEY_free(eckey);
-      eckey = NULL;
-      continue;
-    }
-
-    BIO_printf(out, "%s: ", OBJ_nid2sn(nid));
-    /* create key */
-    if (!EC_KEY_generate_key(eckey)) {
-      BIO_printf(out, " failed\n");
-      goto builtin_err;
-    }
-    /* create second key */
-    wrong_eckey = EC_KEY_new();
-    if (wrong_eckey == NULL) {
-      goto builtin_err;
-    }
-    group = EC_GROUP_new_by_curve_name(nid);
-    if (group == NULL) {
-      goto builtin_err;
-    }
-    if (EC_KEY_set_group(wrong_eckey, group) == 0) {
-      goto builtin_err;
-    }
-    EC_GROUP_free(group);
-    if (!EC_KEY_generate_key(wrong_eckey)) {
-      BIO_printf(out, " failed\n");
-      goto builtin_err;
-    }
-
-    BIO_printf(out, ".");
-    (void)BIO_flush(out);
-    /* check key */
-    if (!EC_KEY_check_key(eckey)) {
-      BIO_printf(out, " failed\n");
-      goto builtin_err;
-    }
-    BIO_printf(out, ".");
-    (void)BIO_flush(out);
-    /* create signature */
-    sig_len = ECDSA_size(eckey);
-    signature = OPENSSL_malloc(sig_len);
-    if (signature == NULL) {
-      goto builtin_err;
-    }
-    if (!ECDSA_sign(0, digest, 20, signature, &sig_len, eckey)) {
-      BIO_printf(out, " failed\n");
-      goto builtin_err;
-    }
-    BIO_printf(out, ".");
-    (void)BIO_flush(out);
-    /* verify signature */
-    if (ECDSA_verify(0, digest, 20, signature, sig_len, eckey) != 1) {
-      BIO_printf(out, " failed\n");
-      goto builtin_err;
-    }
-    BIO_printf(out, ".");
-    (void)BIO_flush(out);
-    /* verify signature with the wrong key */
-    if (ECDSA_verify(0, digest, 20, signature, sig_len, wrong_eckey) == 1) {
-      BIO_printf(out, " failed\n");
-      goto builtin_err;
-    }
-    BIO_printf(out, ".");
-    (void)BIO_flush(out);
-    /* wrong digest */
-    if (ECDSA_verify(0, wrong_digest, 20, signature, sig_len, eckey) == 1) {
-      BIO_printf(out, " failed\n");
-      goto builtin_err;
-    }
-    BIO_printf(out, ".");
-    (void)BIO_flush(out);
-    /* wrong length */
-    if (ECDSA_verify(0, digest, 20, signature, sig_len - 1, eckey) == 1) {
-      BIO_printf(out, " failed\n");
-      goto builtin_err;
-    }
-    BIO_printf(out, ".");
-    (void)BIO_flush(out);
-
-    /* Modify a single byte of the signature: to ensure we don't
-     * garble the ASN1 structure, we read the raw signature and
-     * modify a byte in one of the bignums directly. */
-    sig_ptr = signature;
-    ecdsa_sig = d2i_ECDSA_SIG(NULL, &sig_ptr, sig_len);
-    if (ecdsa_sig == NULL) {
-      BIO_printf(out, " failed\n");
-      goto builtin_err;
-    }
-
-    /* Store the two BIGNUMs in raw_buf. */
-    r_len = BN_num_bytes(ecdsa_sig->r);
-    s_len = BN_num_bytes(ecdsa_sig->s);
-    bn_len = BN_num_bytes(order);
-    if (r_len > bn_len || s_len > bn_len) {
-      BIO_printf(out, " failed\n");
-      goto builtin_err;
-    }
-    buf_len = 2 * bn_len;
-    raw_buf = OPENSSL_malloc(2 * bn_len);
-    if (raw_buf == NULL) {
-      goto builtin_err;
-    }
-    /* Pad the bignums with leading zeroes. */
-    if (!BN_bn2bin_padded(raw_buf, bn_len, ecdsa_sig->r) ||
-        !BN_bn2bin_padded(raw_buf + bn_len, bn_len, ecdsa_sig->s)) {
-      goto builtin_err;
-    }
-
-    /* Modify a single byte in the buffer. */
-    offset = raw_buf[10] % buf_len;
-    dirt = raw_buf[11] ? raw_buf[11] : 1;
-    raw_buf[offset] ^= dirt;
-    /* Now read the BIGNUMs back in from raw_buf. */
-    if (BN_bin2bn(raw_buf, bn_len, ecdsa_sig->r) == NULL ||
-        BN_bin2bn(raw_buf + bn_len, bn_len, ecdsa_sig->s) == NULL) {
-      goto builtin_err;
-    }
-
-    sig_ptr2 = signature;
-    sig_len = i2d_ECDSA_SIG(ecdsa_sig, &sig_ptr2);
-    if (ECDSA_verify(0, digest, 20, signature, sig_len, eckey) == 1) {
-      BIO_printf(out, " failed\n");
-      goto builtin_err;
-    }
-    /* Sanity check: undo the modification and verify signature. */
-    raw_buf[offset] ^= dirt;
-    if (BN_bin2bn(raw_buf, bn_len, ecdsa_sig->r) == NULL ||
-        BN_bin2bn(raw_buf + bn_len, bn_len, ecdsa_sig->s) == NULL) {
-      goto builtin_err;
-    }
-
-    sig_ptr2 = signature;
-    sig_len = i2d_ECDSA_SIG(ecdsa_sig, &sig_ptr2);
-    if (ECDSA_verify(0, digest, 20, signature, sig_len, eckey) != 1) {
-      BIO_printf(out, " failed\n");
-      goto builtin_err;
-    }
-    BIO_printf(out, ".");
-    (void)BIO_flush(out);
-
-    BIO_printf(out, " ok\n");
-    /* cleanup */
-    /* clean bogus errors */
-    ERR_clear_error();
-    OPENSSL_free(signature);
-    signature = NULL;
-    EC_KEY_free(eckey);
-    eckey = NULL;
-    EC_KEY_free(wrong_eckey);
-    wrong_eckey = NULL;
-    ECDSA_SIG_free(ecdsa_sig);
-    ecdsa_sig = NULL;
-    OPENSSL_free(raw_buf);
-    raw_buf = NULL;
-  }
-
-  ret = 1;
-builtin_err:
-  if (eckey) {
-    EC_KEY_free(eckey);
-  }
-  if (order) {
-    BN_free(order);
-  }
-  if (wrong_eckey) {
-    EC_KEY_free(wrong_eckey);
-  }
-  if (ecdsa_sig) {
-    ECDSA_SIG_free(ecdsa_sig);
-  }
-  if (signature) {
-    OPENSSL_free(signature);
-  }
-  if (raw_buf) {
-    OPENSSL_free(raw_buf);
-  }
-
-  return ret;
-}
-
-int main(void) {
-  int ret = 1;
-  BIO *out;
-
-  CRYPTO_library_init();
-  ERR_load_crypto_strings();
-
-  out = BIO_new_fp(stdout, BIO_NOCLOSE);
-
-  if (!test_builtin(out))
-    goto err;
-
-  ret = 0;
-
-err:
-  if (ret)
-    BIO_printf(out, "\nECDSA test failed\n");
-  else
-    BIO_printf(out, "\nPASS\n");
-  if (ret)
-    BIO_print_errors(out);
-
-  if (out != NULL)
-    BIO_free(out);
-
-  return ret;
-}
diff --git a/src/crypto/ecdsa/ecdsa_test.cc b/src/crypto/ecdsa/ecdsa_test.cc
new file mode 100644
index 0000000..a6bd7a1
--- /dev/null
+++ b/src/crypto/ecdsa/ecdsa_test.cc
@@ -0,0 +1,340 @@
+/* ====================================================================
+ * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com). */
+
+#include <openssl/ecdsa.h>
+
+#include <vector>
+
+#include <openssl/bn.h>
+#include <openssl/crypto.h>
+#include <openssl/ec.h>
+#include <openssl/err.h>
+#include <openssl/mem.h>
+#include <openssl/obj.h>
+#include <openssl/rand.h>
+
+#include "../test/scoped_types.h"
+#include "../test/stl_compat.h"
+
+enum Api {
+  kEncodedApi,
+  kRawApi,
+};
+
+// VerifyECDSASig returns true on success, false on failure.
+static bool VerifyECDSASig(Api api, const uint8_t *digest,
+                           size_t digest_len, const ECDSA_SIG *ecdsa_sig,
+                           EC_KEY *eckey, int expected_result) {
+  int actual_result;
+
+  switch (api) {
+    case kEncodedApi: {
+      int sig_len = i2d_ECDSA_SIG(ecdsa_sig, NULL);
+      if (sig_len <= 0) {
+        return false;
+      }
+      std::vector<uint8_t> signature(static_cast<size_t>(sig_len));
+      uint8_t *sig_ptr = bssl::vector_data(&signature);
+      sig_len = i2d_ECDSA_SIG(ecdsa_sig, &sig_ptr);
+      if (sig_len <= 0) {
+        return false;
+      }
+      actual_result = ECDSA_verify(0, digest, digest_len, bssl::vector_data(&signature),
+                                   signature.size(), eckey);
+      break;
+    }
+
+    case kRawApi:
+      actual_result = ECDSA_do_verify(digest, digest_len, ecdsa_sig, eckey);
+      break;
+
+    default:
+      return false;
+  }
+  return expected_result == actual_result;
+}
+
+// TestTamperedSig verifies that signature verification fails when a valid
+// signature is tampered with. |ecdsa_sig| must be a valid signature, which will
+// be modified. TestTamperedSig returns true on success, false on failure.
+static bool TestTamperedSig(FILE *out, Api api, const uint8_t *digest,
+                            size_t digest_len, ECDSA_SIG *ecdsa_sig,
+                            EC_KEY *eckey, const BIGNUM *order) {
+  // Modify a single byte of the signature: to ensure we don't
+  // garble the ASN1 structure, we read the raw signature and
+  // modify a byte in one of the bignums directly.
+
+  // Store the two BIGNUMs in raw_buf.
+  size_t r_len = BN_num_bytes(ecdsa_sig->r);
+  size_t s_len = BN_num_bytes(ecdsa_sig->s);
+  size_t bn_len = BN_num_bytes(order);
+  if (r_len > bn_len || s_len > bn_len) {
+    return false;
+  }
+  size_t buf_len = 2 * bn_len;
+  std::vector<uint8_t> raw_buf(buf_len);
+  // Pad the bignums with leading zeroes.
+  if (!BN_bn2bin_padded(bssl::vector_data(&raw_buf), bn_len, ecdsa_sig->r) ||
+      !BN_bn2bin_padded(bssl::vector_data(&raw_buf) + bn_len, bn_len,
+                        ecdsa_sig->s)) {
+    return false;
+  }
+
+  // Modify a single byte in the buffer.
+  size_t offset = raw_buf[10] % buf_len;
+  uint8_t dirt = raw_buf[11] ? raw_buf[11] : 1;
+  raw_buf[offset] ^= dirt;
+  // Now read the BIGNUMs back in from raw_buf.
+  if (BN_bin2bn(bssl::vector_data(&raw_buf), bn_len, ecdsa_sig->r) == NULL ||
+      BN_bin2bn(bssl::vector_data(&raw_buf) + bn_len, bn_len,
+                ecdsa_sig->s) == NULL ||
+      !VerifyECDSASig(api, digest, digest_len, ecdsa_sig, eckey, 0)) {
+    return false;
+  }
+
+  // Sanity check: Undo the modification and verify signature.
+  raw_buf[offset] ^= dirt;
+  if (BN_bin2bn(bssl::vector_data(&raw_buf), bn_len, ecdsa_sig->r) == NULL ||
+      BN_bin2bn(bssl::vector_data(&raw_buf) + bn_len, bn_len,
+                ecdsa_sig->s) == NULL ||
+      !VerifyECDSASig(api, digest, digest_len, ecdsa_sig, eckey, 1)) {
+    return false;
+  }
+
+  return true;
+}
+
+static bool TestBuiltin(FILE *out) {
+  // Fill digest values with some random data.
+  uint8_t digest[20], wrong_digest[20];
+  if (!RAND_bytes(digest, 20) || !RAND_bytes(wrong_digest, 20)) {
+    fprintf(out, "ERROR: unable to get random data\n");
+    return false;
+  }
+
+  static const struct {
+    int nid;
+    const char *name;
+  } kCurves[] = {
+      { NID_secp224r1, "secp224r1" },
+      { NID_X9_62_prime256v1, "secp256r1" },
+      { NID_secp384r1, "secp384r1" },
+      { NID_secp521r1, "secp521r1" },
+      { NID_undef, NULL }
+  };
+
+  // Create and verify ECDSA signatures with every available curve.
+  fputs("\ntesting ECDSA_sign(), ECDSA_verify(), ECDSA_do_sign(), and "
+        "ECDSA_do_verify() with some internal curves:\n", out);
+
+  for (size_t n = 0; kCurves[n].nid != NID_undef; n++) {
+    fprintf(out, "%s: ", kCurves[n].name);
+
+    int nid = kCurves[n].nid;
+    ScopedEC_GROUP group(EC_GROUP_new_by_curve_name(nid));
+    if (!group) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+    ScopedBIGNUM order(BN_new());
+    if (!order || !EC_GROUP_get_order(group.get(), order.get(), NULL)) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+    if (BN_num_bits(order.get()) < 160) {
+      // Too small to test.
+      fprintf(out, " skipped\n");
+      continue;
+    }
+
+    // Create a new ECDSA key.
+    ScopedEC_KEY eckey(EC_KEY_new());
+    if (!eckey || !EC_KEY_set_group(eckey.get(), group.get()) ||
+        !EC_KEY_generate_key(eckey.get())) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+    // Create a second key.
+    ScopedEC_KEY wrong_eckey(EC_KEY_new());
+    if (!wrong_eckey || !EC_KEY_set_group(wrong_eckey.get(), group.get()) ||
+        !EC_KEY_generate_key(wrong_eckey.get())) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+
+    fprintf(out, ".");
+    fflush(out);
+
+    // Check the key.
+    if (!EC_KEY_check_key(eckey.get())) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+    fprintf(out, ".");
+    fflush(out);
+
+    // Test ASN.1-encoded signatures.
+    // Create a signature.
+    unsigned sig_len = ECDSA_size(eckey.get());
+    std::vector<uint8_t> signature(sig_len);
+    if (!ECDSA_sign(0, digest, 20, bssl::vector_data(&signature), &sig_len,
+                    eckey.get())) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+    signature.resize(sig_len);
+    fprintf(out, ".");
+    fflush(out);
+    // Verify the signature.
+    if (!ECDSA_verify(0, digest, 20, bssl::vector_data(&signature),
+                      signature.size(), eckey.get())) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+    fprintf(out, ".");
+    fflush(out);
+    // Verify the signature with the wrong key.
+    if (ECDSA_verify(0, digest, 20, bssl::vector_data(&signature),
+                     signature.size(), wrong_eckey.get())) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+    fprintf(out, ".");
+    fflush(out);
+    // Verify the signature using the wrong digest.
+    if (ECDSA_verify(0, wrong_digest, 20, bssl::vector_data(&signature),
+                      signature.size(), eckey.get())) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+    fprintf(out, ".");
+    fflush(out);
+    // Verify a truncated signature.
+    if (ECDSA_verify(0, digest, 20, bssl::vector_data(&signature),
+                      signature.size() - 1, eckey.get())) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+    fprintf(out, ".");
+    fflush(out);
+    // Verify a tampered signature.
+    const uint8_t *sig_ptr = bssl::vector_data(&signature);
+    ScopedECDSA_SIG ecdsa_sig(d2i_ECDSA_SIG(NULL, &sig_ptr, signature.size()));
+    if (!ecdsa_sig ||
+        !TestTamperedSig(out, kEncodedApi, digest, 20, ecdsa_sig.get(),
+                         eckey.get(), order.get())) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+    fprintf(out, ".");
+    fflush(out);
+
+    // Test ECDSA_SIG signing and verification.
+    // Create a signature.
+    ecdsa_sig.reset(ECDSA_do_sign(digest, 20, eckey.get()));
+    if (!ecdsa_sig) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+    fprintf(out, ".");
+    fflush(out);
+    // Verify the signature using the correct key.
+    if (!ECDSA_do_verify(digest, 20, ecdsa_sig.get(), eckey.get())) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+    fprintf(out, ".");
+    fflush(out);
+    // Verify the signature with the wrong key.
+    if (ECDSA_do_verify(digest, 20, ecdsa_sig.get(), wrong_eckey.get())) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+    fprintf(out, ".");
+    fflush(out);
+    // Verify the signature using the wrong digest.
+    if (ECDSA_do_verify(wrong_digest, 20, ecdsa_sig.get(), eckey.get())) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+    fprintf(out, ".");
+    fflush(out);
+    // Verify a tampered signature.
+    if (!TestTamperedSig(out, kRawApi, digest, 20, ecdsa_sig.get(), eckey.get(),
+                         order.get())) {
+      fprintf(out, " failed\n");
+      return false;
+    }
+    fprintf(out, ".");
+    fflush(out);
+
+    fprintf(out, " ok\n");
+    // Clear bogus errors.
+    ERR_clear_error();
+  }
+
+  return true;
+}
+
+int main(void) {
+  CRYPTO_library_init();
+  ERR_load_crypto_strings();
+
+  if (!TestBuiltin(stdout)) {
+    printf("\nECDSA test failed\n");
+    ERR_print_errors_fp(stdout);
+    return 1;
+  }
+
+  printf("\nPASS\n");
+  return 0;
+}