mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/openssl/ossl_digest.c (ossl_digest_initialize): [ruby-dev:25198]
* lib/cgi/session.rb (CGI::Session::initialize): generate new session if given session_id does not exist. [ruby-list:40368] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
9d24a847b8
commit
d89b8333c5
22 changed files with 168 additions and 134 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