emboss	2011-11-24 08:15:09 +0900 (Thu, 24 Nov 2011)

  New Revision: 33821

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33821

  Log:
    * ext/openssl/ossl_pkey_dsa.c: remove redundant colon from error
      message.
    * ext/openssl/ossl_ssl.c: ditto.
    * ext/openssl/ossl_pkey_rsa: ditto.
    [Bug #5604] [ruby-core:40896]

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_pkey_dsa.c
    trunk/ext/openssl/ossl_pkey_rsa.c
    trunk/ext/openssl/ossl_ssl.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33820)
+++ ChangeLog	(revision 33821)
@@ -1,3 +1,11 @@
+Thu Nov 24 08:05:02 2011  Martin Bosslet  <Martin.Bosslet@g...>
+
+	* ext/openssl/ossl_pkey_dsa.c: remove redundant colon from error
+	  message.
+	* ext/openssl/ossl_ssl.c: ditto.
+	* ext/openssl/ossl_pkey_rsa: ditto.
+	[Bug #5604] [ruby-core:40896]
+
 Wed Nov 23 20:03:43 2011  NARUSE, Yui  <naruse@r...>
 
 	* io.c (ioctl_narg_len): don't use _IOC_SIZE macro on Linux.
Index: ext/openssl/ossl_pkey_dsa.c
===================================================================
--- ext/openssl/ossl_pkey_dsa.c	(revision 33820)
+++ ext/openssl/ossl_pkey_dsa.c	(revision 33821)
@@ -244,7 +244,7 @@
 	BIO_free(in);
 	if (!dsa) {
 	    ERR_clear_error();
-	    ossl_raise(eDSAError, "Neither PUB key nor PRIV key:");
+	    ossl_raise(eDSAError, "Neither PUB key nor PRIV key");
 	}
     }
     if (!EVP_PKEY_assign_DSA(pkey, dsa)) {
Index: ext/openssl/ossl_ssl.c
===================================================================
--- ext/openssl/ossl_ssl.c	(revision 33820)
+++ ext/openssl/ossl_ssl.c	(revision 33821)
@@ -148,7 +148,7 @@
 
     ctx = SSL_CTX_new(SSLv23_method());
     if (!ctx) {
-        ossl_raise(eSSLError, "SSL_CTX_new:");
+        ossl_raise(eSSLError, "SSL_CTX_new");
     }
     SSL_CTX_set_mode(ctx, mode);
     SSL_CTX_set_options(ctx, SSL_OP_ALL);
@@ -185,7 +185,7 @@
     }
     Data_Get_Struct(self, SSL_CTX, ctx);
     if (SSL_CTX_set_ssl_version(ctx, method) != 1) {
-        ossl_raise(eSSLError, "SSL_CTX_set_ssl_version:");
+        ossl_raise(eSSLError, "SSL_CTX_set_ssl_version");
     }
 
     return ssl_method;
@@ -590,14 +590,14 @@
     if (cert && key) {
         if (!SSL_CTX_use_certificate(ctx, cert)) {
             /* Adds a ref => Safe to FREE */
-            ossl_raise(eSSLError, "SSL_CTX_use_certificate:");
+            ossl_raise(eSSLError, "SSL_CTX_use_certificate");
         }
         if (!SSL_CTX_use_PrivateKey(ctx, key)) {
             /* Adds a ref => Safe to FREE */
-            ossl_raise(eSSLError, "SSL_CTX_use_PrivateKey:");
+            ossl_raise(eSSLError, "SSL_CTX_use_PrivateKey");
         }
         if (!SSL_CTX_check_private_key(ctx)) {
-            ossl_raise(eSSLError, "SSL_CTX_check_private_key:");
+            ossl_raise(eSSLError, "SSL_CTX_check_private_key");
         }
     }
 
@@ -651,7 +651,7 @@
 	StringValue(val);
 	if (!SSL_CTX_set_session_id_context(ctx, (unsigned char *)RSTRING_PTR(val),
 					    RSTRING_LENINT(val))){
-	    ossl_raise(eSSLError, "SSL_CTX_set_session_id_context:");
+	    ossl_raise(eSSLError, "SSL_CTX_set_session_id_context");
 	}
     }
 
@@ -771,7 +771,7 @@
         return Qnil;
     }
     if (!SSL_CTX_set_cipher_list(ctx, RSTRING_PTR(str))) {
-        ossl_raise(eSSLError, "SSL_CTX_set_cipher_list:");
+        ossl_raise(eSSLError, "SSL_CTX_set_cipher_list");
     }
 
     return v;
@@ -1058,14 +1058,14 @@
 
         ssl = SSL_new(ctx);
         if (!ssl) {
-            ossl_raise(eSSLError, "SSL_new:");
+            ossl_raise(eSSLError, "SSL_new");
         }
         DATA_PTR(self) = ssl;
 
 #ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
         if (!NIL_P(hostname)) {
            if (SSL_set_tlsext_host_name(ssl, StringValuePtr(hostname)) != 1)
-               ossl_raise(eSSLError, "SSL_set_tlsext_host_name:");
+               ossl_raise(eSSLError, "SSL_set_tlsext_host_name");
         }
 #endif
         io = ossl_ssl_get_io(self);
@@ -1273,7 +1273,7 @@
 		if(ERR_peek_error() == 0 && nread == 0) rb_eof_error();
 		rb_sys_fail(0);
 	    default:
-		ossl_raise(eSSLError, "SSL_read:");
+		ossl_raise(eSSLError, "SSL_read");
 	    }
         }
     }
@@ -1350,7 +1350,7 @@
 	    case SSL_ERROR_SYSCALL:
 		if (errno) rb_sys_fail(0);
 	    default:
-		ossl_raise(eSSLError, "SSL_write:");
+		ossl_raise(eSSLError, "SSL_write");
 	    }
         }
     }
Index: ext/openssl/ossl_pkey_rsa.c
===================================================================
--- ext/openssl/ossl_pkey_rsa.c	(revision 33820)
+++ ext/openssl/ossl_pkey_rsa.c	(revision 33821)
@@ -243,7 +243,7 @@
 	}
 	BIO_free(in);
 	if (!rsa) {
-	    ossl_raise(eRSAError, "Neither PUB key nor PRIV key:");
+	    ossl_raise(eRSAError, "Neither PUB key nor PRIV key");
 	}
     }
     if (!EVP_PKEY_assign_RSA(pkey, rsa)) {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/