diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-29 07:54:38 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-29 07:54:38 +0000 |
commit | 919f456de88e9e1011db8f6e4e484e1b25e77af4 (patch) | |
tree | e367d6d1ba65d30139ae43891b52edfe71be8fca /ext/openssl | |
parent | 6a738f22656ffe247bcd02cf354c12a5370818ec (diff) |
* exception message clean-up by Ian Macdonald <[email protected]>.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
-rw-r--r-- | ext/openssl/ossl.c | 2 | ||||
-rw-r--r-- | ext/openssl/ossl_asn1.c | 10 | ||||
-rw-r--r-- | ext/openssl/ossl_config.c | 2 | ||||
-rw-r--r-- | ext/openssl/ossl_pkcs7.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index ac98d6f0a6..36a7aa5042 100644 --- a/ext/openssl/ossl.c +++ b/ext/openssl/ossl.c @@ -63,7 +63,7 @@ ossl_x509_ary2sk0(VALUE ary) val = rb_ary_entry(ary, i); if (!rb_obj_is_kind_of(val, cX509Cert)) { sk_X509_pop_free(sk, X509_free); - ossl_raise(eOSSLError, "object except X509 cert is in array"); + ossl_raise(eOSSLError, "object not X509 cert in array"); } x509 = DupX509CertPtr(val); /* NEED TO DUP */ sk_X509_push(sk, x509); diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c index f0d8dda9b8..09ca66f14c 100644 --- a/ext/openssl/ossl_asn1.c +++ b/ext/openssl/ossl_asn1.c @@ -567,7 +567,7 @@ ossl_asn1_default_tag(VALUE obj) return i; } } - ossl_raise(eASN1Error, "not found universal tag for %s", + ossl_raise(eASN1Error, "universal tag for %s not found", rb_class2name(CLASS_OF(obj))); return -1; /* dummy */ @@ -650,7 +650,7 @@ ossl_asn1data_initialize(VALUE self, VALUE value, VALUE tag, VALUE tag_class) if(!SYMBOL_P(tag_class)) ossl_raise(eASN1Error, "invalid tag class"); if((SYM2ID(tag_class) == sUNIVERSAL) && NUM2INT(tag) > 31) - ossl_raise(eASN1Error, "too large tag number for Universal"); + ossl_raise(eASN1Error, "tag number for Universal too large"); ossl_asn1_set_tag(self, tag); ossl_asn1_set_value(self, value); ossl_asn1_set_tag_class(self, tag_class); @@ -865,13 +865,13 @@ ossl_asn1_initialize(int argc, VALUE *argv, VALUE self) if(NIL_P(tagging)) tagging = ID2SYM(sEXPLICIT); if(!SYMBOL_P(tagging)) - ossl_raise(eASN1Error, "invelid tag default"); + ossl_raise(eASN1Error, "invalid tag default"); if(NIL_P(tag_class)) tag_class = ID2SYM(sCONTEXT_SPECIFIC); if(!SYMBOL_P(tag_class)) - ossl_raise(eASN1Error, "invelid tag class"); + ossl_raise(eASN1Error, "invalid tag class"); if(SYM2ID(tagging) == sIMPLICIT && NUM2INT(tag) > 31) - ossl_raise(eASN1Error, "too large tag number for Universal"); + ossl_raise(eASN1Error, "tag number for Universal too large"); } else{ tag = INT2NUM(ossl_asn1_default_tag(self)); diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c index 655517c4fb..37abff508b 100644 --- a/ext/openssl/ossl_config.c +++ b/ext/openssl/ossl_config.c @@ -147,7 +147,7 @@ ossl_config_initialize(int argc, VALUE *argv, VALUE self) } } #ifdef OSSL_NO_CONF_API - else rb_raise(rb_eArgError, "wrong number of arguments(0 for 1)"); + else rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)"); #else else _CONF_new_data(conf); #endif diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c index aaa12ac7d7..57825e8bb1 100644 --- a/ext/openssl/ossl_pkcs7.c +++ b/ext/openssl/ossl_pkcs7.c @@ -358,7 +358,7 @@ ossl_pkcs7_set_detached(VALUE self, VALUE flag) GetPKCS7(self, p7); if(flag != Qtrue && flag != Qfalse) - ossl_raise(ePKCS7Error, "must secify a boolean"); + ossl_raise(ePKCS7Error, "must specify a boolean"); if(!PKCS7_set_detached(p7, flag == Qtrue ? 1 : 0)) ossl_raise(ePKCS7Error, NULL); |