diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2009-04-06 06:33:21 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2009-04-06 06:33:21 +0000 |
| commit | 4af955ab47cb58f0856af2543cfd369ca621acf4 (patch) | |
| tree | 2a9f13536ecfa4cb24b1f0b68532d101a9c44ef6 /lib/libcrypto/dh | |
| parent | cea69e0d929b3248b3139c9ca312f9c85933095f (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/dh')
| -rw-r--r-- | lib/libcrypto/dh/dh.h | 4 | ||||
| -rw-r--r-- | lib/libcrypto/dh/dh_err.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/libcrypto/dh/dh.h b/lib/libcrypto/dh/dh.h index 0a39742773c..10475ac4b3c 100644 --- a/lib/libcrypto/dh/dh.h +++ b/lib/libcrypto/dh/dh.h @@ -122,7 +122,7 @@ struct dh_st int version; BIGNUM *p; BIGNUM *g; - int length; /* optional */ + long length; /* optional */ BIGNUM *pub_key; /* g^x */ BIGNUM *priv_key; /* x */ @@ -238,8 +238,6 @@ void ERR_load_DH_strings(void); #define DH_R_KEY_SIZE_TOO_SMALL 104 #define DH_R_MODULUS_TOO_LARGE 103 #define DH_R_NO_PRIVATE_VALUE 100 -#define DH_R_INVALID_PUBKEY 102 -#define DH_R_MODULUS_TOO_LARGE 103 #ifdef __cplusplus } diff --git a/lib/libcrypto/dh/dh_err.c b/lib/libcrypto/dh/dh_err.c index b364362fcae..13263c81c1b 100644 --- a/lib/libcrypto/dh/dh_err.c +++ b/lib/libcrypto/dh/dh_err.c @@ -90,8 +90,6 @@ static ERR_STRING_DATA DH_str_reasons[]= {ERR_REASON(DH_R_KEY_SIZE_TOO_SMALL) ,"key size too small"}, {ERR_REASON(DH_R_MODULUS_TOO_LARGE) ,"modulus too large"}, {ERR_REASON(DH_R_NO_PRIVATE_VALUE) ,"no private value"}, -{ERR_REASON(DH_R_INVALID_PUBKEY) ,"invalid public key"}, -{ERR_REASON(DH_R_MODULUS_TOO_LARGE) ,"modulus too large"}, {0,NULL} }; |