Index: openssl/crypto/dh/dh_err.c |
=================================================================== |
--- openssl/crypto/dh/dh_err.c (revision 105093) |
+++ openssl/crypto/dh/dh_err.c (working copy) |
@@ -1,6 +1,6 @@ |
/* crypto/dh/dh_err.c */ |
/* ==================================================================== |
- * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. |
+ * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. |
* |
* Redistribution and use in source and binary forms, with or without |
* modification, are permitted provided that the following conditions |
@@ -71,25 +71,34 @@ |
static ERR_STRING_DATA DH_str_functs[]= |
{ |
{ERR_FUNC(DH_F_COMPUTE_KEY), "COMPUTE_KEY"}, |
-{ERR_FUNC(DH_F_DHPARAMS_PRINT), "DHparams_print"}, |
{ERR_FUNC(DH_F_DHPARAMS_PRINT_FP), "DHparams_print_fp"}, |
{ERR_FUNC(DH_F_DH_BUILTIN_GENPARAMS), "DH_BUILTIN_GENPARAMS"}, |
-{ERR_FUNC(DH_F_DH_COMPUTE_KEY), "DH_compute_key"}, |
-{ERR_FUNC(DH_F_DH_GENERATE_KEY), "DH_generate_key"}, |
-{ERR_FUNC(DH_F_DH_GENERATE_PARAMETERS), "DH_generate_parameters"}, |
{ERR_FUNC(DH_F_DH_NEW_METHOD), "DH_new_method"}, |
+{ERR_FUNC(DH_F_DH_PARAM_DECODE), "DH_PARAM_DECODE"}, |
+{ERR_FUNC(DH_F_DH_PRIV_DECODE), "DH_PRIV_DECODE"}, |
+{ERR_FUNC(DH_F_DH_PRIV_ENCODE), "DH_PRIV_ENCODE"}, |
+{ERR_FUNC(DH_F_DH_PUB_DECODE), "DH_PUB_DECODE"}, |
+{ERR_FUNC(DH_F_DH_PUB_ENCODE), "DH_PUB_ENCODE"}, |
+{ERR_FUNC(DH_F_DO_DH_PRINT), "DO_DH_PRINT"}, |
{ERR_FUNC(DH_F_GENERATE_KEY), "GENERATE_KEY"}, |
{ERR_FUNC(DH_F_GENERATE_PARAMETERS), "GENERATE_PARAMETERS"}, |
+{ERR_FUNC(DH_F_PKEY_DH_DERIVE), "PKEY_DH_DERIVE"}, |
+{ERR_FUNC(DH_F_PKEY_DH_KEYGEN), "PKEY_DH_KEYGEN"}, |
{0,NULL} |
}; |
static ERR_STRING_DATA DH_str_reasons[]= |
{ |
{ERR_REASON(DH_R_BAD_GENERATOR) ,"bad generator"}, |
+{ERR_REASON(DH_R_BN_DECODE_ERROR) ,"bn decode error"}, |
+{ERR_REASON(DH_R_BN_ERROR) ,"bn error"}, |
+{ERR_REASON(DH_R_DECODE_ERROR) ,"decode error"}, |
{ERR_REASON(DH_R_INVALID_PUBKEY) ,"invalid public key"}, |
-{ERR_REASON(DH_R_KEY_SIZE_TOO_SMALL) ,"key size too small"}, |
+{ERR_REASON(DH_R_KEYS_NOT_SET) ,"keys not set"}, |
{ERR_REASON(DH_R_MODULUS_TOO_LARGE) ,"modulus too large"}, |
+{ERR_REASON(DH_R_NO_PARAMETERS_SET) ,"no parameters set"}, |
{ERR_REASON(DH_R_NO_PRIVATE_VALUE) ,"no private value"}, |
+{ERR_REASON(DH_R_PARAMETER_ENCODING_ERROR),"parameter encoding error"}, |
{0,NULL} |
}; |