2003-07-23 12:12:24 -04:00
|
|
|
/*
|
|
|
|
* 'OpenSSL for Ruby' project
|
|
|
|
* Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
|
|
|
|
* All rights reserved.
|
|
|
|
*/
|
|
|
|
/*
|
2015-04-19 23:55:09 -04:00
|
|
|
* This program is licensed under the same licence as Ruby.
|
2003-07-23 12: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 11:00:47 -04:00
|
|
|
#if !defined(OPENSSL_NO_DH)
|
|
|
|
|
2003-07-23 12:12:24 -04:00
|
|
|
#define GetPKeyDH(obj, pkey) do { \
|
2011-03-07 03:44:45 -05: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 11:00:47 -04:00
|
|
|
if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DH) { /* PARANOIA? */ \
|
2003-07-23 12: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 11:00:47 -04:00
|
|
|
#define GetDH(obj, dh) do { \
|
|
|
|
EVP_PKEY *_pkey; \
|
|
|
|
GetPKeyDH((obj), _pkey); \
|
|
|
|
(dh) = EVP_PKEY_get0_DH(_pkey); \
|
|
|
|
} while (0)
|
2003-07-23 12:12:24 -04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Classes
|
|
|
|
*/
|
|
|
|
VALUE cDH;
|
|
|
|
VALUE eDHError;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Private
|
|
|
|
*/
|
2007-03-29 13:29:03 -04:00
|
|
|
/*
|
2016-08-29 01:47:09 -04:00
|
|
|
* call-seq:
|
|
|
|
* DH.new -> dh
|
|
|
|
* DH.new(string) -> dh
|
|
|
|
* DH.new(size [, generator]) -> dh
|
2007-03-29 13:29:03 -04:00
|
|
|
*
|
2020-05-17 07:48:23 -04:00
|
|
|
* Creates a new instance of OpenSSL::PKey::DH.
|
|
|
|
*
|
|
|
|
* If called without arguments, an empty instance without any parameter or key
|
|
|
|
* components is created. Use #set_pqg to manually set the parameters afterwards
|
|
|
|
* (and optionally #set_key to set private and public key components).
|
|
|
|
*
|
|
|
|
* If a String is given, tries to parse it as a DER- or PEM- encoded parameters.
|
|
|
|
* See also OpenSSL::PKey.read which can parse keys of any kinds.
|
|
|
|
*
|
|
|
|
* The DH.new(size [, generator]) form is an alias of DH.generate.
|
2011-06-12 13:03:26 -04:00
|
|
|
*
|
2020-05-17 07:48:23 -04:00
|
|
|
* +string+::
|
|
|
|
* A String that contains the DER or PEM encoded key.
|
|
|
|
* +size+::
|
|
|
|
* See DH.generate.
|
|
|
|
* +generator+::
|
|
|
|
* See DH.generate.
|
2007-03-29 13:29:03 -04:00
|
|
|
*
|
2020-05-17 07:48:23 -04:00
|
|
|
* Examples:
|
|
|
|
* # Creating an instance from scratch
|
|
|
|
* dh = DH.new
|
|
|
|
* dh.set_pqg(bn_p, nil, bn_g)
|
|
|
|
*
|
|
|
|
* # Generating a parameters and a key pair
|
|
|
|
* dh = DH.new(2048) # An alias of DH.generate(2048)
|
|
|
|
*
|
|
|
|
* # Reading DH parameters
|
|
|
|
* 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 13:29:03 -04:00
|
|
|
*/
|
2003-07-23 12:12:24 -04:00
|
|
|
static VALUE
|
|
|
|
ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
|
|
|
|
{
|
|
|
|
EVP_PKEY *pkey;
|
|
|
|
DH *dh;
|
|
|
|
BIO *in;
|
2020-05-17 07:48:23 -04:00
|
|
|
VALUE arg;
|
2003-07-23 12:12:24 -04:00
|
|
|
|
|
|
|
GetPKey(self, pkey);
|
2020-05-17 07:48:23 -04:00
|
|
|
/* The DH.new(size, generator) form is handled by lib/openssl/pkey.rb */
|
|
|
|
if (rb_scan_args(argc, argv, "01", &arg) == 0) {
|
|
|
|
dh = DH_new();
|
|
|
|
if (!dh)
|
|
|
|
ossl_raise(eDHError, "DH_new");
|
2003-09-17 05:05:02 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
arg = ossl_to_der_if_possible(arg);
|
2017-08-10 05:23:45 -04:00
|
|
|
in = ossl_obj2bio(&arg);
|
2003-09-17 05:05:02 -04:00
|
|
|
dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
|
|
|
|
if (!dh){
|
2011-06-22 04:41:08 -04:00
|
|
|
OSSL_BIO_reset(in);
|
2003-09-17 05:05:02 -04:00
|
|
|
dh = d2i_DHparams_bio(in, NULL);
|
2003-07-23 12:12:24 -04:00
|
|
|
}
|
|
|
|
BIO_free(in);
|
2011-04-06 02:14:05 -04:00
|
|
|
if (!dh) {
|
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
}
|
2003-07-23 12: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 12:36:19 -04:00
|
|
|
ossl_raise(eDHError, NULL);
|
2003-07-23 12:12:24 -04:00
|
|
|
}
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2016-06-19 05:29:59 -04:00
|
|
|
static VALUE
|
|
|
|
ossl_dh_initialize_copy(VALUE self, VALUE other)
|
|
|
|
{
|
|
|
|
EVP_PKEY *pkey;
|
|
|
|
DH *dh, *dh_other;
|
|
|
|
const BIGNUM *pub, *priv;
|
|
|
|
|
|
|
|
GetPKey(self, pkey);
|
|
|
|
if (EVP_PKEY_base_id(pkey) != EVP_PKEY_NONE)
|
|
|
|
ossl_raise(eDHError, "DH already initialized");
|
|
|
|
GetDH(other, dh_other);
|
|
|
|
|
|
|
|
dh = DHparams_dup(dh_other);
|
|
|
|
if (!dh)
|
|
|
|
ossl_raise(eDHError, "DHparams_dup");
|
|
|
|
EVP_PKEY_assign_DH(pkey, dh);
|
|
|
|
|
|
|
|
DH_get0_key(dh_other, &pub, &priv);
|
|
|
|
if (pub) {
|
|
|
|
BIGNUM *pub2 = BN_dup(pub);
|
|
|
|
BIGNUM *priv2 = BN_dup(priv);
|
|
|
|
|
2018-09-21 06:19:14 -04:00
|
|
|
if (!pub2 || (priv && !priv2)) {
|
2016-06-19 05:29:59 -04:00
|
|
|
BN_clear_free(pub2);
|
|
|
|
BN_clear_free(priv2);
|
|
|
|
ossl_raise(eDHError, "BN_dup");
|
|
|
|
}
|
|
|
|
DH_set0_key(dh, pub2, priv2);
|
|
|
|
}
|
|
|
|
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2007-03-29 13:29:03 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* dh.public? -> true | false
|
|
|
|
*
|
2011-06-12 13:03:26 -04:00
|
|
|
* Indicates whether this DH instance has a public key associated with it or
|
2011-06-12 21:15:20 -04:00
|
|
|
* not. The public key may be retrieved with DH#pub_key.
|
2007-03-29 13:29:03 -04:00
|
|
|
*/
|
2003-07-23 12: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 11:00:47 -04:00
|
|
|
DH *dh;
|
2016-06-19 01:31:28 -04:00
|
|
|
const BIGNUM *bn;
|
2003-07-23 12: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 11:00:47 -04:00
|
|
|
GetDH(self, dh);
|
|
|
|
DH_get0_key(dh, &bn, NULL);
|
2007-03-29 13: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 11:00:47 -04:00
|
|
|
return bn ? Qtrue : Qfalse;
|
2003-07-23 12:12:24 -04:00
|
|
|
}
|
|
|
|
|
2007-03-29 13:29:03 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* dh.private? -> true | false
|
|
|
|
*
|
2011-06-12 13:03:26 -04:00
|
|
|
* Indicates whether this DH instance has a private key associated with it or
|
2011-06-12 21:15:20 -04:00
|
|
|
* not. The private key may be retrieved with DH#priv_key.
|
2007-03-29 13:29:03 -04:00
|
|
|
*/
|
2003-07-23 12: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 11:00:47 -04:00
|
|
|
DH *dh;
|
2016-06-19 01:31:28 -04:00
|
|
|
const BIGNUM *bn;
|
2003-07-23 12: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 11:00:47 -04:00
|
|
|
GetDH(self, dh);
|
|
|
|
DH_get0_key(dh, NULL, &bn);
|
2010-04-22 04: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 11:00:47 -04:00
|
|
|
#if !defined(OPENSSL_NO_ENGINE)
|
|
|
|
return (bn || DH_get0_engine(dh)) ? Qtrue : Qfalse;
|
|
|
|
#else
|
|
|
|
return bn ? Qtrue : Qfalse;
|
|
|
|
#endif
|
2003-07-23 12:12:24 -04:00
|
|
|
}
|
|
|
|
|
2007-03-29 13:29:03 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2013-04-15 22:24:09 -04:00
|
|
|
* dh.export -> aString
|
2007-03-29 13:29:03 -04:00
|
|
|
* dh.to_pem -> aString
|
2013-04-15 22:24:09 -04:00
|
|
|
* dh.to_s -> aString
|
2007-03-29 13:29:03 -04:00
|
|
|
*
|
2011-06-12 21: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 13:29:03 -04:00
|
|
|
*/
|
2003-07-23 12: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 11:00:47 -04:00
|
|
|
DH *dh;
|
2003-07-23 12: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 11:00:47 -04:00
|
|
|
GetDH(self, dh);
|
2003-07-23 12: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 11:00:47 -04:00
|
|
|
if (!PEM_write_bio_DHparams(out, dh)) {
|
2003-07-23 12:12:24 -04:00
|
|
|
BIO_free(out);
|
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
}
|
2003-09-17 05:05:02 -04:00
|
|
|
str = ossl_membio2str(out);
|
2003-07-23 12:12:24 -04:00
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2007-03-29 13:29:03 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* dh.to_der -> aString
|
|
|
|
*
|
2011-06-12 21: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 13:29:03 -04:00
|
|
|
*/
|
2004-01-08 07:24:22 -05:00
|
|
|
static VALUE
|
|
|
|
ossl_dh_to_der(VALUE self)
|
2010-04-22 04: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 11:00:47 -04:00
|
|
|
DH *dh;
|
2004-01-08 07:24:22 -05: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 11:00:47 -04:00
|
|
|
GetDH(self, dh);
|
|
|
|
if((len = i2d_DHparams(dh, NULL)) <= 0)
|
2004-01-08 07:24:22 -05:00
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
str = rb_str_new(0, len);
|
2008-07-22 11: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 11:00:47 -04:00
|
|
|
if(i2d_DHparams(dh, &p) < 0)
|
2004-01-08 07:24:22 -05:00
|
|
|
ossl_raise(eDHError, NULL);
|
|
|
|
ossl_str_adjust(str, p);
|
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2003-07-23 12:12:24 -04:00
|
|
|
/*
|
2007-03-29 13:29:03 -04:00
|
|
|
* call-seq:
|
|
|
|
* dh.params -> hash
|
|
|
|
*
|
2003-07-23 12: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 11:00:47 -04:00
|
|
|
DH *dh;
|
2003-07-23 12:12:24 -04:00
|
|
|
VALUE hash;
|
2016-06-19 01:31:28 -04:00
|
|
|
const BIGNUM *p, *q, *g, *pub_key, *priv_key;
|
2003-07-23 12: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 11:00:47 -04:00
|
|
|
GetDH(self, dh);
|
|
|
|
DH_get0_pqg(dh, &p, &q, &g);
|
|
|
|
DH_get0_key(dh, &pub_key, &priv_key);
|
2003-07-23 12: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 11:00:47 -04: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 04:04:13 -04:00
|
|
|
|
2003-07-23 12:12:24 -04:00
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2007-03-29 13:29:03 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2013-04-15 22:24:09 -04:00
|
|
|
* dh.params_ok? -> true | false
|
2007-03-29 13:29:03 -04:00
|
|
|
*
|
2011-06-12 13: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.
|
2020-07-10 01:34:51 -04:00
|
|
|
*
|
|
|
|
* See also the man page EVP_PKEY_param_check(3).
|
2007-03-29 13:29:03 -04:00
|
|
|
*/
|
2003-07-23 12:12:24 -04:00
|
|
|
static VALUE
|
|
|
|
ossl_dh_check_params(VALUE self)
|
|
|
|
{
|
2020-07-10 01:34:51 -04:00
|
|
|
int ret;
|
|
|
|
#ifdef HAVE_EVP_PKEY_CHECK
|
|
|
|
EVP_PKEY *pkey;
|
|
|
|
EVP_PKEY_CTX *pctx;
|
|
|
|
|
|
|
|
GetPKey(self, pkey);
|
|
|
|
pctx = EVP_PKEY_CTX_new(pkey, /* engine */NULL);
|
|
|
|
if (!pctx)
|
|
|
|
ossl_raise(eDHError, "EVP_PKEY_CTX_new");
|
|
|
|
ret = EVP_PKEY_param_check(pctx);
|
|
|
|
EVP_PKEY_CTX_free(pctx);
|
|
|
|
#else
|
2003-07-23 12:12:24 -04:00
|
|
|
DH *dh;
|
|
|
|
int codes;
|
2010-04-22 04: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 11:00:47 -04:00
|
|
|
GetDH(self, dh);
|
2020-07-10 01:34:51 -04:00
|
|
|
ret = DH_check(dh, &codes) == 1 && codes == 0;
|
|
|
|
#endif
|
2003-07-23 12:12:24 -04:00
|
|
|
|
2020-07-10 01:34:51 -04:00
|
|
|
if (ret == 1)
|
|
|
|
return Qtrue;
|
|
|
|
else {
|
|
|
|
/* DH_check_ex() will put error entry on failure */
|
|
|
|
ossl_clear_error();
|
|
|
|
return Qfalse;
|
|
|
|
}
|
2003-07-23 12:12:24 -04:00
|
|
|
}
|
|
|
|
|
2016-08-29 01:47:09 -04:00
|
|
|
/*
|
|
|
|
* Document-method: OpenSSL::PKey::DH#set_pqg
|
|
|
|
* call-seq:
|
|
|
|
* dh.set_pqg(p, q, g) -> self
|
|
|
|
*
|
2017-09-03 08:35:27 -04:00
|
|
|
* Sets _p_, _q_, _g_ to the DH instance.
|
2016-08-29 01:47:09 -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 11:00:47 -04:00
|
|
|
OSSL_PKEY_BN_DEF3(dh, DH, pqg, p, q, g)
|
2016-08-29 01:47:09 -04:00
|
|
|
/*
|
|
|
|
* Document-method: OpenSSL::PKey::DH#set_key
|
|
|
|
* call-seq:
|
|
|
|
* dh.set_key(pub_key, priv_key) -> self
|
|
|
|
*
|
2017-09-03 08:35:27 -04:00
|
|
|
* Sets _pub_key_ and _priv_key_ for the DH instance. _priv_key_ may be +nil+.
|
2016-08-29 01:47:09 -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 11:00:47 -04:00
|
|
|
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 12:36:19 -04:00
|
|
|
|
2007-04-02 15:00:23 -04:00
|
|
|
/*
|
|
|
|
* INIT
|
|
|
|
*/
|
2003-07-23 12:12:24 -04:00
|
|
|
void
|
2014-09-30 01:25:32 -04:00
|
|
|
Init_ossl_dh(void)
|
2003-07-23 12:12:24 -04:00
|
|
|
{
|
2010-12-05 19:54:44 -05:00
|
|
|
#if 0
|
2007-03-11 22:01:19 -04:00
|
|
|
mPKey = rb_define_module_under(mOSSL, "PKey");
|
2016-08-29 01:47:09 -04:00
|
|
|
cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
|
|
|
|
ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
|
2007-03-11 22:01:19 -04:00
|
|
|
#endif
|
|
|
|
|
2011-06-12 13: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 12:12:24 -04:00
|
|
|
eDHError = rb_define_class_under(mPKey, "DHError", ePKeyError);
|
2011-06-12 13: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-12 21:15:20 -04:00
|
|
|
*
|
|
|
|
* === Accessor methods for the Diffie-Hellman parameters
|
2016-08-29 01:47:09 -04:00
|
|
|
* 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.
|
2011-06-12 21:15:20 -04:00
|
|
|
*
|
|
|
|
* === Example of a key exchange
|
2021-04-15 06:11:32 -04:00
|
|
|
* # you may send the parameters (der) and own public key (pub1) publicly
|
|
|
|
* # to the participating party
|
|
|
|
* dh1 = OpenSSL::PKey::DH.new(2048)
|
|
|
|
* der = dh1.to_der
|
|
|
|
* pub1 = dh1.pub_key
|
|
|
|
*
|
|
|
|
* # the other party generates its per-session key pair
|
|
|
|
* dhparams = OpenSSL::PKey::DH.new(der)
|
|
|
|
* dh2 = OpenSSL::PKey.generate_key(dhparams)
|
|
|
|
* pub2 = dh2.pub_key
|
2011-06-30 16:20:32 -04:00
|
|
|
*
|
2021-04-15 06:11:32 -04:00
|
|
|
* symm_key1 = dh1.compute_key(pub2)
|
|
|
|
* symm_key2 = dh2.compute_key(pub1)
|
|
|
|
* puts symm_key1 == symm_key2 # => true
|
2011-06-12 13:03:26 -04:00
|
|
|
*/
|
2003-07-23 12:12:24 -04:00
|
|
|
cDH = rb_define_class_under(mPKey, "DH", cPKey);
|
|
|
|
rb_define_method(cDH, "initialize", ossl_dh_initialize, -1);
|
2017-09-03 08:35:27 -04:00
|
|
|
rb_define_method(cDH, "initialize_copy", ossl_dh_initialize_copy, 1);
|
2003-07-23 12:12:24 -04:00
|
|
|
rb_define_method(cDH, "public?", ossl_dh_is_public, 0);
|
|
|
|
rb_define_method(cDH, "private?", ossl_dh_is_private, 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 07:24:22 -05:00
|
|
|
rb_define_method(cDH, "to_der", ossl_dh_to_der, 0);
|
2003-07-23 12:12:24 -04:00
|
|
|
rb_define_method(cDH, "params_ok?", ossl_dh_check_params, 0);
|
2011-06-12 21: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 12: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 11:00:47 -04: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 12: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 11:00:47 -04: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 12:12:24 -04:00
|
|
|
rb_define_method(cDH, "params", ossl_dh_get_params, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
#else /* defined NO_DH */
|
|
|
|
void
|
2014-09-30 01:25:32 -04:00
|
|
|
Init_ossl_dh(void)
|
2003-07-23 12:12:24 -04:00
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif /* NO_DH */
|