OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Bodo
Moeller
Root: /v/openssl/cvs Email: bodo openssl.org
Module: openssl Date:
19-Sep-2007 02:58:58
Branch: HEAD Handle:
2007091901585602
Modified files:
openssl/engines/ccgost Makefile e_gost_err.h
openssl/ssl ssl.h ssl_err.c
Log:
Clean up error codes a bit.
(engines/ccgost/ remains utter chaos, though; "make
errors" is not happy.)
Summary:
Revision Changes Path
1.6 +1 -1 openssl/engines/ccgost/Makefile
1.4 +2 -2
openssl/engines/ccgost/e_gost_err.h
1.198 +7 -8 openssl/ssl/ssl.h
1.66 +5 -7 openssl/ssl/ssl_err.c
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/engines/ccgost/Makefile
============================================================
================
$ cvs diff -u -r1.5 -r1.6 Makefile
--- openssl/engines/ccgost/Makefile 18 May 2007 15:55:54
-0000 1.5
+++ openssl/engines/ccgost/Makefile 19 Sep 2007 00:58:58
-0000 1.6
-25,7 +25,7
ctags $(SRC)
errors:
- $(PERL) ../../util/mkerr.pl -conf gost.ec -nostatic
-debug -write $(SRC)
+ $(PERL) ../../util/mkerr.pl -conf gost.ec -nostatic
-write $(SRC)
lib: $(LIBOBJ)
if [ -n "$(SHARED_LIBS)" ]; then
.
patch -p0 <<' .'
Index: openssl/engines/ccgost/e_gost_err.h
============================================================
================
$ cvs diff -u -r1.3 -r1.4 e_gost_err.h
--- openssl/engines/ccgost/e_gost_err.h 18 May 2007
15:55:54 -0000 1.3
+++ openssl/engines/ccgost/e_gost_err.h 19 Sep 2007
00:58:58 -0000 1.4
-70,7 +70,7
#define GOST_F_DECODE_GOST_ALGOR_PARAMS 131
#define GOST_F_DECRYPT_CRYPTOCOM_KEY 120
#define GOST_F_ENCODE_GOST_ALGOR_PARAMS 130
-#define GOST_F_FILL_GOST2001_PARAMS 99
+#define GOST_F_FILL_GOST2001_PARAMS 144
#define GOST_F_FILL_GOST94_PARAMS 100
#define GOST_F_GET_ENCRYPTION_PARAMS 101
#define GOST_F_GOST2001_COMPUTE_PUBLIC 102
-126,7 +126,7
#define GOST_R_ERROR_STORING_IV 121
#define GOST_R_ERROR_STORING_MAC 122
#define GOST_R_INCOMPATIBLE_ALGORITHMS 130
-#define GOST_R_INVALID_CIPHER_PARAMS 99
+#define GOST_R_INVALID_CIPHER_PARAMS 136
#define GOST_R_INVALID_CIPHER_PARAM_OID 100
#define GOST_R_INVALID_DIGEST_TYPE 101
#define GOST_R_INVALID_ENCRYPTED_KEY_SIZE 123
.
patch -p0 <<' .'
Index: openssl/ssl/ssl.h
============================================================
================
$ cvs diff -u -r1.197 -r1.198 ssl.h
--- openssl/ssl/ssl.h 31 Aug 2007 12:42:51 -0000 1.197
+++ openssl/ssl/ssl.h 19 Sep 2007 00:58:56 -0000 1.198
-1765,7 +1765,7
#define SSL_F_SSL3_GET_SERVER_CERTIFICATE 144
#define SSL_F_SSL3_GET_SERVER_DONE 145
#define SSL_F_SSL3_GET_SERVER_HELLO 146
-#define SSL_F_SSL3_NEW_SESSION_TICKET 284
+#define SSL_F_SSL3_HANDSHAKE_MAC 285
#define SSL_F_SSL3_OUTPUT_CERT_CHAIN 147
#define SSL_F_SSL3_PEEK 235
#define SSL_F_SSL3_READ_BYTES 148
-1861,17 +1861,16
#define SSL_F_SSL_USE_RSAPRIVATEKEY_FILE 206
#define SSL_F_SSL_VERIFY_CERT_CHAIN 207
#define SSL_F_SSL_WRITE 208
+#define SSL_F_TLS1_CERT_VERIFY_MAC 286
#define SSL_F_TLS1_CHANGE_CIPHER_STATE 209
#define SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT 274
#define SSL_F_TLS1_ENC 210
#define SSL_F_TLS1_PREPARE_CLIENTHELLO_TLSEXT 275
#define SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT 276
+#define SSL_F_TLS1_PRF 284
#define SSL_F_TLS1_SETUP_KEY_BLOCK 211
#define SSL_F_WRITE_PENDING 212
-#define SSL_F_TLS1_FINAL_FINISH_MAC 283
-#define SSL_F_TLS1_PRF 284
-#define SSL_F_SSL3_HANDSHAKE_MAC 285
-#define SSL_F_TLS1_CERT_VERIFY_MAC 286
+
/* Reason codes. */
#define SSL_R_APP_DATA_IN_HANDSHAKE 100
#define
SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272
-1951,7 +1950,7
#define SSL_R_INVALID_CHALLENGE_LENGTH 158
#define SSL_R_INVALID_COMMAND 280
#define SSL_R_INVALID_PURPOSE 278
-#define SSL_R_INVALID_TICKET_KEYS_LENGTH 324
+#define SSL_R_INVALID_TICKET_KEYS_LENGTH 325
#define SSL_R_INVALID_TRUST 279
#define SSL_R_KEY_ARG_TOO_LONG 284
#define SSL_R_KRB5 285
-2002,6 +2001,7
#define SSL_R_NO_PRIVATE_KEY_ASSIGNED 190
#define SSL_R_NO_PROTOCOLS_AVAILABLE 191
#define SSL_R_NO_PUBLICKEY 192
+#define SSL_R_NO_REQUIRED_DIGEST 324
#define SSL_R_NO_SHARED_CIPHER 193
#define SSL_R_NO_VERIFY_CALLBACK 194
#define SSL_R_NULL_SSL_CTX 195
-2113,6 +2113,7
#define SSL_R_UNKNOWN_STATE 255
#define SSL_R_UNSUPPORTED_CIPHER 256
#define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+#define SSL_R_UNSUPPORTED_DIGEST_TYPE 326
#define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
#define SSL_R_UNSUPPORTED_PROTOCOL 258
#define SSL_R_UNSUPPORTED_SSL_VERSION 259
-2126,8 +2127,6
#define SSL_R_WRONG_VERSION_NUMBER 267
#define SSL_R_X509_LIB 268
#define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS 269
-#define SSL_R_UNSUPPORTED_DIGEST_TYPE 270
-#define SSL_R_NO_REQUIRED_DIGEST 324
#ifdef __cplusplus
}
.
patch -p0 <<' .'
Index: openssl/ssl/ssl_err.c
============================================================
================
$ cvs diff -u -r1.65 -r1.66 ssl_err.c
--- openssl/ssl/ssl_err.c 31 Aug 2007 12:42:51 -0000 1.65
+++ openssl/ssl/ssl_err.c 19 Sep 2007 00:58:56 -0000 1.66
-152,7 +152,7
{ERR_FUNC(SSL_F_SSL3_GET_SERVER_CERTIFICATE), "SSL3_GET
_SERVER_CERTIFICATE"},
{ERR_FUNC(SSL_F_SSL3_GET_SERVER_DONE), "SSL3_GET_SERVER
_DONE"},
{ERR_FUNC(SSL_F_SSL3_GET_SERVER_HELLO), "SSL3_GET_SERVE
R_HELLO"},
-{ERR_FUNC(SSL_F_SSL3_NEW_SESSION_TICKET), "SSL3_NEW_SE
SSION_TICKET"},
+{ERR_FUNC(SSL_F_SSL3_HANDSHAKE_MAC), "ssl3_handshake_m
ac"},
{ERR_FUNC(SSL_F_SSL3_OUTPUT_CERT_CHAIN), "SSL3_OUTPUT_C
ERT_CHAIN"},
{ERR_FUNC(SSL_F_SSL3_PEEK), "SSL3_PEEK"},
{ERR_FUNC(SSL_F_SSL3_READ_BYTES), "SSL3_READ_BYTES"
;},
-248,17 +248,15
{ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE), "SSL_use_R
SAPrivateKey_file"},
{ERR_FUNC(SSL_F_SSL_VERIFY_CERT_CHAIN), "SSL_VERIFY_CER
T_CHAIN"},
{ERR_FUNC(SSL_F_SSL_WRITE), "SSL_write"},
+{ERR_FUNC(SSL_F_TLS1_CERT_VERIFY_MAC), "tls1_cert_veri
fy_mac"},
{ERR_FUNC(SSL_F_TLS1_CHANGE_CIPHER_STATE), "TLS1_CHANGE
_CIPHER_STATE"},
{ERR_FUNC(SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT), "TLS1_C
HECK_SERVERHELLO_TLSEXT"},
{ERR_FUNC(SSL_F_TLS1_ENC), "TLS1_ENC"},
{ERR_FUNC(SSL_F_TLS1_PREPARE_CLIENTHELLO_TLSEXT), "TLS1
_PREPARE_CLIENTHELLO_TLSEXT"},
{ERR_FUNC(SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT), "TLS1
_PREPARE_SERVERHELLO_TLSEXT"},
+{ERR_FUNC(SSL_F_TLS1_PRF), "tls1_prf"},
{ERR_FUNC(SSL_F_TLS1_SETUP_KEY_BLOCK), "TLS1_SETUP_KEY_
BLOCK"},
{ERR_FUNC(SSL_F_WRITE_PENDING), "WRITE_PENDING"},
-{ERR_FUNC(SSL_F_TLS1_FINAL_FINISH_MAC),"tls1_final_fin
ish_mac"},
-{ERR_FUNC(SSL_F_TLS1_PRF),"tls1_prf"},
-{ERR_FUNC(SSL_F_SSL3_HANDSHAKE_MAC),"ssl3_handshake_ma
c"},
-{ERR_FUNC(SSL_F_TLS1_CERT_VERIFY_MAC),"tls1_cert_verif
y_mac"},
{0,NULL}
};
-393,6 +391,7
{ERR_REASON(SSL_R_NO_PRIVATE_KEY_ASSIGNED),"no
private key assigned"},
{ERR_REASON(SSL_R_NO_PROTOCOLS_AVAILABLE),"no
protocols available"},
{ERR_REASON(SSL_R_NO_PUBLICKEY) ,"no
publickey"},
+{ERR_REASON(SSL_R_NO_REQUIRED_DIGEST) ,"digest
requred for handshake isn't computed"},
{ERR_REASON(SSL_R_NO_SHARED_CIPHER) ,"no shared
cipher"},
{ERR_REASON(SSL_R_NO_VERIFY_CALLBACK) ,"no verify
callback"},
{ERR_REASON(SSL_R_NULL_SSL_CTX) ,"null ssl
ctx"},
-504,6 +503,7
{ERR_REASON(SSL_R_UNKNOWN_STATE) ,"unknown
state"},
{ERR_REASON(SSL_R_UNSUPPORTED_CIPHER)
,"unsupported cipher"},
{ERR_REASON(SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM),"u
nsupported compression algorithm"},
+{ERR_REASON(SSL_R_UNSUPPORTED_DIGEST_TYPE),"unsupporte
d digest type"},
{ERR_REASON(SSL_R_UNSUPPORTED_ELLIPTIC_CURVE),"unsuppor
ted elliptic curve"},
{ERR_REASON(SSL_R_UNSUPPORTED_PROTOCOL)
,"unsupported protocol"},
{ERR_REASON(SSL_R_UNSUPPORTED_SSL_VERSION),"unsupported
ssl version"},
-517,8 +517,6
{ERR_REASON(SSL_R_WRONG_VERSION_NUMBER) ,"wrong
version number"},
{ERR_REASON(SSL_R_X509_LIB) ,"x509
lib"},
{ERR_REASON(SSL_R_X509_VERIFICATION_SETUP_PROBLEMS),"x5
09 verification setup problems"},
-{ERR_REASON(SSL_R_UNSUPPORTED_DIGEST_TYPE),"unsupporte
d digest type"},
-{ERR_REASON(SSL_R_NO_REQUIRED_DIGEST),"digest
requred for handshake isn't computed"},
{0,NULL}
};
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|
