2003-07-23 20:12:24 +04:00
|
|
|
/*
|
|
|
|
* 'OpenSSL for Ruby' project
|
|
|
|
* Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
|
|
|
|
* All rights reserved.
|
|
|
|
*/
|
|
|
|
/*
|
2015-04-20 06:55:09 +03:00
|
|
|
* This program is licensed under the same licence as Ruby.
|
2003-07-23 20:12:24 +04:00
|
|
|
* (See the file 'LICENCE'.)
|
|
|
|
*/
|
|
|
|
#include "ossl.h"
|
|
|
|
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
#if !defined(OPENSSL_NO_DH)
|
|
|
|
|
2003-07-23 20:12:24 +04:00
|
|
|
#define GetPKeyDH(obj, pkey) do { \
|
2011-03-07 11:44:45 +03:00
|
|
|
GetPKey((obj), (pkey)); \
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DH) { /* PARANOIA? */ \
|
2003-07-23 20:12:24 +04:00
|
|
|
ossl_raise(rb_eRuntimeError, "THIS IS NOT A DH!") ; \
|
|
|
|
} \
|
|
|
|
} while (0)
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
#define GetDH(obj, dh) do { \
|
|
|
|
EVP_PKEY *_pkey; \
|
|
|
|
GetPKeyDH((obj), _pkey); \
|
|
|
|
(dh) = EVP_PKEY_get0_DH(_pkey); \
|
|
|
|
} while (0)
|
2003-07-23 20:12:24 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Classes
|
|
|
|
*/
|
|
|
|
VALUE cDH;
|
|
|
|
VALUE eDHError;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Public
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
dh_instance(VALUE klass, DH *dh)
|
|
|
|
{
|
|
|
|
EVP_PKEY *pkey;
|
|
|
|
VALUE obj;
|
2010-04-22 12:21:01 +04:00
|
|
|
|
2003-07-23 20:12:24 +04:00
|
|
|
if (!dh) {
|
|
|
|
return Qfalse;
|
|
|
|
}
|
2015-05-29 08:55:02 +03:00
|
|
|
obj = NewPKey(klass);
|
2003-07-23 20:12:24 +04:00
|
|
|
if (!(pkey = EVP_PKEY_new())) {
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
if (!EVP_PKEY_assign_DH(pkey, dh)) {
|
|
|
|
EVP_PKEY_free(pkey);
|
|
|
|
return Qfalse;
|
|
|
|
}
|
2015-05-29 08:55:02 +03:00
|
|
|
SetPKey(obj, pkey);
|
2003-07-23 20:12:24 +04:00
|
|
|
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
ossl_dh_new(EVP_PKEY *pkey)
|
|
|
|
{
|
|
|
|
VALUE obj;
|
|
|
|
|
|
|
|
if (!pkey) {
|
|
|
|
obj = dh_instance(cDH, DH_new());
|
|
|
|
} else {
|
2015-05-29 08:55:02 +03:00
|
|
|
obj = NewPKey(cDH);
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DH) {
|
2003-07-23 20:12:24 +04:00
|
|
|
ossl_raise(rb_eTypeError, "Not a DH key!");
|
|
|
|
}
|
2015-05-29 08:55:02 +03:00
|
|
|
SetPKey(obj, pkey);
|
2003-07-23 20:12:24 +04:00
|
|
|
}
|
|
|
|
if (obj == Qfalse) {
|
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Private
|
|
|
|
*/
|
2011-09-01 11:42:29 +04:00
|
|
|
struct dh_blocking_gen_arg {
|
|
|
|
DH *dh;
|
|
|
|
int size;
|
|
|
|
int gen;
|
|
|
|
BN_GENCB *cb;
|
|
|
|
int result;
|
|
|
|
};
|
|
|
|
|
2012-07-10 17:57:11 +04:00
|
|
|
static void *
|
2011-09-01 11:42:29 +04:00
|
|
|
dh_blocking_gen(void *arg)
|
|
|
|
{
|
|
|
|
struct dh_blocking_gen_arg *gen = (struct dh_blocking_gen_arg *)arg;
|
|
|
|
gen->result = DH_generate_parameters_ex(gen->dh, gen->size, gen->gen, gen->cb);
|
2012-07-10 17:57:11 +04:00
|
|
|
return 0;
|
2011-09-01 11:42:29 +04:00
|
|
|
}
|
|
|
|
|
2003-07-23 20:12:24 +04:00
|
|
|
static DH *
|
|
|
|
dh_generate(int size, int gen)
|
|
|
|
{
|
2016-06-05 18:35:12 +03:00
|
|
|
struct ossl_generate_cb_arg cb_arg = { 0 };
|
2011-09-01 11:42:29 +04:00
|
|
|
struct dh_blocking_gen_arg gen_arg;
|
|
|
|
DH *dh = DH_new();
|
2016-06-05 18:35:12 +03:00
|
|
|
BN_GENCB *cb = BN_GENCB_new();
|
2010-04-22 12:04:13 +04:00
|
|
|
|
2016-06-05 18:35:12 +03:00
|
|
|
if (!dh || !cb) {
|
|
|
|
DH_free(dh);
|
|
|
|
BN_GENCB_free(cb);
|
|
|
|
return NULL;
|
|
|
|
}
|
2003-07-23 20:12:24 +04:00
|
|
|
|
2011-09-01 11:42:29 +04:00
|
|
|
if (rb_block_given_p())
|
|
|
|
cb_arg.yield = 1;
|
2016-06-05 18:35:12 +03:00
|
|
|
BN_GENCB_set(cb, ossl_generate_cb_2, &cb_arg);
|
2011-09-01 11:42:29 +04:00
|
|
|
gen_arg.dh = dh;
|
|
|
|
gen_arg.size = size;
|
|
|
|
gen_arg.gen = gen;
|
2016-06-05 18:35:12 +03:00
|
|
|
gen_arg.cb = cb;
|
2011-09-01 11:42:29 +04:00
|
|
|
if (cb_arg.yield == 1) {
|
|
|
|
/* we cannot release GVL when callback proc is supplied */
|
|
|
|
dh_blocking_gen(&gen_arg);
|
|
|
|
} else {
|
|
|
|
/* there's a chance to unblock */
|
2012-07-10 17:57:11 +04:00
|
|
|
rb_thread_call_without_gvl(dh_blocking_gen, &gen_arg, ossl_generate_cb_stop, &cb_arg);
|
2011-09-01 11:42:29 +04:00
|
|
|
}
|
|
|
|
|
2016-06-05 18:35:12 +03:00
|
|
|
BN_GENCB_free(cb);
|
2011-09-01 11:42:29 +04:00
|
|
|
if (!gen_arg.result) {
|
2003-07-23 20:12:24 +04:00
|
|
|
DH_free(dh);
|
2016-05-18 07:07:47 +03:00
|
|
|
if (cb_arg.state) {
|
|
|
|
/* Clear OpenSSL error queue before re-raising. */
|
|
|
|
ossl_clear_error();
|
|
|
|
rb_jump_tag(cb_arg.state);
|
|
|
|
}
|
2016-06-05 18:35:12 +03:00
|
|
|
return NULL;
|
2003-07-23 20:12:24 +04:00
|
|
|
}
|
2011-09-01 11:42:29 +04:00
|
|
|
|
|
|
|
if (!DH_generate_key(dh)) {
|
|
|
|
DH_free(dh);
|
2016-06-05 18:35:12 +03:00
|
|
|
return NULL;
|
2011-09-01 11:42:29 +04:00
|
|
|
}
|
2003-07-23 20:12:24 +04:00
|
|
|
|
|
|
|
return dh;
|
|
|
|
}
|
|
|
|
|
2007-03-29 21:29:03 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* DH.generate(size [, generator]) -> dh
|
|
|
|
*
|
2011-06-12 21:03:26 +04:00
|
|
|
* Creates a new DH instance from scratch by generating the private and public
|
|
|
|
* components alike.
|
|
|
|
*
|
|
|
|
* === Parameters
|
2011-06-13 05:15:20 +04:00
|
|
|
* * +size+ is an integer representing the desired key size. Keys smaller than 1024 bits should be considered insecure.
|
2011-06-12 21:03:26 +04:00
|
|
|
* * +generator+ is a small number > 1, typically 2 or 5.
|
2007-03-29 21:29:03 +04:00
|
|
|
*
|
|
|
|
*/
|
2003-07-23 20:12:24 +04:00
|
|
|
static VALUE
|
|
|
|
ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)
|
|
|
|
{
|
|
|
|
DH *dh ;
|
|
|
|
int g = 2;
|
|
|
|
VALUE size, gen, obj;
|
2010-04-22 12:21:01 +04:00
|
|
|
|
2003-07-23 20:12:24 +04:00
|
|
|
if (rb_scan_args(argc, argv, "11", &size, &gen) == 2) {
|
2008-05-29 21:41:56 +04:00
|
|
|
g = NUM2INT(gen);
|
2003-07-23 20:12:24 +04:00
|
|
|
}
|
2008-05-29 21:41:56 +04:00
|
|
|
dh = dh_generate(NUM2INT(size), g);
|
2003-07-23 20:12:24 +04:00
|
|
|
obj = dh_instance(klass, dh);
|
|
|
|
if (obj == Qfalse) {
|
|
|
|
DH_free(dh);
|
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
2007-03-29 21:29:03 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* DH.new([size [, generator] | string]) -> dh
|
|
|
|
*
|
2011-06-12 21:03:26 +04:00
|
|
|
* Either generates a DH instance from scratch or by reading already existing
|
2011-06-13 05:15:20 +04:00
|
|
|
* DH parameters from +string+. Note that when reading a DH instance from
|
2011-06-13 05:58:09 +04:00
|
|
|
* data that was encoded from a DH instance by using DH#to_pem or DH#to_der
|
|
|
|
* the result will *not* contain a public/private key pair yet. This needs to
|
|
|
|
* be generated using DH#generate_key! first.
|
2011-06-12 21:03:26 +04:00
|
|
|
*
|
|
|
|
* === Parameters
|
2011-06-13 05:15:20 +04:00
|
|
|
* * +size+ is an integer representing the desired key size. Keys smaller than 1024 bits should be considered insecure.
|
2011-06-12 21:03:26 +04:00
|
|
|
* * +generator+ is a small number > 1, typically 2 or 5.
|
|
|
|
* * +string+ contains the DER or PEM encoded key.
|
2007-03-29 21:29:03 +04:00
|
|
|
*
|
2011-06-12 21:03:26 +04:00
|
|
|
* === Examples
|
|
|
|
* DH.new # -> dh
|
|
|
|
* DH.new(1024) # -> dh
|
|
|
|
* DH.new(1024, 5) # -> dh
|
2011-06-13 05:58:09 +04:00
|
|
|
* #Reading DH parameters
|
2011-06-13 05:15:20 +04:00
|
|
|
* dh = DH.new(File.read('parameters.pem')) # -> dh, but no public/private key yet
|
|
|
|
* dh.generate_key! # -> dh with public and private key
|
2007-03-29 21:29:03 +04:00
|
|
|
*/
|
2003-07-23 20:12:24 +04:00
|
|
|
static VALUE
|
|
|
|
ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
|
|
|
|
{
|
|
|
|
EVP_PKEY *pkey;
|
|
|
|
DH *dh;
|
|
|
|
int g = 2;
|
|
|
|
BIO *in;
|
2003-09-17 13:05:02 +04:00
|
|
|
VALUE arg, gen;
|
2003-07-23 20:12:24 +04:00
|
|
|
|
|
|
|
GetPKey(self, pkey);
|
* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize): should create
empty pkey object if no argument is passed. [ruby-talk:103328]
* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): ditto.
* ext/openssl/ossl_pkey_dh.c: add new methods: OpenSSL::PKey::DH#p,
OpenSSL::PKey::DH#p=, OpenSSL::PKey::DH#g, OpenSSL::PKey::DH#g=,
OpenSSL::PKey::DH#pub_key, OpenSSL::PKey::DH#pub_key=,
OpenSSL::PKey::DH#priv_key and OpenSSL::PKey::DH#priv_key=.
* ext/openssl/ossl_pkey_dsa.c: add new methods: OpenSSL::PKey::DSA#p,
OpenSSL::PKey::DSA#p=, OpenSSL::PKey::DSA#q, OpenSSL::PKey::DSA#q=,
OpenSSL::PKey::DSA#g, OpenSSL::PKey::DSA#g=,
OpenSSL::PKey::DSA#pub_key, OpenSSL::PKey::DSA#pub_key=,
OpenSSL::PKey::DSA#priv_key and OpenSSL::PKey::DSA#priv_key=.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-06-21 20:36:19 +04:00
|
|
|
if(rb_scan_args(argc, argv, "02", &arg, &gen) == 0) {
|
|
|
|
dh = DH_new();
|
|
|
|
}
|
|
|
|
else if (FIXNUM_P(arg)) {
|
2003-07-23 20:12:24 +04:00
|
|
|
if (!NIL_P(gen)) {
|
2008-05-29 21:41:56 +04:00
|
|
|
g = NUM2INT(gen);
|
2003-07-23 20:12:24 +04:00
|
|
|
}
|
2003-09-17 13:05:02 +04:00
|
|
|
if (!(dh = dh_generate(FIX2INT(arg), g))) {
|
2003-07-23 20:12:24 +04:00
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
}
|
2003-09-17 13:05:02 +04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
arg = ossl_to_der_if_possible(arg);
|
|
|
|
in = ossl_obj2bio(arg);
|
|
|
|
dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
|
|
|
|
if (!dh){
|
2011-06-22 12:41:08 +04:00
|
|
|
OSSL_BIO_reset(in);
|
2003-09-17 13:05:02 +04:00
|
|
|
dh = d2i_DHparams_bio(in, NULL);
|
2003-07-23 20:12:24 +04:00
|
|
|
}
|
|
|
|
BIO_free(in);
|
2011-04-06 10:14:05 +04:00
|
|
|
if (!dh) {
|
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
}
|
2003-07-23 20:12:24 +04:00
|
|
|
}
|
|
|
|
if (!EVP_PKEY_assign_DH(pkey, dh)) {
|
|
|
|
DH_free(dh);
|
* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize): should create
empty pkey object if no argument is passed. [ruby-talk:103328]
* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): ditto.
* ext/openssl/ossl_pkey_dh.c: add new methods: OpenSSL::PKey::DH#p,
OpenSSL::PKey::DH#p=, OpenSSL::PKey::DH#g, OpenSSL::PKey::DH#g=,
OpenSSL::PKey::DH#pub_key, OpenSSL::PKey::DH#pub_key=,
OpenSSL::PKey::DH#priv_key and OpenSSL::PKey::DH#priv_key=.
* ext/openssl/ossl_pkey_dsa.c: add new methods: OpenSSL::PKey::DSA#p,
OpenSSL::PKey::DSA#p=, OpenSSL::PKey::DSA#q, OpenSSL::PKey::DSA#q=,
OpenSSL::PKey::DSA#g, OpenSSL::PKey::DSA#g=,
OpenSSL::PKey::DSA#pub_key, OpenSSL::PKey::DSA#pub_key=,
OpenSSL::PKey::DSA#priv_key and OpenSSL::PKey::DSA#priv_key=.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-06-21 20:36:19 +04:00
|
|
|
ossl_raise(eDHError, NULL);
|
2003-07-23 20:12:24 +04:00
|
|
|
}
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2007-03-29 21:29:03 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* dh.public? -> true | false
|
|
|
|
*
|
2011-06-12 21:03:26 +04:00
|
|
|
* Indicates whether this DH instance has a public key associated with it or
|
2011-06-13 05:15:20 +04:00
|
|
|
* not. The public key may be retrieved with DH#pub_key.
|
2007-03-29 21:29:03 +04:00
|
|
|
*/
|
2003-07-23 20:12:24 +04:00
|
|
|
static VALUE
|
|
|
|
ossl_dh_is_public(VALUE self)
|
|
|
|
{
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
DH *dh;
|
2016-06-19 08:31:28 +03:00
|
|
|
const BIGNUM *bn;
|
2003-07-23 20:12:24 +04:00
|
|
|
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
GetDH(self, dh);
|
|
|
|
DH_get0_key(dh, &bn, NULL);
|
2007-03-29 21:29:03 +04:00
|
|
|
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
return bn ? Qtrue : Qfalse;
|
2003-07-23 20:12:24 +04:00
|
|
|
}
|
|
|
|
|
2007-03-29 21:29:03 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* dh.private? -> true | false
|
|
|
|
*
|
2011-06-12 21:03:26 +04:00
|
|
|
* Indicates whether this DH instance has a private key associated with it or
|
2011-06-13 05:15:20 +04:00
|
|
|
* not. The private key may be retrieved with DH#priv_key.
|
2007-03-29 21:29:03 +04:00
|
|
|
*/
|
2003-07-23 20:12:24 +04:00
|
|
|
static VALUE
|
|
|
|
ossl_dh_is_private(VALUE self)
|
|
|
|
{
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
DH *dh;
|
2016-06-19 08:31:28 +03:00
|
|
|
const BIGNUM *bn;
|
2003-07-23 20:12:24 +04:00
|
|
|
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
GetDH(self, dh);
|
|
|
|
DH_get0_key(dh, NULL, &bn);
|
2010-04-22 12:21:01 +04:00
|
|
|
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
#if !defined(OPENSSL_NO_ENGINE)
|
|
|
|
return (bn || DH_get0_engine(dh)) ? Qtrue : Qfalse;
|
|
|
|
#else
|
|
|
|
return bn ? Qtrue : Qfalse;
|
|
|
|
#endif
|
2003-07-23 20:12:24 +04:00
|
|
|
}
|
|
|
|
|
2007-03-29 21:29:03 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2013-04-16 06:24:09 +04:00
|
|
|
* dh.export -> aString
|
2007-03-29 21:29:03 +04:00
|
|
|
* dh.to_pem -> aString
|
2013-04-16 06:24:09 +04:00
|
|
|
* dh.to_s -> aString
|
2007-03-29 21:29:03 +04:00
|
|
|
*
|
2011-06-13 05:58:09 +04:00
|
|
|
* Encodes this DH to its PEM encoding. Note that any existing per-session
|
|
|
|
* public/private keys will *not* get encoded, just the Diffie-Hellman
|
|
|
|
* parameters will be encoded.
|
2007-03-29 21:29:03 +04:00
|
|
|
*/
|
2003-07-23 20:12:24 +04:00
|
|
|
static VALUE
|
|
|
|
ossl_dh_export(VALUE self)
|
|
|
|
{
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
DH *dh;
|
2003-07-23 20:12:24 +04:00
|
|
|
BIO *out;
|
|
|
|
VALUE str;
|
|
|
|
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
GetDH(self, dh);
|
2003-07-23 20:12:24 +04:00
|
|
|
if (!(out = BIO_new(BIO_s_mem()))) {
|
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
}
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
if (!PEM_write_bio_DHparams(out, dh)) {
|
2003-07-23 20:12:24 +04:00
|
|
|
BIO_free(out);
|
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
}
|
2003-09-17 13:05:02 +04:00
|
|
|
str = ossl_membio2str(out);
|
2003-07-23 20:12:24 +04:00
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2007-03-29 21:29:03 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* dh.to_der -> aString
|
|
|
|
*
|
2011-06-13 05:58:09 +04:00
|
|
|
* Encodes this DH to its DER encoding. Note that any existing per-session
|
|
|
|
* public/private keys will *not* get encoded, just the Diffie-Hellman
|
|
|
|
* parameters will be encoded.
|
|
|
|
|
2007-03-29 21:29:03 +04:00
|
|
|
*/
|
2004-01-08 15:24:22 +03:00
|
|
|
static VALUE
|
|
|
|
ossl_dh_to_der(VALUE self)
|
2010-04-22 12:04:13 +04:00
|
|
|
{
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
DH *dh;
|
2004-01-08 15:24:22 +03:00
|
|
|
unsigned char *p;
|
|
|
|
long len;
|
|
|
|
VALUE str;
|
|
|
|
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
GetDH(self, dh);
|
|
|
|
if((len = i2d_DHparams(dh, NULL)) <= 0)
|
2004-01-08 15:24:22 +03:00
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
str = rb_str_new(0, len);
|
2008-07-22 19:34:23 +04:00
|
|
|
p = (unsigned char *)RSTRING_PTR(str);
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
if(i2d_DHparams(dh, &p) < 0)
|
2004-01-08 15:24:22 +03:00
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
ossl_str_adjust(str, p);
|
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2003-07-23 20:12:24 +04:00
|
|
|
/*
|
2007-03-29 21:29:03 +04:00
|
|
|
* call-seq:
|
|
|
|
* dh.params -> hash
|
|
|
|
*
|
2003-07-23 20:12:24 +04:00
|
|
|
* Stores all parameters of key to the hash
|
|
|
|
* INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
|
|
|
|
* Don't use :-)) (I's up to you)
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
ossl_dh_get_params(VALUE self)
|
|
|
|
{
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
DH *dh;
|
2003-07-23 20:12:24 +04:00
|
|
|
VALUE hash;
|
2016-06-19 08:31:28 +03:00
|
|
|
const BIGNUM *p, *q, *g, *pub_key, *priv_key;
|
2003-07-23 20:12:24 +04:00
|
|
|
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
GetDH(self, dh);
|
|
|
|
DH_get0_pqg(dh, &p, &q, &g);
|
|
|
|
DH_get0_key(dh, &pub_key, &priv_key);
|
2003-07-23 20:12:24 +04:00
|
|
|
|
|
|
|
hash = rb_hash_new();
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(p));
|
|
|
|
rb_hash_aset(hash, rb_str_new2("q"), ossl_bn_new(q));
|
|
|
|
rb_hash_aset(hash, rb_str_new2("g"), ossl_bn_new(g));
|
|
|
|
rb_hash_aset(hash, rb_str_new2("pub_key"), ossl_bn_new(pub_key));
|
|
|
|
rb_hash_aset(hash, rb_str_new2("priv_key"), ossl_bn_new(priv_key));
|
2010-04-22 12:04:13 +04:00
|
|
|
|
2003-07-23 20:12:24 +04:00
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2007-03-29 21:29:03 +04:00
|
|
|
* call-seq:
|
|
|
|
* dh.to_text -> aString
|
|
|
|
*
|
2003-07-23 20:12:24 +04:00
|
|
|
* Prints all parameters of key to buffer
|
|
|
|
* INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
|
|
|
|
* Don't use :-)) (I's up to you)
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
ossl_dh_to_text(VALUE self)
|
|
|
|
{
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
DH *dh;
|
2003-07-23 20:12:24 +04:00
|
|
|
BIO *out;
|
|
|
|
VALUE str;
|
|
|
|
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
GetDH(self, dh);
|
2003-07-23 20:12:24 +04:00
|
|
|
if (!(out = BIO_new(BIO_s_mem()))) {
|
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
}
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
if (!DHparams_print(out, dh)) {
|
2003-07-23 20:12:24 +04:00
|
|
|
BIO_free(out);
|
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
}
|
2003-09-17 13:05:02 +04:00
|
|
|
str = ossl_membio2str(out);
|
2003-07-23 20:12:24 +04:00
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2007-03-29 21:29:03 +04:00
|
|
|
* call-seq:
|
|
|
|
* dh.public_key -> aDH
|
|
|
|
*
|
2011-06-13 00:39:38 +04:00
|
|
|
* Returns a new DH instance that carries just the public information, i.e.
|
|
|
|
* the prime +p+ and the generator +g+, but no public/private key yet. Such
|
2011-06-13 05:15:20 +04:00
|
|
|
* a pair may be generated using DH#generate_key!. The "public key" needed
|
|
|
|
* for a key exchange with DH#compute_key is considered as per-session
|
|
|
|
* information and may be retrieved with DH#pub_key once a key pair has
|
|
|
|
* been generated.
|
|
|
|
* If the current instance already contains private information (and thus a
|
|
|
|
* valid public/private key pair), this information will no longer be present
|
|
|
|
* in the new instance generated by DH#public_key. This feature is helpful for
|
|
|
|
* publishing the Diffie-Hellman parameters without leaking any of the private
|
|
|
|
* per-session information.
|
2011-06-12 21:03:26 +04:00
|
|
|
*
|
|
|
|
* === Example
|
2011-07-01 00:20:32 +04:00
|
|
|
* dh = OpenSSL::PKey::DH.new(2048) # has public and private key set
|
2011-06-13 05:15:20 +04:00
|
|
|
* public_key = dh.public_key # contains only prime and generator
|
|
|
|
* parameters = public_key.to_der # it's safe to publish this
|
2003-07-23 20:12:24 +04:00
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
ossl_dh_to_public_key(VALUE self)
|
|
|
|
{
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
DH *orig_dh, *dh;
|
2003-07-23 20:12:24 +04:00
|
|
|
VALUE obj;
|
2010-04-22 12:21:01 +04:00
|
|
|
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
GetDH(self, orig_dh);
|
|
|
|
dh = DHparams_dup(orig_dh); /* err check perfomed by dh_instance */
|
2003-07-23 20:12:24 +04:00
|
|
|
obj = dh_instance(CLASS_OF(self), dh);
|
|
|
|
if (obj == Qfalse) {
|
|
|
|
DH_free(dh);
|
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
2007-03-29 21:29:03 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2013-04-16 06:24:09 +04:00
|
|
|
* dh.params_ok? -> true | false
|
2007-03-29 21:29:03 +04:00
|
|
|
*
|
2011-06-12 21:03:26 +04:00
|
|
|
* Validates the Diffie-Hellman parameters associated with this instance.
|
|
|
|
* It checks whether a safe prime and a suitable generator are used. If this
|
|
|
|
* is not the case, +false+ is returned.
|
2007-03-29 21:29:03 +04:00
|
|
|
*/
|
2003-07-23 20:12:24 +04:00
|
|
|
static VALUE
|
|
|
|
ossl_dh_check_params(VALUE self)
|
|
|
|
{
|
|
|
|
DH *dh;
|
|
|
|
int codes;
|
2010-04-22 12:04:13 +04:00
|
|
|
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
GetDH(self, dh);
|
2003-07-23 20:12:24 +04:00
|
|
|
if (!DH_check(dh, &codes)) {
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
|
|
|
return codes == 0 ? Qtrue : Qfalse;
|
|
|
|
}
|
|
|
|
|
2007-03-29 21:29:03 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2011-06-13 00:39:38 +04:00
|
|
|
* dh.generate_key! -> self
|
2007-03-29 21:29:03 +04:00
|
|
|
*
|
2011-06-13 05:15:20 +04:00
|
|
|
* Generates a private and public key unless a private key already exists.
|
|
|
|
* If this DH instance was generated from public DH parameters (e.g. by
|
|
|
|
* encoding the result of DH#public_key), then this method needs to be
|
|
|
|
* called first in order to generate the per-session keys before performing
|
|
|
|
* the actual key exchange.
|
2011-06-13 00:39:38 +04:00
|
|
|
*
|
|
|
|
* === Example
|
|
|
|
* dh = OpenSSL::PKey::DH.new(2048)
|
|
|
|
* public_key = dh.public_key #contains no private/public key yet
|
|
|
|
* public_key.generate_key!
|
|
|
|
* puts public_key.private? # => true
|
2007-03-29 21:29:03 +04:00
|
|
|
*/
|
2003-07-23 20:12:24 +04:00
|
|
|
static VALUE
|
|
|
|
ossl_dh_generate_key(VALUE self)
|
|
|
|
{
|
|
|
|
DH *dh;
|
|
|
|
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
GetDH(self, dh);
|
2003-07-23 20:12:24 +04:00
|
|
|
if (!DH_generate_key(dh))
|
|
|
|
ossl_raise(eDHError, "Failed to generate key");
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2007-03-29 21:29:03 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* dh.compute_key(pub_bn) -> aString
|
|
|
|
*
|
2011-06-13 05:15:20 +04:00
|
|
|
* Returns a String containing a shared secret computed from the other party's public value.
|
2011-06-12 21:03:26 +04:00
|
|
|
* See DH_compute_key() for further information.
|
2007-03-29 21:29:03 +04:00
|
|
|
*
|
2011-06-12 21:03:26 +04:00
|
|
|
* === Parameters
|
2011-06-13 05:15:20 +04:00
|
|
|
* * +pub_bn+ is a OpenSSL::BN, *not* the DH instance returned by
|
|
|
|
* DH#public_key as that contains the DH parameters only.
|
2007-03-29 21:29:03 +04:00
|
|
|
*/
|
2003-07-23 20:12:24 +04:00
|
|
|
static VALUE
|
|
|
|
ossl_dh_compute_key(VALUE self, VALUE pub)
|
|
|
|
{
|
|
|
|
DH *dh;
|
2016-06-19 08:31:28 +03:00
|
|
|
const BIGNUM *pub_key, *dh_p;
|
2003-07-23 20:12:24 +04:00
|
|
|
VALUE str;
|
|
|
|
int len;
|
|
|
|
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
GetDH(self, dh);
|
|
|
|
DH_get0_pqg(dh, &dh_p, NULL, NULL);
|
|
|
|
if (!dh_p)
|
2016-05-26 08:24:58 +03:00
|
|
|
ossl_raise(eDHError, "incomplete DH");
|
2003-07-23 20:12:24 +04:00
|
|
|
pub_key = GetBNPtr(pub);
|
|
|
|
len = DH_size(dh);
|
2003-09-17 13:05:02 +04:00
|
|
|
str = rb_str_new(0, len);
|
2008-07-22 19:34:23 +04:00
|
|
|
if ((len = DH_compute_key((unsigned char *)RSTRING_PTR(str), pub_key, dh)) < 0) {
|
2003-07-23 20:12:24 +04:00
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
}
|
2006-08-31 14:30:33 +04:00
|
|
|
rb_str_set_len(str, len);
|
2003-07-23 20:12:24 +04:00
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
OSSL_PKEY_BN_DEF3(dh, DH, pqg, p, q, g)
|
|
|
|
OSSL_PKEY_BN_DEF2(dh, DH, key, pub_key, priv_key)
|
* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize): should create
empty pkey object if no argument is passed. [ruby-talk:103328]
* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): ditto.
* ext/openssl/ossl_pkey_dh.c: add new methods: OpenSSL::PKey::DH#p,
OpenSSL::PKey::DH#p=, OpenSSL::PKey::DH#g, OpenSSL::PKey::DH#g=,
OpenSSL::PKey::DH#pub_key, OpenSSL::PKey::DH#pub_key=,
OpenSSL::PKey::DH#priv_key and OpenSSL::PKey::DH#priv_key=.
* ext/openssl/ossl_pkey_dsa.c: add new methods: OpenSSL::PKey::DSA#p,
OpenSSL::PKey::DSA#p=, OpenSSL::PKey::DSA#q, OpenSSL::PKey::DSA#q=,
OpenSSL::PKey::DSA#g, OpenSSL::PKey::DSA#g=,
OpenSSL::PKey::DSA#pub_key, OpenSSL::PKey::DSA#pub_key=,
OpenSSL::PKey::DSA#priv_key and OpenSSL::PKey::DSA#priv_key=.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-06-21 20:36:19 +04:00
|
|
|
|
2007-04-02 23:00:23 +04:00
|
|
|
/*
|
|
|
|
* INIT
|
|
|
|
*/
|
2003-07-23 20:12:24 +04:00
|
|
|
void
|
2014-09-30 09:25:32 +04:00
|
|
|
Init_ossl_dh(void)
|
2003-07-23 20:12:24 +04:00
|
|
|
{
|
2010-12-06 03:54:44 +03:00
|
|
|
#if 0
|
|
|
|
mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL and mPKey */
|
2007-03-12 05:01:19 +03:00
|
|
|
mPKey = rb_define_module_under(mOSSL, "PKey");
|
|
|
|
#endif
|
|
|
|
|
2011-06-12 21:03:26 +04:00
|
|
|
/* Document-class: OpenSSL::PKey::DHError
|
|
|
|
*
|
|
|
|
* Generic exception that is raised if an operation on a DH PKey
|
|
|
|
* fails unexpectedly or in case an instantiation of an instance of DH
|
|
|
|
* fails due to non-conformant input data.
|
|
|
|
*/
|
2003-07-23 20:12:24 +04:00
|
|
|
eDHError = rb_define_class_under(mPKey, "DHError", ePKeyError);
|
2011-06-12 21:03:26 +04:00
|
|
|
/* Document-class: OpenSSL::PKey::DH
|
|
|
|
*
|
|
|
|
* An implementation of the Diffie-Hellman key exchange protocol based on
|
|
|
|
* discrete logarithms in finite fields, the same basis that DSA is built
|
|
|
|
* on.
|
2011-06-13 05:15:20 +04:00
|
|
|
*
|
|
|
|
* === Accessor methods for the Diffie-Hellman parameters
|
|
|
|
* * DH#p
|
|
|
|
* The prime (an OpenSSL::BN) of the Diffie-Hellman parameters.
|
|
|
|
* * DH#g
|
|
|
|
* The generator (an OpenSSL::BN) g of the Diffie-Hellman parameters.
|
|
|
|
* * DH#pub_key
|
|
|
|
* The per-session public key (an OpenSSL::BN) matching the private key.
|
|
|
|
* This needs to be passed to DH#compute_key.
|
|
|
|
* * DH#priv_key
|
|
|
|
* The per-session private key, an OpenSSL::BN.
|
|
|
|
*
|
|
|
|
* === Example of a key exchange
|
|
|
|
* dh1 = OpenSSL::PKey::DH.new(2048)
|
2014-01-13 09:27:23 +04:00
|
|
|
* der = dh1.public_key.to_der #you may send this publicly to the participating party
|
2011-06-13 05:15:20 +04:00
|
|
|
* dh2 = OpenSSL::PKey::DH.new(der)
|
2011-07-01 00:20:32 +04:00
|
|
|
* dh2.generate_key! #generate the per-session key pair
|
2011-06-13 05:15:20 +04:00
|
|
|
* symm_key1 = dh1.compute_key(dh2.pub_key)
|
|
|
|
* symm_key2 = dh2.compute_key(dh1.pub_key)
|
2011-07-01 00:20:32 +04:00
|
|
|
*
|
2011-06-13 05:15:20 +04:00
|
|
|
* puts symm_key1 == symm_key2 # => true
|
2011-06-12 21:03:26 +04:00
|
|
|
*/
|
2003-07-23 20:12:24 +04:00
|
|
|
cDH = rb_define_class_under(mPKey, "DH", cPKey);
|
|
|
|
rb_define_singleton_method(cDH, "generate", ossl_dh_s_generate, -1);
|
|
|
|
rb_define_method(cDH, "initialize", ossl_dh_initialize, -1);
|
|
|
|
rb_define_method(cDH, "public?", ossl_dh_is_public, 0);
|
|
|
|
rb_define_method(cDH, "private?", ossl_dh_is_private, 0);
|
|
|
|
rb_define_method(cDH, "to_text", ossl_dh_to_text, 0);
|
|
|
|
rb_define_method(cDH, "export", ossl_dh_export, 0);
|
|
|
|
rb_define_alias(cDH, "to_pem", "export");
|
|
|
|
rb_define_alias(cDH, "to_s", "export");
|
2004-01-08 15:24:22 +03:00
|
|
|
rb_define_method(cDH, "to_der", ossl_dh_to_der, 0);
|
2003-07-23 20:12:24 +04:00
|
|
|
rb_define_method(cDH, "public_key", ossl_dh_to_public_key, 0);
|
|
|
|
rb_define_method(cDH, "params_ok?", ossl_dh_check_params, 0);
|
|
|
|
rb_define_method(cDH, "generate_key!", ossl_dh_generate_key, 0);
|
|
|
|
rb_define_method(cDH, "compute_key", ossl_dh_compute_key, 1);
|
2011-06-13 05:15:20 +04:00
|
|
|
|
* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize): should create
empty pkey object if no argument is passed. [ruby-talk:103328]
* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): ditto.
* ext/openssl/ossl_pkey_dh.c: add new methods: OpenSSL::PKey::DH#p,
OpenSSL::PKey::DH#p=, OpenSSL::PKey::DH#g, OpenSSL::PKey::DH#g=,
OpenSSL::PKey::DH#pub_key, OpenSSL::PKey::DH#pub_key=,
OpenSSL::PKey::DH#priv_key and OpenSSL::PKey::DH#priv_key=.
* ext/openssl/ossl_pkey_dsa.c: add new methods: OpenSSL::PKey::DSA#p,
OpenSSL::PKey::DSA#p=, OpenSSL::PKey::DSA#q, OpenSSL::PKey::DSA#q=,
OpenSSL::PKey::DSA#g, OpenSSL::PKey::DSA#g=,
OpenSSL::PKey::DSA#pub_key, OpenSSL::PKey::DSA#pub_key=,
OpenSSL::PKey::DSA#priv_key and OpenSSL::PKey::DSA#priv_key=.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-06-21 20:36:19 +04:00
|
|
|
DEF_OSSL_PKEY_BN(cDH, dh, p);
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
DEF_OSSL_PKEY_BN(cDH, dh, q);
|
* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize): should create
empty pkey object if no argument is passed. [ruby-talk:103328]
* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): ditto.
* ext/openssl/ossl_pkey_dh.c: add new methods: OpenSSL::PKey::DH#p,
OpenSSL::PKey::DH#p=, OpenSSL::PKey::DH#g, OpenSSL::PKey::DH#g=,
OpenSSL::PKey::DH#pub_key, OpenSSL::PKey::DH#pub_key=,
OpenSSL::PKey::DH#priv_key and OpenSSL::PKey::DH#priv_key=.
* ext/openssl/ossl_pkey_dsa.c: add new methods: OpenSSL::PKey::DSA#p,
OpenSSL::PKey::DSA#p=, OpenSSL::PKey::DSA#q, OpenSSL::PKey::DSA#q=,
OpenSSL::PKey::DSA#g, OpenSSL::PKey::DSA#g=,
OpenSSL::PKey::DSA#pub_key, OpenSSL::PKey::DSA#pub_key=,
OpenSSL::PKey::DSA#priv_key and OpenSSL::PKey::DSA#priv_key=.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-06-21 20:36:19 +04:00
|
|
|
DEF_OSSL_PKEY_BN(cDH, dh, g);
|
|
|
|
DEF_OSSL_PKEY_BN(cDH, dh, pub_key);
|
|
|
|
DEF_OSSL_PKEY_BN(cDH, dh, priv_key);
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 18:00:47 +03:00
|
|
|
rb_define_method(cDH, "set_pqg", ossl_dh_set_pqg, 3);
|
|
|
|
rb_define_method(cDH, "set_key", ossl_dh_set_key, 2);
|
|
|
|
|
2003-07-23 20:12:24 +04:00
|
|
|
rb_define_method(cDH, "params", ossl_dh_get_params, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
#else /* defined NO_DH */
|
|
|
|
void
|
2014-09-30 09:25:32 +04:00
|
|
|
Init_ossl_dh(void)
|
2003-07-23 20:12:24 +04:00
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif /* NO_DH */
|