diff options
| author | djm <> | 2009-04-06 06:33:20 +0000 |
|---|---|---|
| committer | djm <> | 2009-04-06 06:33:20 +0000 |
| commit | ee26f086217016f09154412b171ad62a33a346f6 (patch) | |
| tree | 647f179fa8dcccf50c436cc0165a1d67476a936e /src/lib/libcrypto/dh/dh_err.c | |
| parent | f929570d17be2469dc7104fcdf26fdaddf3dbb65 (diff) | |
| download | openbsd-ee26f086217016f09154412b171ad62a33a346f6.tar.gz openbsd-ee26f086217016f09154412b171ad62a33a346f6.tar.bz2 openbsd-ee26f086217016f09154412b171ad62a33a346f6.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/dh/dh_err.c')
| -rw-r--r-- | src/lib/libcrypto/dh/dh_err.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/lib/libcrypto/dh/dh_err.c b/src/lib/libcrypto/dh/dh_err.c index b364362fca..13263c81c1 100644 --- a/src/lib/libcrypto/dh/dh_err.c +++ b/src/lib/libcrypto/dh/dh_err.c | |||
| @@ -90,8 +90,6 @@ static ERR_STRING_DATA DH_str_reasons[]= | |||
| 90 | {ERR_REASON(DH_R_KEY_SIZE_TOO_SMALL) ,"key size too small"}, | 90 | {ERR_REASON(DH_R_KEY_SIZE_TOO_SMALL) ,"key size too small"}, |
| 91 | {ERR_REASON(DH_R_MODULUS_TOO_LARGE) ,"modulus too large"}, | 91 | {ERR_REASON(DH_R_MODULUS_TOO_LARGE) ,"modulus too large"}, |
| 92 | {ERR_REASON(DH_R_NO_PRIVATE_VALUE) ,"no private value"}, | 92 | {ERR_REASON(DH_R_NO_PRIVATE_VALUE) ,"no private value"}, |
| 93 | {ERR_REASON(DH_R_INVALID_PUBKEY) ,"invalid public key"}, | ||
| 94 | {ERR_REASON(DH_R_MODULUS_TOO_LARGE) ,"modulus too large"}, | ||
| 95 | {0,NULL} | 93 | {0,NULL} |
| 96 | }; | 94 | }; |
| 97 | 95 | ||