[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: openssl/ssl/ ssl.h ssl_err.c
From:       "Dr. Stephen Henson" <steve () openssl ! org>
Date:       2007-10-26 23:54:46
Message-ID: 20071026235446.ADCF51EAE848 () master ! openssl ! org
[Download RAW message or body]

  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:   27-Oct-2007 01:54:46
  Branch: HEAD                             Handle: 2007102700544600

  Modified files:
    openssl/ssl             ssl.h ssl_err.c

  Log:
    Fix duplicate error codes.

  Summary:
    Revision    Changes     Path
    1.204       +4  -7      openssl/ssl/ssl.h
    1.72        +3  -9      openssl/ssl/ssl_err.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/ssl/ssl.h
  ============================================================================
  $ cvs diff -u -r1.203 -r1.204 ssl.h
  --- openssl/ssl/ssl.h	26 Oct 2007 12:06:35 -0000	1.203
  +++ openssl/ssl/ssl.h	26 Oct 2007 23:54:46 -0000	1.204
  @@ -1801,7 +1801,7 @@
   #define SSL_F_SSL3_ENC					 134
   #define SSL_F_SSL3_GENERATE_KEY_BLOCK			 238
   #define SSL_F_SSL3_GET_CERTIFICATE_REQUEST		 135
  -#define SSL_F_SSL3_GET_CERT_STATUS			 288
  +#define SSL_F_SSL3_GET_CERT_STATUS			 289
   #define SSL_F_SSL3_GET_CERT_VERIFY			 136
   #define SSL_F_SSL3_GET_CLIENT_CERTIFICATE		 137
   #define SSL_F_SSL3_GET_CLIENT_HELLO			 138
  @@ -1920,10 +1920,7 @@
   #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
  @@ -2050,6 +2047,7 @@
   #define SSL_R_NO_CIPHER_MATCH				 185
   #define SSL_R_NO_CLIENT_CERT_RECEIVED			 186
   #define SSL_R_NO_COMPRESSION_SPECIFIED			 187
  +#define SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER		 330
   #define SSL_R_NO_METHOD_SPECIFIED			 188
   #define SSL_R_NO_PRIVATEKEY				 189
   #define SSL_R_NO_PRIVATE_KEY_ASSIGNED			 190
  @@ -2183,8 +2181,7 @@
   #define SSL_R_WRONG_VERSION_NUMBER			 267
   #define SSL_R_X509_LIB					 268
   #define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS		 269
  -#define SSL_R_NO_REQUIRED_DIGEST 324
  -#define SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER 330
  +
   #ifdef  __cplusplus
   }
   #endif
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/ssl/ssl_err.c
  ============================================================================
  $ cvs diff -u -r1.71 -r1.72 ssl_err.c
  --- openssl/ssl/ssl_err.c	26 Oct 2007 12:06:35 -0000	1.71
  +++ openssl/ssl/ssl_err.c	26 Oct 2007 23:54:46 -0000	1.72
  @@ -251,19 +251,15 @@
   {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE),	"SSL_use_RSAPrivateKey_file"},
   {ERR_FUNC(SSL_F_SSL_VERIFY_CERT_CHAIN),	"SSL_VERIFY_CERT_CHAIN"},
   {ERR_FUNC(SSL_F_SSL_WRITE),	"SSL_write"},
  -{ERR_FUNC(SSL_F_TLS1_CERT_VERIFY_MAC),	"TLS1_CERT_VERIFY_MAC"},
  +{ERR_FUNC(SSL_F_TLS1_CERT_VERIFY_MAC),	"tls1_cert_verify_mac"},
   {ERR_FUNC(SSL_F_TLS1_CHANGE_CIPHER_STATE),	"TLS1_CHANGE_CIPHER_STATE"},
   {ERR_FUNC(SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT),	"TLS1_CHECK_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_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_finish_mac"},
  -{ERR_FUNC(SSL_F_TLS1_PRF),"tls1_prf"},
  -{ERR_FUNC(SSL_F_SSL3_HANDSHAKE_MAC),"ssl3_handshake_mac"},
  -{ERR_FUNC(SSL_F_TLS1_CERT_VERIFY_MAC),"tls1_cert_verify_mac"},
   {0,NULL}
   	};
   
  @@ -394,6 +390,7 @@
   {ERR_REASON(SSL_R_NO_CIPHER_MATCH)       ,"no cipher match"},
   {ERR_REASON(SSL_R_NO_CLIENT_CERT_RECEIVED),"no client cert received"},
   {ERR_REASON(SSL_R_NO_COMPRESSION_SPECIFIED),"no compression specified"},
  +{ERR_REASON(SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER),"Peer haven't sent GOST \
certificate, required for selected ciphersuite"},  \
{ERR_REASON(SSL_R_NO_METHOD_SPECIFIED)   ,"no method specified"},  \
{ERR_REASON(SSL_R_NO_PRIVATEKEY)         ,"no privatekey"},  \
{ERR_REASON(SSL_R_NO_PRIVATE_KEY_ASSIGNED),"no private key assigned"},  @@ -527,9 \
+524,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),"x509 verification setup \
                problems"},
  -{ERR_REASON(SSL_R_UNSUPPORTED_DIGEST_TYPE),"unsupported digest type"},
  -{ERR_REASON(SSL_R_NO_REQUIRED_DIGEST),"digest requred for handshake isn't \
                computed"},
  -{ERR_REASON(SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER),"Peer haven't sent GOST \
certificate, required for selected ciphersuite"},  {0,NULL}
   	};
   
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org


[prev in list] [next in list] [prev in thread] [next in thread]