OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Dr.
Stephen Henson
Root: /v/openssl/cvs Email: steve openssl.org
Module: openssl Date:
17-Jul-2006 18:33:31
Branch: HEAD Handle:
2006071717332110
Modified files:
openssl/crypto/asn1 asn1.h asn1_err.c p5_pbev2.c
openssl/crypto/dh dh.h dh_ameth.c dh_err.c
openssl/crypto/dsa dsa.h dsa_ameth.c dsa_err.c
openssl/crypto/ec ec.h ec_ameth.c ec_err.c
openssl/crypto/evp evp.h evp_err.c evp_pbe.c
pmeth_fn.c
openssl/crypto/ocsp ocsp.h ocsp_err.c ocsp_ht.c
openssl/crypto/rsa rsa.h rsa_ameth.c rsa_err.c
rsa_sign.c
openssl/util ck_errf.pl
Log:
Fix various error codes to match functions.
Summary:
Revision Changes Path
1.147 +1 -1 openssl/crypto/asn1/asn1.h
1.58 +1 -2 openssl/crypto/asn1/asn1_err.c
1.26 +3 -3 openssl/crypto/asn1/p5_pbev2.c
1.45 +1 -1 openssl/crypto/dh/dh.h
1.11 +1 -1 openssl/crypto/dh/dh_ameth.c
1.19 +1 -1 openssl/crypto/dh/dh_err.c
1.44 +2 -1 openssl/crypto/dsa/dsa.h
1.18 +2 -10 openssl/crypto/dsa/dsa_ameth.c
1.18 +2 -1 openssl/crypto/dsa/dsa_err.c
1.86 +2 -0 openssl/crypto/ec/ec.h
1.14 +2 -2 openssl/crypto/ec/ec_ameth.c
1.41 +2 -0 openssl/crypto/ec/ec_err.c
1.167 +1 -0 openssl/crypto/evp/evp.h
1.42 +1 -0 openssl/crypto/evp/evp_err.c
1.23 +1 -1 openssl/crypto/evp/evp_pbe.c
1.10 +1 -1 openssl/crypto/evp/pmeth_fn.c
1.36 +1 -0 openssl/crypto/ocsp/ocsp.h
1.18 +1 -0 openssl/crypto/ocsp/ocsp_err.c
1.8 +4 -4 openssl/crypto/ocsp/ocsp_ht.c
1.71 +4 -1 openssl/crypto/rsa/rsa.h
1.13 +2 -2 openssl/crypto/rsa/rsa_ameth.c
1.25 +3 -0 openssl/crypto/rsa/rsa_err.c
1.25 +7 -7 openssl/crypto/rsa/rsa_sign.c
1.6 +1 -1 openssl/util/ck_errf.pl
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/crypto/asn1/asn1.h
============================================================
================
$ cvs diff -u -r1.146 -r1.147 asn1.h
--- openssl/crypto/asn1/asn1.h 8 May 2006 12:44:24
-0000 1.146
+++ openssl/crypto/asn1/asn1.h 17 Jul 2006 16:33:21
-0000 1.147
-1151,7 +1151,7
#define ASN1_F_LONG_C2I 166
#define ASN1_F_OID_MODULE_INIT 174
#define ASN1_F_PARSE_TAGGING 182
-#define ASN1_F_PKCS5_PBE2_SET 167
+#define ASN1_F_PKCS5_PBE2_SET_IV 167
#define ASN1_F_PKCS5_PBE_SET 202
#define ASN1_F_X509_CINF_NEW 168
#define ASN1_F_X509_CRL_ADD0_REVOKED 169
.
patch -p0 <<' .'
Index: openssl/crypto/asn1/asn1_err.c
============================================================
================
$ cvs diff -u -r1.57 -r1.58 asn1_err.c
--- openssl/crypto/asn1/asn1_err.c 7 May 2006 17:09:05
-0000 1.57
+++ openssl/crypto/asn1/asn1_err.c 17 Jul 2006 16:33:22
-0000 1.58
-167,8 +167,7
{ERR_FUNC(ASN1_F_LONG_C2I), "LONG_C2I"},
{ERR_FUNC(ASN1_F_OID_MODULE_INIT), "OID_MODULE_INIT&q
uot;},
{ERR_FUNC(ASN1_F_PARSE_TAGGING), "PARSE_TAGGING"
},
-{ERR_FUNC(ASN1_F_PKCS5_PBE2_SET), "PKCS5_pbe2_set&qu
ot;},
-{ERR_FUNC(ASN1_F_PKCS5_PBE_SET), "PKCS5_PBE_SET"
;},
+{ERR_FUNC(ASN1_F_PKCS5_PBE2_SET_IV), "PKCS5_pbe2_set_
iv"},
{ERR_FUNC(ASN1_F_X509_CINF_NEW), "X509_CINF_NEW"
},
{ERR_FUNC(ASN1_F_X509_CRL_ADD0_REVOKED), "X509_CRL_ADD
0_REVOKED"},
{ERR_FUNC(ASN1_F_X509_INFO_NEW), "X509_INFO_NEW"
},
.
patch -p0 <<' .'
Index: openssl/crypto/asn1/p5_pbev2.c
============================================================
================
$ cvs diff -u -r1.25 -r1.26 p5_pbev2.c
--- openssl/crypto/asn1/p5_pbev2.c 17 May 2006 12:47:15
-0000 1.25
+++ openssl/crypto/asn1/p5_pbev2.c 17 Jul 2006 16:33:22
-0000 1.26
-101,7 +101,7
alg_nid = EVP_CIPHER_type(cipher);
if(alg_nid == NID_undef) {
- ASN1err(ASN1_F_PKCS5_PBE2_SET,
+ ASN1err(ASN1_F_PKCS5_PBE2_SET_IV,
ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER);
goto err;
}
-129,7 +129,7
/* Dummy cipherinit to just setup the IV, and PRF */
EVP_CipherInit_ex(&ctx, cipher, NULL, NULL, iv, 0);
if(EVP_CIPHER_param_to_asn1(&ctx,
scheme->parameter) < 0) {
- ASN1err(ASN1_F_PKCS5_PBE2_SET,
+ ASN1err(ASN1_F_PKCS5_PBE2_SET_IV,
ASN1_R_ERROR_SETTING_CIPHER_PARAMS);
EVP_CIPHER_CTX_cleanup(&ctx);
goto err;
-214,7 +214,7
return ret;
merr:
- ASN1err(ASN1_F_PKCS5_PBE2_SET,ERR_R_MALLOC_FAILURE);
+ ASN1err(ASN1_F_PKCS5_PBE2_SET_IV,ERR_R_MALLOC_FAILURE);
err:
PBE2PARAM_free(pbe2);
.
patch -p0 <<' .'
Index: openssl/crypto/dh/dh.h
============================================================
================
$ cvs diff -u -r1.44 -r1.45 dh.h
--- openssl/crypto/dh/dh.h 13 Apr 2006 20:16:53 -0000 1.44
+++ openssl/crypto/dh/dh.h 17 Jul 2006 16:33:23 -0000 1.45
-223,7 +223,7
/* Function codes. */
#define DH_F_COMPUTE_KEY 102
-#define DH_F_DHPARAMS_PRINT 100
+#define DH_F_DO_DH_PRINT 100
#define DH_F_DHPARAMS_PRINT_FP 101
#define DH_F_DH_BUILTIN_GENPARAMS 106
#define DH_F_DH_NEW_METHOD 105
.
patch -p0 <<' .'
Index: openssl/crypto/dh/dh_ameth.c
============================================================
================
$ cvs diff -u -r1.10 -r1.11 dh_ameth.c
--- openssl/crypto/dh/dh_ameth.c 17 Apr 2006 12:08:17
-0000 1.10
+++ openssl/crypto/dh/dh_ameth.c 17 Jul 2006 16:33:23
-0000 1.11
-381,7 +381,7
if (0)
{
err:
- DHerr(DH_F_DHPARAMS_PRINT,reason);
+ DHerr(DH_F_DO_DH_PRINT,reason);
}
if (m != NULL) OPENSSL_free(m);
return(ret);
.
patch -p0 <<' .'
Index: openssl/crypto/dh/dh_err.c
============================================================
================
$ cvs diff -u -r1.18 -r1.19 dh_err.c
--- openssl/crypto/dh/dh_err.c 13 Apr 2006 20:16:53
-0000 1.18
+++ openssl/crypto/dh/dh_err.c 17 Jul 2006 16:33:23
-0000 1.19
-71,7 +71,6
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_GENP
ARAMS"},
{ERR_FUNC(DH_F_DH_NEW_METHOD), "DH_new_method"},
-80,6 +79,7
{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_PARAMET
ERS"},
{ERR_FUNC(DH_F_PKEY_DH_DERIVE), "PKEY_DH_DERIVE"
},
.
patch -p0 <<' .'
Index: openssl/crypto/dsa/dsa.h
============================================================
================
$ cvs diff -u -r1.43 -r1.44 dsa.h
--- openssl/crypto/dsa/dsa.h 12 Apr 2006 11:14:10
-0000 1.43
+++ openssl/crypto/dsa/dsa.h 17 Jul 2006 16:33:24
-0000 1.44
-261,13 +261,13
/* Function codes. */
#define DSA_F_D2I_DSA_SIG 110
+#define DSA_F_DO_DSA_PRINT 104
#define DSA_F_DSAPARAMS_PRINT 100
#define DSA_F_DSAPARAMS_PRINT_FP 101
#define DSA_F_DSA_DO_SIGN 112
#define DSA_F_DSA_DO_VERIFY 113
#define DSA_F_DSA_NEW_METHOD 103
#define DSA_F_DSA_PARAM_DECODE 119
-#define DSA_F_DSA_PRINT 104
#define DSA_F_DSA_PRINT_FP 105
#define DSA_F_DSA_PRIV_DECODE 115
#define DSA_F_DSA_PRIV_ENCODE 116
-278,6 +278,7
#define DSA_F_DSA_SIG_NEW 109
#define DSA_F_DSA_VERIFY 108
#define DSA_F_I2D_DSA_SIG 111
+#define DSA_F_OLD_DSA_PRIV_DECODE 122
#define DSA_F_PKEY_DSA_CTRL 120
#define DSA_F_PKEY_DSA_KEYGEN 121
#define DSA_F_SIG_CB 114
.
patch -p0 <<' .'
Index: openssl/crypto/dsa/dsa_ameth.c
============================================================
================
$ cvs diff -u -r1.17 -r1.18 dsa_ameth.c
--- openssl/crypto/dsa/dsa_ameth.c 2 Jul 2006 21:13:39
-0000 1.17
+++ openssl/crypto/dsa/dsa_ameth.c 17 Jul 2006 16:33:24
-0000 1.18
-443,14 +443,6
else
ktype = "DSA-Parameters";
-#if 0
- if (x->p == NULL)
- {
- DSAerr(DSA_F_DSA_PRINT,DSA_R_MISSING_PARAMETERS);
- goto err;
- }
-#endif
-
update_buflen(x->p, &buf_len);
update_buflen(x->q, &buf_len);
update_buflen(x->g, &buf_len);
-460,7 +452,7
m=(unsigned char *)OPENSSL_malloc(buf_len+10);
if (m == NULL)
{
- DSAerr(DSA_F_DSA_PRINT,ERR_R_MALLOC_FAILURE);
+ DSAerr(DSA_F_DO_DSA_PRINT,ERR_R_MALLOC_FAILURE);
goto err;
}
-528,7 +520,7
DSA *dsa;
if (!(dsa = d2i_DSAPrivateKey (NULL, pder, derlen)))
{
- DSAerr(DSA_F_DSA_PRIV_DECODE, ERR_R_DSA_LIB);
+ DSAerr(DSA_F_OLD_DSA_PRIV_DECODE, ERR_R_DSA_LIB);
return 0;
}
EVP_PKEY_assign_DSA(pkey, dsa);
.
patch -p0 <<' .'
Index: openssl/crypto/dsa/dsa_err.c
============================================================
================
$ cvs diff -u -r1.17 -r1.18 dsa_err.c
--- openssl/crypto/dsa/dsa_err.c 12 Apr 2006 11:14:10
-0000 1.17
+++ openssl/crypto/dsa/dsa_err.c 17 Jul 2006 16:33:24
-0000 1.18
-71,13 +71,13
static ERR_STRING_DATA DSA_str_functs[]=
{
{ERR_FUNC(DSA_F_D2I_DSA_SIG), "d2i_DSA_SIG"},
+{ERR_FUNC(DSA_F_DO_DSA_PRINT), "DO_DSA_PRINT"},
{ERR_FUNC(DSA_F_DSAPARAMS_PRINT), "DSAparams_print&qu
ot;},
{ERR_FUNC(DSA_F_DSAPARAMS_PRINT_FP), "DSAparams_print_
fp"},
{ERR_FUNC(DSA_F_DSA_DO_SIGN), "DSA_do_sign"},
{ERR_FUNC(DSA_F_DSA_DO_VERIFY), "DSA_do_verify"}
,
{ERR_FUNC(DSA_F_DSA_NEW_METHOD), "DSA_new_method"
;},
{ERR_FUNC(DSA_F_DSA_PARAM_DECODE), "DSA_PARAM_DECODE&
quot;},
-{ERR_FUNC(DSA_F_DSA_PRINT), "DSA_print"},
{ERR_FUNC(DSA_F_DSA_PRINT_FP), "DSA_print_fp"},
{ERR_FUNC(DSA_F_DSA_PRIV_DECODE), "DSA_PRIV_DECODE&qu
ot;},
{ERR_FUNC(DSA_F_DSA_PRIV_ENCODE), "DSA_PRIV_ENCODE&qu
ot;},
-88,6 +88,7
{ERR_FUNC(DSA_F_DSA_SIG_NEW), "DSA_SIG_new"},
{ERR_FUNC(DSA_F_DSA_VERIFY), "DSA_verify"},
{ERR_FUNC(DSA_F_I2D_DSA_SIG), "i2d_DSA_SIG"},
+{ERR_FUNC(DSA_F_OLD_DSA_PRIV_DECODE), "OLD_DSA_PRIV_D
ECODE"},
{ERR_FUNC(DSA_F_PKEY_DSA_CTRL), "PKEY_DSA_CTRL"}
,
{ERR_FUNC(DSA_F_PKEY_DSA_KEYGEN), "PKEY_DSA_KEYGEN&qu
ot;},
{ERR_FUNC(DSA_F_SIG_CB), "SIG_CB"},
.
patch -p0 <<' .'
Index: openssl/crypto/ec/ec.h
============================================================
================
$ cvs diff -u -r1.85 -r1.86 ec.h
--- openssl/crypto/ec/ec.h 12 May 2006 15:27:45 -0000 1.85
+++ openssl/crypto/ec/ec.h 17 Jul 2006 16:33:25 -0000 1.86
-925,6 +925,7
#define EC_F_D2I_ECPARAMETERS 144
#define EC_F_D2I_ECPKPARAMETERS 145
#define EC_F_D2I_ECPRIVATEKEY 146
+#define EC_F_DO_EC_KEY_PRINT 221
#define EC_F_ECKEY_PARAM2TYPE 196
#define EC_F_ECKEY_PARAM_DECODE 212
#define EC_F_ECKEY_PRIV_DECODE 213
-1035,6 +1036,7
#define EC_F_I2D_ECPRIVATEKEY 192
#define EC_F_I2O_ECPUBLICKEY 151
#define EC_F_O2I_ECPUBLICKEY 152
+#define EC_F_OLD_EC_PRIV_DECODE 222
#define EC_F_PKEY_EC_CTRL 197
#define EC_F_PKEY_EC_CTRL_STR 198
#define EC_F_PKEY_EC_DERIVE 217
.
patch -p0 <<' .'
Index: openssl/crypto/ec/ec_ameth.c
============================================================
================
$ cvs diff -u -r1.13 -r1.14 ec_ameth.c
--- openssl/crypto/ec/ec_ameth.c 7 May 2006 17:09:06
-0000 1.13
+++ openssl/crypto/ec/ec_ameth.c 17 Jul 2006 16:33:25
-0000 1.14
-503,7 +503,7
ret=1;
err:
if (!ret)
- ECerr(EC_F_EC_KEY_PRINT, reason);
+ ECerr(EC_F_DO_EC_KEY_PRINT, reason);
if (pub_key)
BN_free(pub_key);
if (order)
-558,7 +558,7
EC_KEY *ec;
if (!(ec = d2i_ECPrivateKey (NULL, pder, derlen)))
{
- ECerr(EC_F_ECKEY_PRIV_DECODE, EC_R_DECODE_ERROR);
+ ECerr(EC_F_OLD_EC_PRIV_DECODE, EC_R_DECODE_ERROR);
return 0;
}
EVP_PKEY_assign_EC_KEY(pkey, ec);
.
patch -p0 <<' .'
Index: openssl/crypto/ec/ec_err.c
============================================================
================
$ cvs diff -u -r1.40 -r1.41 ec_err.c
--- openssl/crypto/ec/ec_err.c 16 Apr 2006 16:15:58
-0000 1.40
+++ openssl/crypto/ec/ec_err.c 17 Jul 2006 16:33:26
-0000 1.41
-74,6 +74,7
{ERR_FUNC(EC_F_D2I_ECPARAMETERS), "d2i_ECParameters&q
uot;},
{ERR_FUNC(EC_F_D2I_ECPKPARAMETERS), "d2i_ECPKParameter
s"},
{ERR_FUNC(EC_F_D2I_ECPRIVATEKEY), "d2i_ECPrivateKey&q
uot;},
+{ERR_FUNC(EC_F_DO_EC_KEY_PRINT), "DO_EC_KEY_PRINT&qu
ot;},
{ERR_FUNC(EC_F_ECKEY_PARAM2TYPE), "ECKEY_PARAM2TYPE&q
uot;},
{ERR_FUNC(EC_F_ECKEY_PARAM_DECODE), "ECKEY_PARAM_DECOD
E"},
{ERR_FUNC(EC_F_ECKEY_PRIV_DECODE), "ECKEY_PRIV_DECODE
"},
-184,6 +185,7
{ERR_FUNC(EC_F_I2D_ECPRIVATEKEY), "i2d_ECPrivateKey&q
uot;},
{ERR_FUNC(EC_F_I2O_ECPUBLICKEY), "i2o_ECPublicKey&quo
t;},
{ERR_FUNC(EC_F_O2I_ECPUBLICKEY), "o2i_ECPublicKey&quo
t;},
+{ERR_FUNC(EC_F_OLD_EC_PRIV_DECODE), "OLD_EC_PRIV_DECO
DE"},
{ERR_FUNC(EC_F_PKEY_EC_CTRL), "PKEY_EC_CTRL"},
{ERR_FUNC(EC_F_PKEY_EC_CTRL_STR), "PKEY_EC_CTRL_STR&q
uot;},
{ERR_FUNC(EC_F_PKEY_EC_DERIVE), "PKEY_EC_DERIVE"
},
.
patch -p0 <<' .'
Index: openssl/crypto/evp/evp.h
============================================================
================
$ cvs diff -u -r1.166 -r1.167 evp.h
--- openssl/crypto/evp/evp.h 12 Jul 2006 12:31:28
-0000 1.166
+++ openssl/crypto/evp/evp.h 17 Jul 2006 16:33:26
-0000 1.167
-1142,6 +1142,7
#define EVP_F_EVP_MD_CTX_COPY_EX 110
#define EVP_F_EVP_OPENINIT 102
#define EVP_F_EVP_PBE_ALG_ADD 115
+#define EVP_F_EVP_PBE_ALG_ADD_TYPE 160
#define EVP_F_EVP_PBE_CIPHERINIT 116
#define EVP_F_EVP_PKCS82PKEY 111
#define EVP_F_EVP_PKCS82PKEY_BROKEN 136
.
patch -p0 <<' .'
Index: openssl/crypto/evp/evp_err.c
============================================================
================
$ cvs diff -u -r1.41 -r1.42 evp_err.c
--- openssl/crypto/evp/evp_err.c 9 Jun 2006 15:44:41
-0000 1.41
+++ openssl/crypto/evp/evp_err.c 17 Jul 2006 16:33:27
-0000 1.42
-86,6 +86,7
{ERR_FUNC(EVP_F_EVP_MD_CTX_COPY_EX), "EVP_MD_CTX_copy_
ex"},
{ERR_FUNC(EVP_F_EVP_OPENINIT), "EVP_OpenInit"},
{ERR_FUNC(EVP_F_EVP_PBE_ALG_ADD), "EVP_PBE_alg_add&qu
ot;},
+{ERR_FUNC(EVP_F_EVP_PBE_ALG_ADD_TYPE), "EVP_PBE_alg_a
dd_type"},
{ERR_FUNC(EVP_F_EVP_PBE_CIPHERINIT), "EVP_PBE_CipherIn
it"},
{ERR_FUNC(EVP_F_EVP_PKCS82PKEY), "EVP_PKCS82PKEY"
;},
{ERR_FUNC(EVP_F_EVP_PKCS82PKEY_BROKEN), "EVP_PKCS82PKE
Y_BROKEN"},
.
patch -p0 <<' .'
Index: openssl/crypto/evp/evp_pbe.c
============================================================
================
$ cvs diff -u -r1.22 -r1.23 evp_pbe.c
--- openssl/crypto/evp/evp_pbe.c 17 May 2006 12:27:42
-0000 1.22
+++ openssl/crypto/evp/evp_pbe.c 17 Jul 2006 16:33:28
-0000 1.23
-220,7 +220,7
pbe_algs = sk_new(pbe_cmp);
if (!(pbe_tmp = (EVP_PBE_CTL*) OPENSSL_malloc
(sizeof(EVP_PBE_CTL))))
{
- EVPerr(EVP_F_EVP_PBE_ALG_ADD,ERR_R_MALLOC_FAILURE);
+ EVPerr(EVP_F_EVP_PBE_ALG_ADD_TYPE,ERR_R_MALLOC_FAILURE);
return 0;
}
pbe_tmp->pbe_type = pbe_type;
.
patch -p0 <<' .'
Index: openssl/crypto/evp/pmeth_fn.c
============================================================
================
$ cvs diff -u -r1.9 -r1.10 pmeth_fn.c
--- openssl/crypto/evp/pmeth_fn.c 24 May 2006 12:33:44
-0000 1.9
+++ openssl/crypto/evp/pmeth_fn.c 17 Jul 2006 16:33:28
-0000 1.10
-74,7 +74,7
} \
else if (*arglen < pksize) \
{ \
- EVPerr(err, EVP_R_BUFFER_TOO_SMALL); \
+ EVPerr(err, EVP_R_BUFFER_TOO_SMALL);
/*ckerr_ignore*/\
return 0; \
} \
}
.
patch -p0 <<' .'
Index: openssl/crypto/ocsp/ocsp.h
============================================================
================
$ cvs diff -u -r1.35 -r1.36 ocsp.h
--- openssl/crypto/ocsp/ocsp.h 17 Jul 2006 12:18:28
-0000 1.35
+++ openssl/crypto/ocsp/ocsp.h 17 Jul 2006 16:33:28
-0000 1.36
-574,6 +574,7
#define OCSP_F_OCSP_CHECK_ISSUER 108
#define OCSP_F_OCSP_CHECK_VALIDITY 115
#define OCSP_F_OCSP_MATCH_ISSUERID 109
+#define OCSP_F_PARSE_HTTP_LINE1 118
#define OCSP_F_OCSP_PARSE_URL 114
#define OCSP_F_OCSP_REQUEST_SIGN 110
#define OCSP_F_OCSP_REQUEST_VERIFY 116
.
patch -p0 <<' .'
Index: openssl/crypto/ocsp/ocsp_err.c
============================================================
================
$ cvs diff -u -r1.17 -r1.18 ocsp_err.c
--- openssl/crypto/ocsp/ocsp_err.c 17 Jul 2006 12:18:28
-0000 1.17
+++ openssl/crypto/ocsp/ocsp_err.c 17 Jul 2006 16:33:28
-0000 1.18
-87,6 +87,7
{ERR_FUNC(OCSP_F_OCSP_RESPONSE_GET1_BASIC), "OCSP_resp
onse_get1_basic"},
{ERR_FUNC(OCSP_F_OCSP_SENDREQ_BIO), "OCSP_sendreq_bio
"},
{ERR_FUNC(OCSP_F_OCSP_SENDREQ_NBIO), "OCSP_sendreq_nbi
o"},
+{ERR_FUNC(OCSP_F_PARSE_HTTP_LINE1), "PARSE_HTTP_LINE1
"},
{ERR_FUNC(OCSP_F_REQUEST_VERIFY), "REQUEST_VERIFY&quo
t;},
{0,NULL}
};
.
patch -p0 <<' .'
Index: openssl/crypto/ocsp/ocsp_ht.c
============================================================
================
$ cvs diff -u -r1.7 -r1.8 ocsp_ht.c
--- openssl/crypto/ocsp/ocsp_ht.c 17 Jul 2006 12:18:28
-0000 1.7
+++ openssl/crypto/ocsp/ocsp_ht.c 17 Jul 2006 16:33:28
-0000 1.8
-169,7 +169,7
continue;
if(!*p)
{
- OCSPerr(OCSP_F_OCSP_SENDREQ_NBIO,
+ OCSPerr(OCSP_F_PARSE_HTTP_LINE1,
OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
return 0;
}
-180,7 +180,7
if(!*p)
{
- OCSPerr(OCSP_F_OCSP_SENDREQ_NBIO,
+ OCSPerr(OCSP_F_PARSE_HTTP_LINE1,
OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
return 0;
}
-191,7 +191,7
if(!*q)
{
- OCSPerr(OCSP_F_OCSP_SENDREQ_NBIO,
+ OCSPerr(OCSP_F_PARSE_HTTP_LINE1,
OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
return 0;
}
-220,7 +220,7
}
if(retcode != 200)
{
- OCSPerr(OCSP_F_OCSP_SENDREQ_NBIO,
OCSP_R_SERVER_RESPONSE_ERROR);
+ OCSPerr(OCSP_F_PARSE_HTTP_LINE1,
OCSP_R_SERVER_RESPONSE_ERROR);
if(!*q)
ERR_add_error_data(2, "Code=", p);
else
.
patch -p0 <<' .'
Index: openssl/crypto/rsa/rsa.h
============================================================
================
$ cvs diff -u -r1.70 -r1.71 rsa.h
--- openssl/crypto/rsa/rsa.h 11 May 2006 21:33:00
-0000 1.70
+++ openssl/crypto/rsa/rsa.h 17 Jul 2006 16:33:30
-0000 1.71
-371,7 +371,10
/* Function codes. */
#define RSA_F_CHECK_PADDING_MD 140
+#define RSA_F_DO_RSA_PRINT 146
+#define RSA_F_RSA_VERIFY 119
#define RSA_F_MEMORY_LOCK 100
+#define RSA_F_OLD_RSA_PRIV_DECODE 147
#define RSA_F_PKEY_RSA_CTRL 143
#define RSA_F_PKEY_RSA_CTRL_STR 144
#define RSA_F_PKEY_RSA_SIGN 142
-412,7 +415,7
#define RSA_F_RSA_SETUP_BLINDING 136
#define RSA_F_RSA_SIGN 117
#define RSA_F_RSA_SIGN_ASN1_OCTET_STRING 118
-#define RSA_F_RSA_VERIFY 119
+#define RSA_F_INT_RSA_VERIFY 145
#define RSA_F_RSA_VERIFY_ASN1_OCTET_STRING 120
#define RSA_F_RSA_VERIFY_PKCS1_PSS 126
.
patch -p0 <<' .'
Index: openssl/crypto/rsa/rsa_ameth.c
============================================================
================
$ cvs diff -u -r1.12 -r1.13 rsa_ameth.c
--- openssl/crypto/rsa/rsa_ameth.c 7 May 2006 17:09:39
-0000 1.12
+++ openssl/crypto/rsa/rsa_ameth.c 17 Jul 2006 16:33:30
-0000 1.13
-108,7 +108,7
RSA *rsa;
if (!(rsa = d2i_RSAPrivateKey (NULL, pder, derlen)))
{
- RSAerr(RSA_F_RSA_PRIV_DECODE, ERR_R_RSA_LIB);
+ RSAerr(RSA_F_OLD_RSA_PRIV_DECODE, ERR_R_RSA_LIB);
return 0;
}
EVP_PKEY_assign_RSA(pkey, rsa);
-200,7 +200,7
m=(unsigned char *)OPENSSL_malloc(buf_len+10);
if (m == NULL)
{
- RSAerr(RSA_F_RSA_PRINT,ERR_R_MALLOC_FAILURE);
+ RSAerr(RSA_F_DO_RSA_PRINT,ERR_R_MALLOC_FAILURE);
goto err;
}
.
patch -p0 <<' .'
Index: openssl/crypto/rsa/rsa_err.c
============================================================
================
$ cvs diff -u -r1.24 -r1.25 rsa_err.c
--- openssl/crypto/rsa/rsa_err.c 11 May 2006 21:33:00
-0000 1.24
+++ openssl/crypto/rsa/rsa_err.c 17 Jul 2006 16:33:30
-0000 1.25
-71,7 +71,10
static ERR_STRING_DATA RSA_str_functs[]=
{
{ERR_FUNC(RSA_F_CHECK_PADDING_MD), "CHECK_PADDING_MD&
quot;},
+{ERR_FUNC(RSA_F_DO_RSA_PRINT), "DO_RSA_PRINT"},
+{ERR_FUNC(RSA_F_INT_RSA_VERIFY), "INT_RSA_VERIFY&quo
t;},
{ERR_FUNC(RSA_F_MEMORY_LOCK), "MEMORY_LOCK"},
+{ERR_FUNC(RSA_F_OLD_RSA_PRIV_DECODE), "OLD_RSA_PRIV_D
ECODE"},
{ERR_FUNC(RSA_F_PKEY_RSA_CTRL), "PKEY_RSA_CTRL"}
,
{ERR_FUNC(RSA_F_PKEY_RSA_CTRL_STR), "PKEY_RSA_CTRL_STR
"},
{ERR_FUNC(RSA_F_PKEY_RSA_SIGN), "PKEY_RSA_SIGN"}
,
.
patch -p0 <<' .'
Index: openssl/crypto/rsa/rsa_sign.c
============================================================
================
$ cvs diff -u -r1.24 -r1.25 rsa_sign.c
--- openssl/crypto/rsa/rsa_sign.c 10 Apr 2006 01:06:14
-0000 1.24
+++ openssl/crypto/rsa/rsa_sign.c 17 Jul 2006 16:33:30
-0000 1.25
-153,7 +153,7
if (siglen != (unsigned int)RSA_size(rsa))
{
- RSAerr(RSA_F_RSA_VERIFY,RSA_R_WRONG_SIGNATURE_LENGTH);
+ RSAerr(RSA_F_INT_RSA_VERIFY,RSA_R_WRONG_SIGNATURE_LENGTH)
;
return(0);
}
-170,11 +170,11
s=(unsigned char *)OPENSSL_malloc((unsigned int)siglen);
if (s == NULL)
{
- RSAerr(RSA_F_RSA_VERIFY,ERR_R_MALLOC_FAILURE);
+ RSAerr(RSA_F_INT_RSA_VERIFY,ERR_R_MALLOC_FAILURE);
goto err;
}
if((dtype == NID_md5_sha1) && (m_len !=
SSL_SIG_LENGTH) ) {
- RSAerr(RSA_F_RSA_VERIFY,RSA_R_INVALID_MESSAGE_LENGTH);
+ RSAerr(RSA_F_INT_RSA_VERIFY,RSA_R_INVALID_MESSAGE_LENGTH
);
goto err;
}
i=RSA_public_decrypt((int)siglen,sigbuf,s,rsa,RSA_PKCS1_PAD
DING);
-184,7 +184,7
/* Special case: SSL signature */
if(dtype == NID_md5_sha1) {
if((i != SSL_SIG_LENGTH) || memcmp(s, m,
SSL_SIG_LENGTH))
- RSAerr(RSA_F_RSA_VERIFY,RSA_R_BAD_SIGNATURE);
+ RSAerr(RSA_F_INT_RSA_VERIFY,RSA_R_BAD_SIGNATURE);
else ret = 1;
} else {
const unsigned char *p=s;
-213,7 +213,7
}
else
{
- RSAerr(RSA_F_RSA_VERIFY,
+ RSAerr(RSA_F_INT_RSA_VERIFY,
RSA_R_ALGORITHM_MISMATCH);
goto err;
}
-223,7 +223,7
const EVP_MD *md;
md = EVP_get_digestbynid(dtype);
if (md && (EVP_MD_size(md) !=
sig->digest->length))
- RSAerr(RSA_F_RSA_VERIFY,
+ RSAerr(RSA_F_INT_RSA_VERIFY,
RSA_R_INVALID_DIGEST_LENGTH);
else
{
-236,7 +236,7
else if (((unsigned int)sig->digest->length !=
m_len) ||
(memcmp(m,sig->digest->data,m_len) != 0))
{
- RSAerr(RSA_F_RSA_VERIFY,RSA_R_BAD_SIGNATURE);
+ RSAerr(RSA_F_INT_RSA_VERIFY,RSA_R_BAD_SIGNATURE);
}
else
ret=1;
.
patch -p0 <<' .'
Index: openssl/util/ck_errf.pl
============================================================
================
$ cvs diff -u -r1.5 -r1.6 ck_errf.pl
--- openssl/util/ck_errf.pl 11 May 2005 03:45:39 -0000 1.5
+++ openssl/util/ck_errf.pl 17 Jul 2006 16:33:31 -0000 1.6
-20,7 +20,7
$func = $1;
$func =~ tr/A-Z/a-z/;
}
- if (/([A-Z0-9]+)err\(([^,]+)/)
+ if (/([A-Z0-9]+)err\(([^,]+)/ && !
/ckerr_ignore/)
{
$errlib=$1;
$n=$2;
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|