diff options
| author |   djm <djm@openbsd.org> | 2009-04-06 06:33:15 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2009-04-06 06:33:15 +0000 |
| commit | 50c17820b957a3701405f7c9e3c78d197e41b584 (patch) | |
| tree | 6d48b4de4458fad1c083c58332f58788b1b098d9 /lib/libcrypto/dh/dh_err.c | |
| parent | import of OpenSSL 0.9.8k (diff) | |
| download | wireguard-openbsd-50c17820b957a3701405f7c9e3c78d197e41b584.tar.xz wireguard-openbsd-50c17820b957a3701405f7c9e3c78d197e41b584.zip | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/dh/dh_err.c')
| -rw-r--r-- | lib/libcrypto/dh/dh_err.c | 2 |
1 files changed, 0 insertions, 2 deletions
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} }; |