mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/set.rb (Set#==): [ruby-dev:25206]
* ext/openssl/ossl_digest.c (ossl_digest_initialize): [ruby-dev:25198] * utf8.c (utf8_is_mbc_ambiguous): [ruby-talk:123561] * utf8.c (utf8_mbc_to_normalize): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
772396882f
commit
2edbb9d0f8
23 changed files with 184 additions and 146 deletions
|
@ -240,10 +240,10 @@ ossl_x509req_set_version(VALUE self, VALUE version)
|
|||
X509_REQ *req;
|
||||
long ver;
|
||||
|
||||
GetX509Req(self, req);
|
||||
if ((ver = FIX2LONG(version)) < 0) {
|
||||
ossl_raise(eX509ReqError, "version must be >= 0!");
|
||||
}
|
||||
GetX509Req(self, req);
|
||||
if (!X509_REQ_set_version(req, ver)) {
|
||||
ossl_raise(eX509ReqError, NULL);
|
||||
}
|
||||
|
@ -400,13 +400,13 @@ ossl_x509req_set_attributes(VALUE self, VALUE ary)
|
|||
X509_REQ *req;
|
||||
X509_ATTRIBUTE *attr;
|
||||
int i;
|
||||
VALUE item;
|
||||
VALUE tmp, item;
|
||||
|
||||
GetX509Req(self, req);
|
||||
Check_Type(ary, T_ARRAY);
|
||||
for (i=0;i<RARRAY(ary)->len; i++) {
|
||||
OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Attr);
|
||||
}
|
||||
GetX509Req(self, req);
|
||||
sk_X509_ATTRIBUTE_pop_free(req->req_info->attributes, X509_ATTRIBUTE_free);
|
||||
req->req_info->attributes = NULL;
|
||||
for (i=0;i<RARRAY(ary)->len; i++) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue