diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-04-12 17:41:53 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-04-12 17:41:53 +0000 |
| commit | 4bd1e895faa35a8d4810402fe3ba9d07c1166908 (patch) | |
| tree | 076044a96d20e6b7a743646ecdf3bd3c5f404960 /fips/fips.c | |
| parent | 9b08dbe903397b1545d3b04c264ec745f2fdeb57 (diff) | |
Update fips_pkey_signature_test: use fixed string if supplies tbs is
NULL. Always allocate signature buffer.
Update ECDSA selftest to use fips_pkey_signature_test. Add copyright notice
to file.
Diffstat (limited to 'fips/fips.c')
| -rw-r--r-- | fips/fips.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/fips/fips.c b/fips/fips.c index a4ed4f28fb..9ad1761f0d 100644 --- a/fips/fips.c +++ b/fips/fips.c @@ -397,21 +397,25 @@ unsigned char *fips_signature_witness(void) */ int fips_pkey_signature_test(EVP_PKEY *pkey, - const unsigned char *tbs, int tbslen, - const unsigned char *kat, unsigned int katlen, + const unsigned char *tbs, size_t tbslen, + const unsigned char *kat, size_t katlen, const EVP_MD *digest, int pad_mode, const char *fail_str) { int ret = 0; - unsigned char sigtmp[256], *sig = sigtmp; + unsigned char *sig = NULL; unsigned int siglen; + static const unsigned char str1[]="12345678901234567890"; DSA_SIG *dsig = NULL; ECDSA_SIG *esig = NULL; EVP_MD_CTX mctx; FIPS_md_ctx_init(&mctx); - if ((pkey->type == EVP_PKEY_RSA) - && ((size_t)RSA_size(pkey->pkey.rsa) > sizeof(sigtmp))) + + if (tbs == NULL) + tbs = str1; + + if (pkey->type == EVP_PKEY_RSA) { sig = OPENSSL_malloc(RSA_size(pkey->pkey.rsa)); if (!sig) @@ -421,7 +425,7 @@ int fips_pkey_signature_test(EVP_PKEY *pkey, } } - if (tbslen == -1) + if (tbslen == 0) tbslen = strlen((char *)tbs); if (digest == NULL) @@ -486,7 +490,7 @@ int fips_pkey_signature_test(EVP_PKEY *pkey, FIPS_dsa_sig_free(dsig); if (esig != NULL) FIPS_ecdsa_sig_free(esig); - if (sig != sigtmp) + if (sig) OPENSSL_free(sig); FIPS_md_ctx_cleanup(&mctx); if (ret != 1) |