kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/openssl/ossl_pkey.h, ossl_pkey_rsa.c, ossl_pkey_dsa.c:

Browse source 
an instance variable "private" is added to OpenSSL::PKey class.
  this ivar is a flag that shows whether there is a private key
  in the instance.

* ext/openssl/ossl_engine.c: (ossl_engine_load_privkey): set private
  key flag.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
gotoyuzo 2005-09-18 22:56:11 +00:00
parent 8885a8720d
commit 246f5cfe67
6 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/openssl/ossl_pkey_dsa.c
View file

@ -20,13 +20,7 @@
} while (0)
#define DSA_HAS_PRIVATE(dsa) ((dsa)->priv_key)
#ifdef OSSL_ENGINE_ENABLED
# define DSA_PRIVATE(dsa) (DSA_HAS_PRIVATE(dsa) || (dsa)->engine)
#else
# define DSA_PRIVATE(dsa) DSA_HAS_PRIVATE(dsa)
#endif
#define DSA_PRIVATE(obj,dsa) (DSA_HAS_PRIVATE(dsa)||OSSL_PKEY_IS_PRIVATE(obj))
/*
* Classes
@ -190,7 +184,7 @@ ossl_dsa_is_private(VALUE self)
GetPKeyDSA(self, pkey);
return (DSA_PRIVATE(pkey->pkey.dsa)) ? Qtrue : Qfalse;
return (DSA_PRIVATE(self, pkey->pkey.dsa)) ? Qtrue : Qfalse;
}
static VALUE
@ -336,7 +330,7 @@ ossl_dsa_sign(VALUE self, VALUE data)
GetPKeyDSA(self, pkey);
StringValue(data);
if (!DSA_PRIVATE(pkey->pkey.dsa)) {
if (!DSA_PRIVATE(self, pkey->pkey.dsa)) {
ossl_raise(eDSAError, "Private DSA key needed!");
}
str = rb_str_new(0, ossl_dsa_buf_size(pkey));