diff options
| author | Rob Austein <sra@hactrn.net> | 2006-10-09 16:29:05 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2006-10-09 16:29:05 +0000 |
| commit | 1b2aa7959c86a835491c8cfca8c0683b747c1855 (patch) | |
| tree | 9a0ba58647a2d57115f5c003ca4673e7693c950a /openssl/vendor/current/crypto/dsa | |
| parent | 084adb601f2d375395c6cdcedf8af91f1065fe4e (diff) | |
Merge in vendor branch OpenSSL changes 0.9.8b -> 0.9.8d
svn path=/openssl/vendor/current/CHANGES; revision=375
Diffstat (limited to 'openssl/vendor/current/crypto/dsa')
| -rw-r--r-- | openssl/vendor/current/crypto/dsa/dsa.h | 6 | ||||
| -rw-r--r-- | openssl/vendor/current/crypto/dsa/dsa_err.c | 2 | ||||
| -rw-r--r-- | openssl/vendor/current/crypto/dsa/dsa_ossl.c | 12 |
3 files changed, 20 insertions, 0 deletions
diff --git a/openssl/vendor/current/crypto/dsa/dsa.h b/openssl/vendor/current/crypto/dsa/dsa.h index b12db98b..3a8fe5b5 100644 --- a/openssl/vendor/current/crypto/dsa/dsa.h +++ b/openssl/vendor/current/crypto/dsa/dsa.h @@ -84,6 +84,10 @@ #endif #endif +#ifndef OPENSSL_DSA_MAX_MODULUS_BITS +# define OPENSSL_DSA_MAX_MODULUS_BITS 10000 +#endif + #define DSA_FLAG_CACHE_MONT_P 0x01 #define DSA_FLAG_NO_EXP_CONSTTIME 0x02 /* new with 0.9.7h; the built-in DSA * implementation now uses constant time @@ -270,8 +274,10 @@ void ERR_load_DSA_strings(void); #define DSA_F_SIG_CB 114 /* Reason codes. */ +#define DSA_R_BAD_Q_VALUE 102 #define DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE 100 #define DSA_R_MISSING_PARAMETERS 101 +#define DSA_R_MODULUS_TOO_LARGE 103 #ifdef __cplusplus } diff --git a/openssl/vendor/current/crypto/dsa/dsa_err.c b/openssl/vendor/current/crypto/dsa/dsa_err.c index fd420535..d7fac691 100644 --- a/openssl/vendor/current/crypto/dsa/dsa_err.c +++ b/openssl/vendor/current/crypto/dsa/dsa_err.c @@ -89,8 +89,10 @@ static ERR_STRING_DATA DSA_str_functs[]= static ERR_STRING_DATA DSA_str_reasons[]= { +{ERR_REASON(DSA_R_BAD_Q_VALUE) ,"bad q value"}, {ERR_REASON(DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE),"data too large for key size"}, {ERR_REASON(DSA_R_MISSING_PARAMETERS) ,"missing parameters"}, +{ERR_REASON(DSA_R_MODULUS_TOO_LARGE) ,"modulus too large"}, {0,NULL} }; diff --git a/openssl/vendor/current/crypto/dsa/dsa_ossl.c b/openssl/vendor/current/crypto/dsa/dsa_ossl.c index 3fd8a356..e6aad858 100644 --- a/openssl/vendor/current/crypto/dsa/dsa_ossl.c +++ b/openssl/vendor/current/crypto/dsa/dsa_ossl.c @@ -304,6 +304,18 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, return -1; } + if (BN_num_bits(dsa->q) != 160) + { + DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_BAD_Q_VALUE); + return -1; + } + + if (BN_num_bits(dsa->p) > OPENSSL_DSA_MAX_MODULUS_BITS) + { + DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_MODULUS_TOO_LARGE); + return -1; + } + BN_init(&u1); BN_init(&u2); BN_init(&t1); |