mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
5505449793
- SSLContext#client_cert_cb is a Proc. it is called when a client
certificate is requested by a server and no certificate was yet
set for the SSLContext. it must return an Array which includes
OpenSSL::X509::Certificate and OpenSSL::PKey::RSA/DSA objects.
- SSLContext#tmp_dh_callback is called in key exchange with DH
algorithm. it must return an OpenSSL::PKey::DH object.
* ext/openssl/ossl_ssl.c:
(ossl_sslctx_set_ciphers): ignore the argument if it's nil.
(ossl_start_ssl, ossl_ssl_write): call rb_sys_fail if errno isn't 0.
[ruby-dev:25831]
* ext/openssl/ossl_pkey.c
(GetPrivPKeyPtr, ossl_pkey_sign): should call rb_funcall first.
(DupPrivPKeyPtr): new function.
* ext/openssl/ossl_pkey_dh.c: add default DH parameters.
* ext/openssl/ossl_pkey.h: ditto.
* ext/openssl/lib/openssl/cipher.rb: fix typo. [ruby-dev:24285]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
115 lines
2.7 KiB
C
115 lines
2.7 KiB
C
/*
|
|
* $Id$
|
|
* 'OpenSSL for Ruby' project
|
|
* Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
|
|
* All rights reserved.
|
|
*/
|
|
/*
|
|
* This program is licenced under the same licence as Ruby.
|
|
* (See the file 'LICENCE'.)
|
|
*/
|
|
#if !defined(_OSSL_PKEY_H_)
|
|
#define _OSSL_PKEY_H_
|
|
|
|
extern VALUE mPKey;
|
|
extern VALUE cPKey;
|
|
extern VALUE ePKeyError;
|
|
extern ID id_private_q;
|
|
|
|
#define WrapPKey(klass, obj, pkey) do { \
|
|
if (!pkey) { \
|
|
rb_raise(rb_eRuntimeError, "PKEY wasn't initialized!"); \
|
|
} \
|
|
obj = Data_Wrap_Struct(klass, 0, EVP_PKEY_free, pkey); \
|
|
} while (0)
|
|
#define GetPKey(obj, pkey) do {\
|
|
Data_Get_Struct(obj, EVP_PKEY, pkey);\
|
|
if (!pkey) { \
|
|
rb_raise(rb_eRuntimeError, "PKEY wasn't initialized!");\
|
|
} \
|
|
} while (0)
|
|
#define SafeGetPKey(obj, pkey) do { \
|
|
OSSL_Check_Kind(obj, cPKey); \
|
|
GetPKey(obj, pkey); \
|
|
} while (0)
|
|
|
|
void ossl_generate_cb(int, int, void *);
|
|
|
|
VALUE ossl_pkey_new(EVP_PKEY *);
|
|
VALUE ossl_pkey_new_from_file(VALUE);
|
|
EVP_PKEY *GetPKeyPtr(VALUE);
|
|
EVP_PKEY *DupPKeyPtr(VALUE);
|
|
EVP_PKEY *GetPrivPKeyPtr(VALUE);
|
|
EVP_PKEY *DupPrivPKeyPtr(VALUE);
|
|
void Init_ossl_pkey(void);
|
|
|
|
/*
|
|
* RSA
|
|
*/
|
|
extern VALUE cRSA;
|
|
extern VALUE eRSAError;
|
|
|
|
VALUE ossl_rsa_new(EVP_PKEY *);
|
|
void Init_ossl_rsa(void);
|
|
|
|
/*
|
|
* DSA
|
|
*/
|
|
extern VALUE cDSA;
|
|
extern VALUE eDSAError;
|
|
|
|
VALUE ossl_dsa_new(EVP_PKEY *);
|
|
void Init_ossl_dsa(void);
|
|
|
|
/*
|
|
* DH
|
|
*/
|
|
extern VALUE cDH;
|
|
extern VALUE eDHError;
|
|
extern DH *OSSL_DEFAULT_DH_512;
|
|
extern DH *OSSL_DEFAULT_DH_1024;
|
|
|
|
VALUE ossl_dh_new(EVP_PKEY *);
|
|
void Init_ossl_dh(void);
|
|
|
|
#define OSSL_PKEY_BN(keytype, name) \
|
|
static VALUE ossl_##keytype##_get_##name(VALUE self) \
|
|
{ \
|
|
EVP_PKEY *pkey; \
|
|
BIGNUM *bn; \
|
|
\
|
|
GetPKey(self, pkey); \
|
|
bn = pkey->pkey.keytype->name; \
|
|
if (bn == NULL) \
|
|
return Qnil; \
|
|
return ossl_bn_new(bn); \
|
|
} \
|
|
static VALUE ossl_##keytype##_set_##name(VALUE self, VALUE bignum) \
|
|
{ \
|
|
EVP_PKEY *pkey; \
|
|
BIGNUM *bn; \
|
|
\
|
|
GetPKey(self, pkey); \
|
|
if (NIL_P(bignum)) { \
|
|
BN_clear_free(pkey->pkey.keytype->name); \
|
|
pkey->pkey.keytype->name = NULL; \
|
|
return Qnil; \
|
|
} \
|
|
\
|
|
bn = GetBNPtr(bignum); \
|
|
if (pkey->pkey.keytype->name == NULL) \
|
|
pkey->pkey.keytype->name = BN_new(); \
|
|
if (pkey->pkey.keytype->name == NULL) \
|
|
ossl_raise(eBNError, NULL); \
|
|
if (BN_copy(pkey->pkey.keytype->name, bn) == NULL) \
|
|
ossl_raise(eBNError, NULL); \
|
|
return bignum; \
|
|
}
|
|
|
|
#define DEF_OSSL_PKEY_BN(class, keytype, name) \
|
|
do { \
|
|
rb_define_method(class, #name, ossl_##keytype##_get_##name, 0); \
|
|
rb_define_method(class, #name "=", ossl_##keytype##_set_##name, 1);\
|
|
} while (0)
|
|
|
|
#endif /* _OSSL_PKEY_H_ */
|