Fix DER checks for DSA_check_signature and add tests.
DSA_verify and DSA_check_signature didn't share a codepath, so the fix was only
applied to the former. Implement verify in terms of check_signature and add
tests for bad DER variants.
Change-Id: I6577f96b13b57fc89a5308bd8a7c2318defa7ee1
Reviewed-on: https://boringssl-review.googlesource.com/2820
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/crypto/dsa/dsa.c b/crypto/dsa/dsa.c
index 47b902a..cbd36be 100644
--- a/crypto/dsa/dsa.c
+++ b/crypto/dsa/dsa.c
@@ -199,20 +199,11 @@
int DSA_do_verify(const uint8_t *digest, size_t digest_len, DSA_SIG *sig,
const DSA *dsa) {
- int valid, ret;
-
- if (dsa->meth->verify) {
- ret = dsa->meth->verify(&valid, digest, digest_len, sig, dsa);
- } else {
- ret = DSA_default_method.verify(&valid, digest, digest_len, sig, dsa);
- }
-
- if (!ret) {
+ int valid;
+ if (!DSA_do_check_signature(&valid, digest, digest_len, sig, dsa)) {
return -1;
- } else if (!valid) {
- return 0;
}
- return 1;
+ return valid;
}
int DSA_do_check_signature(int *out_valid, const uint8_t *digest,
@@ -241,8 +232,18 @@
int DSA_verify(int type, const uint8_t *digest, size_t digest_len,
const uint8_t *sig, size_t sig_len, const DSA *dsa) {
+ int valid;
+ if (!DSA_check_signature(&valid, digest, digest_len, sig, sig_len, dsa)) {
+ return -1;
+ }
+ return valid;
+}
+
+int DSA_check_signature(int *out_valid, const uint8_t *digest,
+ size_t digest_len, const uint8_t *sig, size_t sig_len,
+ const DSA *dsa) {
DSA_SIG *s = NULL;
- int ret = -1, valid;
+ int ret = 0;
uint8_t *der = NULL;
s = DSA_SIG_new();
@@ -261,11 +262,7 @@
goto err;
}
- if (!DSA_do_check_signature(&valid, digest, digest_len, s, dsa)) {
- goto err;
- }
-
- ret = valid;
+ ret = DSA_do_check_signature(out_valid, digest, digest_len, s, dsa);
err:
if (der != NULL) {
@@ -277,30 +274,6 @@
return ret;
}
-int DSA_check_signature(int *out_valid, const uint8_t *digest,
- size_t digest_len, const uint8_t *sig, size_t sig_len,
- const DSA *dsa) {
- DSA_SIG *s = NULL;
- int ret = 0;
-
- s = DSA_SIG_new();
- if (s == NULL) {
- goto err;
- }
-
- if (d2i_DSA_SIG(&s, &sig, sig_len) == NULL) {
- goto err;
- }
-
- ret = DSA_do_check_signature(out_valid, digest, digest_len, s, dsa);
-
-err:
- if (s) {
- DSA_SIG_free(s);
- }
- return ret;
-}
-
int DSA_size(const DSA *dsa) {
int ret, i;
ASN1_INTEGER bs;
diff --git a/crypto/dsa/dsa_test.c b/crypto/dsa/dsa_test.c
index 1edb7e7..e38720c 100644
--- a/crypto/dsa/dsa_test.c
+++ b/crypto/dsa/dsa_test.c
@@ -62,57 +62,138 @@
#include <openssl/bio.h>
#include <openssl/bn.h>
#include <openssl/crypto.h>
+#include <openssl/err.h>
#include "internal.h"
static int dsa_cb(int p, int n, BN_GENCB *arg);
-/* seed, out_p, out_q, out_g are taken from the updated Appendix 5 to
- * FIPS PUB 186 and also appear in Appendix 5 to FIPS PIB 186-1 */
-static unsigned char seed[20] = {0xd5, 0x01, 0x4e, 0x4b, 0x60, 0xef, 0x2b,
- 0xa8, 0xb6, 0x21, 0x1b, 0x40, 0x62, 0xba,
- 0x32, 0x24, 0xe0, 0x42, 0x7d, 0xd3, };
+/* The following values are taken from the updated Appendix 5 to FIPS PUB 186
+ * and also appear in Appendix 5 to FIPS PUB 186-1. */
-static unsigned char out_p[] = {
+static const uint8_t seed[20] = {
+ 0xd5, 0x01, 0x4e, 0x4b, 0x60, 0xef, 0x2b, 0xa8, 0xb6, 0x21, 0x1b,
+ 0x40, 0x62, 0xba, 0x32, 0x24, 0xe0, 0x42, 0x7d, 0xd3,
+};
+
+static const uint8_t fips_p[] = {
0x8d, 0xf2, 0xa4, 0x94, 0x49, 0x22, 0x76, 0xaa, 0x3d, 0x25, 0x75,
0x9b, 0xb0, 0x68, 0x69, 0xcb, 0xea, 0xc0, 0xd8, 0x3a, 0xfb, 0x8d,
0x0c, 0xf7, 0xcb, 0xb8, 0x32, 0x4f, 0x0d, 0x78, 0x82, 0xe5, 0xd0,
0x76, 0x2f, 0xc5, 0xb7, 0x21, 0x0e, 0xaf, 0xc2, 0xe9, 0xad, 0xac,
0x32, 0xab, 0x7a, 0xac, 0x49, 0x69, 0x3d, 0xfb, 0xf8, 0x37, 0x24,
- 0xc2, 0xec, 0x07, 0x36, 0xee, 0x31, 0xc8, 0x02, 0x91, };
+ 0xc2, 0xec, 0x07, 0x36, 0xee, 0x31, 0xc8, 0x02, 0x91,
+};
-static unsigned char out_q[] = {0xc7, 0x73, 0x21, 0x8c, 0x73, 0x7e, 0xc8,
- 0xee, 0x99, 0x3b, 0x4f, 0x2d, 0xed, 0x30,
- 0xf4, 0x8e, 0xda, 0xce, 0x91, 0x5f, };
+static const uint8_t fips_q[] = {
+ 0xc7, 0x73, 0x21, 0x8c, 0x73, 0x7e, 0xc8, 0xee, 0x99, 0x3b, 0x4f,
+ 0x2d, 0xed, 0x30, 0xf4, 0x8e, 0xda, 0xce, 0x91, 0x5f,
+};
-static unsigned char out_g[] = {
+static const uint8_t fips_g[] = {
0x62, 0x6d, 0x02, 0x78, 0x39, 0xea, 0x0a, 0x13, 0x41, 0x31, 0x63,
0xa5, 0x5b, 0x4c, 0xb5, 0x00, 0x29, 0x9d, 0x55, 0x22, 0x95, 0x6c,
0xef, 0xcb, 0x3b, 0xff, 0x10, 0xf3, 0x99, 0xce, 0x2c, 0x2e, 0x71,
0xcb, 0x9d, 0xe5, 0xfa, 0x24, 0xba, 0xbf, 0x58, 0xe5, 0xb7, 0x95,
0x21, 0x92, 0x5c, 0x9c, 0xc4, 0x2e, 0x9f, 0x6f, 0x46, 0x4b, 0x08,
- 0x8c, 0xc5, 0x72, 0xaf, 0x53, 0xe6, 0xd7, 0x88, 0x02, };
+ 0x8c, 0xc5, 0x72, 0xaf, 0x53, 0xe6, 0xd7, 0x88, 0x02,
+};
-static const uint8_t str1[]="12345678901234567890";
+static const uint8_t fips_x[] = {
+ 0x20, 0x70, 0xb3, 0x22, 0x3d, 0xba, 0x37, 0x2f, 0xde, 0x1c, 0x0f,
+ 0xfc, 0x7b, 0x2e, 0x3b, 0x49, 0x8b, 0x26, 0x06, 0x14,
+};
+
+static const uint8_t fips_y[] = {
+ 0x19, 0x13, 0x18, 0x71, 0xd7, 0x5b, 0x16, 0x12, 0xa8, 0x19, 0xf2,
+ 0x9d, 0x78, 0xd1, 0xb0, 0xd7, 0x34, 0x6f, 0x7a, 0xa7, 0x7b, 0xb6,
+ 0x2a, 0x85, 0x9b, 0xfd, 0x6c, 0x56, 0x75, 0xda, 0x9d, 0x21, 0x2d,
+ 0x3a, 0x36, 0xef, 0x16, 0x72, 0xef, 0x66, 0x0b, 0x8c, 0x7c, 0x25,
+ 0x5c, 0xc0, 0xec, 0x74, 0x85, 0x8f, 0xba, 0x33, 0xf4, 0x4c, 0x06,
+ 0x69, 0x96, 0x30, 0xa7, 0x6b, 0x03, 0x0e, 0xe3, 0x33,
+};
+
+static const uint8_t fips_digest[] = {
+ 0xa9, 0x99, 0x3e, 0x36, 0x47, 0x06, 0x81, 0x6a, 0xba, 0x3e, 0x25,
+ 0x71, 0x78, 0x50, 0xc2, 0x6c, 0x9c, 0xd0, 0xd8, 0x9d,
+};
+
+/* fips_sig is a DER-encoded version of the r and s values in FIPS PUB 186-1. */
+static const uint8_t fips_sig[] = {
+ 0x30, 0x2d, 0x02, 0x15, 0x00, 0x8b, 0xac, 0x1a, 0xb6, 0x64, 0x10,
+ 0x43, 0x5c, 0xb7, 0x18, 0x1f, 0x95, 0xb1, 0x6a, 0xb9, 0x7c, 0x92,
+ 0xb3, 0x41, 0xc0, 0x02, 0x14, 0x41, 0xe2, 0x34, 0x5f, 0x1f, 0x56,
+ 0xdf, 0x24, 0x58, 0xf4, 0x26, 0xd1, 0x55, 0xb4, 0xba, 0x2d, 0xb6,
+ 0xdc, 0xd8, 0xc8,
+};
+
+/* fips_sig_negative is fips_sig with r encoded as a negative number. */
+static const uint8_t fips_sig_negative[] = {
+ 0x30, 0x2c, 0x02, 0x14, 0x8b, 0xac, 0x1a, 0xb6, 0x64, 0x10, 0x43,
+ 0x5c, 0xb7, 0x18, 0x1f, 0x95, 0xb1, 0x6a, 0xb9, 0x7c, 0x92, 0xb3,
+ 0x41, 0xc0, 0x02, 0x14, 0x41, 0xe2, 0x34, 0x5f, 0x1f, 0x56, 0xdf,
+ 0x24, 0x58, 0xf4, 0x26, 0xd1, 0x55, 0xb4, 0xba, 0x2d, 0xb6, 0xdc,
+ 0xd8, 0xc8,
+};
+
+/* fip_sig_extra is fips_sig with trailing data. */
+static const uint8_t fips_sig_extra[] = {
+ 0x30, 0x2d, 0x02, 0x15, 0x00, 0x8b, 0xac, 0x1a, 0xb6, 0x64, 0x10,
+ 0x43, 0x5c, 0xb7, 0x18, 0x1f, 0x95, 0xb1, 0x6a, 0xb9, 0x7c, 0x92,
+ 0xb3, 0x41, 0xc0, 0x02, 0x14, 0x41, 0xe2, 0x34, 0x5f, 0x1f, 0x56,
+ 0xdf, 0x24, 0x58, 0xf4, 0x26, 0xd1, 0x55, 0xb4, 0xba, 0x2d, 0xb6,
+ 0xdc, 0xd8, 0xc8, 0x00,
+};
+
+/* fips_sig_lengths is fips_sig with a non-minimally encoded length. */
+static const uint8_t fips_sig_bad_length[] = {
+ 0x30, 0x81, 0x2d, 0x02, 0x15, 0x00, 0x8b, 0xac, 0x1a, 0xb6, 0x64,
+ 0x10, 0x43, 0x5c, 0xb7, 0x18, 0x1f, 0x95, 0xb1, 0x6a, 0xb9, 0x7c,
+ 0x92, 0xb3, 0x41, 0xc0, 0x02, 0x14, 0x41, 0xe2, 0x34, 0x5f, 0x1f,
+ 0x56, 0xdf, 0x24, 0x58, 0xf4, 0x26, 0xd1, 0x55, 0xb4, 0xba, 0x2d,
+ 0xb6, 0xdc, 0xd8, 0xc8, 0x00,
+};
+
+/* fips_sig_bad_r is fips_sig with a bad r value. */
+static const uint8_t fips_sig_bad_r[] = {
+ 0x30, 0x2d, 0x02, 0x15, 0x00, 0x8c, 0xac, 0x1a, 0xb6, 0x64, 0x10,
+ 0x43, 0x5c, 0xb7, 0x18, 0x1f, 0x95, 0xb1, 0x6a, 0xb9, 0x7c, 0x92,
+ 0xb3, 0x41, 0xc0, 0x02, 0x14, 0x41, 0xe2, 0x34, 0x5f, 0x1f, 0x56,
+ 0xdf, 0x24, 0x58, 0xf4, 0x26, 0xd1, 0x55, 0xb4, 0xba, 0x2d, 0xb6,
+ 0xdc, 0xd8, 0xc8,
+};
static BIO *bio_err = NULL;
static BIO *bio_out = NULL;
-int main(int argc, char **argv) {
+static DSA *get_fips_dsa(void) {
+ DSA *dsa = DSA_new();
+ if (!dsa) {
+ return NULL;
+ }
+ dsa->p = BN_bin2bn(fips_p, sizeof(fips_p), NULL);
+ dsa->q = BN_bin2bn(fips_q, sizeof(fips_q), NULL);
+ dsa->g = BN_bin2bn(fips_g, sizeof(fips_g), NULL);
+ dsa->pub_key = BN_bin2bn(fips_y, sizeof(fips_y), NULL);
+ dsa->priv_key = BN_bin2bn(fips_x, sizeof(fips_x), NULL);
+ if (dsa->p == NULL || dsa->q == NULL || dsa->g == NULL ||
+ dsa->pub_key == NULL || dsa->priv_key == NULL) {
+ DSA_free(dsa);
+ return NULL;
+ }
+ return dsa;
+}
+
+static int test_generate(void) {
BN_GENCB cb;
DSA *dsa = NULL;
int counter, ok = 0, i, j;
- unsigned char buf[256];
+ uint8_t buf[256];
unsigned long h;
- unsigned char sig[256];
+ uint8_t sig[256];
unsigned int siglen;
- CRYPTO_library_init();
-
- bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
- bio_out = BIO_new_fp(stdout, BIO_NOCLOSE);
-
BIO_printf(bio_out, "test generation of DSA parameters\n");
BN_GENCB_set(&cb, dsa_cb, bio_out);
@@ -139,50 +220,88 @@
}
i = BN_bn2bin(dsa->q, buf);
- j = sizeof(out_q);
- if (i != j || memcmp(buf, out_q, i) != 0) {
+ j = sizeof(fips_q);
+ if (i != j || memcmp(buf, fips_q, i) != 0) {
BIO_printf(bio_err, "q value is wrong\n");
goto end;
}
i = BN_bn2bin(dsa->p, buf);
- j = sizeof(out_p);
- if (i != j || memcmp(buf, out_p, i) != 0) {
+ j = sizeof(fips_p);
+ if (i != j || memcmp(buf, fips_p, i) != 0) {
BIO_printf(bio_err, "p value is wrong\n");
goto end;
}
i = BN_bn2bin(dsa->g, buf);
- j = sizeof(out_g);
- if (i != j || memcmp(buf, out_g, i) != 0) {
+ j = sizeof(fips_g);
+ if (i != j || memcmp(buf, fips_g, i) != 0) {
BIO_printf(bio_err, "g value is wrong\n");
goto end;
}
DSA_generate_key(dsa);
- DSA_sign(0, str1, 20, sig, &siglen, dsa);
- if (DSA_verify(0, str1, 20, sig, siglen, dsa) == 1) {
+ DSA_sign(0, fips_digest, sizeof(fips_digest), sig, &siglen, dsa);
+ if (DSA_verify(0, fips_digest, sizeof(fips_digest), sig, siglen, dsa) == 1) {
ok = 1;
} else {
BIO_printf(bio_err, "verification failure\n");
}
end:
- if (!ok) {
- BIO_print_errors(bio_err);
- }
if (dsa != NULL) {
DSA_free(dsa);
}
- BIO_free(bio_err);
- BIO_free(bio_out);
+ return ok;
+}
- if (ok) {
- printf("PASS\n");
+static int test_verify(const uint8_t *sig, size_t sig_len, int expect) {
+ int ok = 0;
+ DSA *dsa = get_fips_dsa();
+ if (dsa == NULL) {
+ goto end;
}
- return ok == 1 ? 0 : 1;
+ int ret = DSA_verify(0, fips_digest, sizeof(fips_digest), sig, sig_len, dsa);
+ if (ret != expect) {
+ BIO_printf(bio_err, "DSA_verify returned %d, want %d\n", ret, expect);
+ goto end;
+ }
+ ok = 1;
+ /* Clear any errorrs from a test with expected failure. */
+ ERR_clear_error();
+
+end:
+ if (dsa != NULL) {
+ DSA_free(dsa);
+ }
+
+ return ok;
+}
+
+int main(int argc, char **argv) {
+ CRYPTO_library_init();
+
+ bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
+ bio_out = BIO_new_fp(stdout, BIO_NOCLOSE);
+
+ if (!test_generate() ||
+ !test_verify(fips_sig, sizeof(fips_sig), 1) ||
+ !test_verify(fips_sig_negative, sizeof(fips_sig_negative), -1) ||
+ !test_verify(fips_sig_extra, sizeof(fips_sig_extra), -1) ||
+ !test_verify(fips_sig_bad_length, sizeof(fips_sig_bad_length), -1) ||
+ !test_verify(fips_sig_bad_r, sizeof(fips_sig_bad_r), 0)) {
+ BIO_print_errors(bio_err);
+ BIO_free(bio_err);
+ BIO_free(bio_out);
+ return 1;
+ }
+
+ BIO_free(bio_err);
+ BIO_free(bio_out);
+ printf("PASS\n");
+ return 0;
}
static int dsa_cb(int p, int n, BN_GENCB *arg) {
diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h
index 5e71ae2..8a182c2 100644
--- a/include/openssl/dsa.h
+++ b/include/openssl/dsa.h
@@ -160,7 +160,7 @@
OPENSSL_EXPORT int DSA_do_verify(const uint8_t *digest, size_t digest_len,
DSA_SIG *sig, const DSA *dsa);
-/* DSA_check_signature sets |*out_valid| to zero. Then it verifies that |sig|
+/* DSA_do_check_signature sets |*out_valid| to zero. Then it verifies that |sig|
* is a valid signature, by the public key in |dsa| of the hash in |digest|
* and, if so, it sets |*out_valid| to one.
*
