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

* ext/openssl: suppress warnings.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@18172 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-07-22 19:16:41 +00:00
parent 163e5155ce
commit e934121534
30 changed files with 194 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Wed Jul 23 04:16:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/openssl: suppress warnings.
Wed Jul 23 00:34:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/openssl: suppress warnings.
Tue Jul 22 09:51:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Jul 22 09:51:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el: fix here-doc strings with inner quotes. patches * misc/ruby-mode.el: fix here-doc strings with inner quotes. patches

12
ext/openssl/openssl_missing.h
View file

@ -21,7 +21,7 @@ extern "C" {
#if !defined(PEM_read_bio_DSAPublicKey) #if !defined(PEM_read_bio_DSAPublicKey)
# define PEM_read_bio_DSAPublicKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \ # define PEM_read_bio_DSAPublicKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
(char *(*)())d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,bp,(char **)x,cb,u) (d2i_of_void *)d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,bp,(void **)x,cb,u)
#endif #endif
#if !defined(PEM_write_bio_DSAPublicKey) #if !defined(PEM_write_bio_DSAPublicKey)
@ -33,27 +33,27 @@ extern "C" {
#if !defined(DSAPrivateKey_dup) #if !defined(DSAPrivateKey_dup)
# define DSAPrivateKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPrivateKey, \ # define DSAPrivateKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPrivateKey, \
(char *(*)())d2i_DSAPrivateKey,(char *)dsa) (d2i_of_void *)d2i_DSAPrivateKey,(char *)dsa)
#endif #endif
#if !defined(DSAPublicKey_dup) #if !defined(DSAPublicKey_dup)
# define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPublicKey, \ # define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPublicKey, \
(char *(*)())d2i_DSAPublicKey,(char *)dsa) (d2i_of_void *)d2i_DSAPublicKey,(char *)dsa)
#endif #endif
#if !defined(X509_REVOKED_dup) #if !defined(X509_REVOKED_dup)
# define X509_REVOKED_dup(rev) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \ # define X509_REVOKED_dup(rev) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
(char *(*)())d2i_X509_REVOKED, (char *)rev) (d2i_of_void *)d2i_X509_REVOKED, (char *)rev)
#endif #endif
#if !defined(PKCS7_SIGNER_INFO_dup) #if !defined(PKCS7_SIGNER_INFO_dup)
# define PKCS7_SIGNER_INFO_dup(si) (PKCS7_SIGNER_INFO *)ASN1_dup((int (*)())i2d_PKCS7_SIGNER_INFO, \ # define PKCS7_SIGNER_INFO_dup(si) (PKCS7_SIGNER_INFO *)ASN1_dup((int (*)())i2d_PKCS7_SIGNER_INFO, \
(char *(*)())d2i_PKCS7_SIGNER_INFO, (char *)si) (d2i_of_void *)d2i_PKCS7_SIGNER_INFO, (char *)si)
#endif #endif
#if !defined(PKCS7_RECIP_INFO_dup) #if !defined(PKCS7_RECIP_INFO_dup)
# define PKCS7_RECIP_INFO_dup(ri) (PKCS7_RECIP_INFO *)ASN1_dup((int (*)())i2d_PKCS7_RECIP_INFO, \ # define PKCS7_RECIP_INFO_dup(ri) (PKCS7_RECIP_INFO *)ASN1_dup((int (*)())i2d_PKCS7_RECIP_INFO, \
(char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri) (d2i_of_void *)d2i_PKCS7_RECIP_INFO, (char *)ri)
#endif #endif
#if !defined(HAVE_EVP_MD_CTX_INIT) #if !defined(HAVE_EVP_MD_CTX_INIT)

4
ext/openssl/ossl.c
View file

@ -15,7 +15,7 @@
* String to HEXString conversion * String to HEXString conversion
*/ */
int int
string2hex(char *buf, int buf_len, char **hexbuf, int *hexbuf_len) string2hex(const unsigned char *buf, int buf_len, char **hexbuf, int *hexbuf_len)
{ {
static const char hex[]="0123456789abcdef"; static const char hex[]="0123456789abcdef";
int i, len = 2 * buf_len; int i, len = 2 * buf_len;
@ -446,7 +446,7 @@ Init_openssl()
/* /*
* Verify callback Proc index for ext-data * Verify callback Proc index for ext-data
*/ */
if ((ossl_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, "ossl_verify_cb_idx", 0, 0, 0)) < 0) if ((ossl_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, (void *)"ossl_verify_cb_idx", 0, 0, 0)) < 0)
ossl_raise(eOSSLError, "X509_STORE_CTX_get_ex_new_index"); ossl_raise(eOSSLError, "X509_STORE_CTX_get_ex_new_index");
/* /*

2
ext/openssl/ossl.h
View file

@ -110,7 +110,7 @@ extern VALUE eOSSLError;
/* /*
* String to HEXString conversion * String to HEXString conversion
*/ */
int string2hex(char *, int, char **, int *); int string2hex(const unsigned char *, int, char **, int *);
/* /*
* Data Conversion * Data Conversion

42
ext/openssl/ossl_asn1.c
View file

@ -33,7 +33,7 @@ asn1time_to_time(ASN1_TIME *time)
switch (time->type) { switch (time->type) {
case V_ASN1_UTCTIME: case V_ASN1_UTCTIME:
if (sscanf(time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon, if (sscanf((const char *)time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) { &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
ossl_raise(rb_eTypeError, "bad UTCTIME format"); ossl_raise(rb_eTypeError, "bad UTCTIME format");
} }
@ -44,7 +44,7 @@ asn1time_to_time(ASN1_TIME *time)
} }
break; break;
case V_ASN1_GENERALIZEDTIME: case V_ASN1_GENERALIZEDTIME:
if (sscanf(time->data, "%4d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon, if (sscanf((const char *)time->data, "%4d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) { &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
ossl_raise(rb_eTypeError, "bad GENERALIZEDTIME format" ); ossl_raise(rb_eTypeError, "bad GENERALIZEDTIME format" );
} }
@ -80,7 +80,7 @@ time_to_time_t(VALUE time)
VALUE VALUE
asn1str_to_str(ASN1_STRING *str) asn1str_to_str(ASN1_STRING *str)
{ {
return rb_str_new(str->data, str->length); return rb_str_new((const char *)str->data, str->length);
} }
/* /*
@ -214,7 +214,7 @@ obj_to_asn1bstr(VALUE obj, long unused_bits)
StringValue(obj); StringValue(obj);
if(!(bstr = ASN1_BIT_STRING_new())) if(!(bstr = ASN1_BIT_STRING_new()))
ossl_raise(eASN1Error, NULL); ossl_raise(eASN1Error, NULL);
ASN1_BIT_STRING_set(bstr, RSTRING_PTR(obj), RSTRING_LEN(obj)); ASN1_BIT_STRING_set(bstr, (unsigned char *)RSTRING_PTR(obj), RSTRING_LEN(obj));
bstr->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear */ bstr->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear */
bstr->flags |= ASN1_STRING_FLAG_BITS_LEFT|(unused_bits&0x07); bstr->flags |= ASN1_STRING_FLAG_BITS_LEFT|(unused_bits&0x07);
@ -307,7 +307,7 @@ static VALUE
decode_bool(unsigned char* der, int length) decode_bool(unsigned char* der, int length)
{ {
int bool; int bool;
unsigned char *p; const unsigned char *p;
p = der; p = der;
if((bool = d2i_ASN1_BOOLEAN(NULL, &p, length)) < 0) if((bool = d2i_ASN1_BOOLEAN(NULL, &p, length)) < 0)
@ -320,7 +320,7 @@ static VALUE
decode_int(unsigned char* der, int length) decode_int(unsigned char* der, int length)
{ {
ASN1_INTEGER *ai; ASN1_INTEGER *ai;
unsigned char *p; const unsigned char *p;
VALUE ret; VALUE ret;
int status = 0; int status = 0;
@ -339,7 +339,8 @@ static VALUE
decode_bstr(unsigned char* der, int length, long *unused_bits) decode_bstr(unsigned char* der, int length, long *unused_bits)
{ {
ASN1_BIT_STRING *bstr; ASN1_BIT_STRING *bstr;
unsigned char *p, *buf; const unsigned char *p;
char *buf;
long len; long len;
VALUE ret; VALUE ret;
@ -365,7 +366,7 @@ static VALUE
decode_enum(unsigned char* der, int length) decode_enum(unsigned char* der, int length)
{ {
ASN1_ENUMERATED *ai; ASN1_ENUMERATED *ai;
unsigned char *p; const unsigned char *p;
VALUE ret; VALUE ret;
int status = 0; int status = 0;
@ -384,7 +385,7 @@ static VALUE
decode_null(unsigned char* der, int length) decode_null(unsigned char* der, int length)
{ {
ASN1_NULL *null; ASN1_NULL *null;
unsigned char *p; const unsigned char *p;
p = der; p = der;
if(!(null = d2i_ASN1_NULL(NULL, &p, length))) if(!(null = d2i_ASN1_NULL(NULL, &p, length)))
@ -398,7 +399,7 @@ static VALUE
decode_obj(unsigned char* der, int length) decode_obj(unsigned char* der, int length)
{ {
ASN1_OBJECT *obj; ASN1_OBJECT *obj;
unsigned char *p; const unsigned char *p;
VALUE ret; VALUE ret;
int nid; int nid;
BIO *bio; BIO *bio;
@ -427,7 +428,7 @@ static VALUE
decode_time(unsigned char* der, int length) decode_time(unsigned char* der, int length)
{ {
ASN1_TIME *time; ASN1_TIME *time;
unsigned char *p; const unsigned char *p;
VALUE ret; VALUE ret;
int status = 0; int status = 0;
@ -702,7 +703,7 @@ ossl_asn1data_to_der(VALUE self)
if((length = ASN1_object_size(1, RSTRING_LEN(value), tag)) <= 0) if((length = ASN1_object_size(1, RSTRING_LEN(value), tag)) <= 0)
ossl_raise(eASN1Error, NULL); ossl_raise(eASN1Error, NULL);
der = rb_str_new(0, length); der = rb_str_new(0, length);
p = RSTRING_PTR(der); p = (unsigned char *)RSTRING_PTR(der);
ASN1_put_object(&p, is_cons, RSTRING_LEN(value), tag, tag_class); ASN1_put_object(&p, is_cons, RSTRING_LEN(value), tag, tag_class);
memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value)); memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
p += RSTRING_LEN(value); p += RSTRING_LEN(value);
@ -716,6 +717,7 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
int once, int yield) int once, int yield)
{ {
unsigned char *start, *p; unsigned char *start, *p;
const unsigned char *p0;
long len, off = *offset; long len, off = *offset;
int hlen, tag, tc, j; int hlen, tag, tc, j;
VALUE ary, asn1data, value, tag_class; VALUE ary, asn1data, value, tag_class;
@ -724,7 +726,9 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
p = *pp; p = *pp;
while(length > 0){ while(length > 0){
start = p; start = p;
j = ASN1_get_object(&p, &len, &tag, &tc, length); p0 = p;
j = ASN1_get_object(&p0, &len, &tag, &tc, length);
p = (unsigned char *)p0;
if(j & 0x80) ossl_raise(eASN1Error, NULL); if(j & 0x80) ossl_raise(eASN1Error, NULL);
hlen = p - start; hlen = p - start;
if(yield){ if(yield){
@ -759,7 +763,7 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
else value = ossl_asn1_decode0(&p, len, &off, depth+1, 0, yield); else value = ossl_asn1_decode0(&p, len, &off, depth+1, 0, yield);
} }
else{ else{
value = rb_str_new(p, len); value = rb_str_new((const char *)p, len);
p += len; p += len;
off += len; off += len;
} }
@ -824,7 +828,7 @@ ossl_asn1_traverse(VALUE self, VALUE obj)
obj = ossl_to_der_if_possible(obj); obj = ossl_to_der_if_possible(obj);
tmp = rb_str_new4(StringValue(obj)); tmp = rb_str_new4(StringValue(obj));
p = RSTRING_PTR(tmp); p = (unsigned char *)RSTRING_PTR(tmp);
ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 1); ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 1);
return Qnil; return Qnil;
@ -840,7 +844,7 @@ ossl_asn1_decode(VALUE self, VALUE obj)
obj = ossl_to_der_if_possible(obj); obj = ossl_to_der_if_possible(obj);
tmp = rb_str_new4(StringValue(obj)); tmp = rb_str_new4(StringValue(obj));
p = RSTRING_PTR(tmp); p = (unsigned char *)RSTRING_PTR(tmp);
ary = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 1, 0); ary = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 1, 0);
ret = rb_ary_entry(ary, 0); ret = rb_ary_entry(ary, 0);
@ -857,7 +861,7 @@ ossl_asn1_decode_all(VALUE self, VALUE obj)
obj = ossl_to_der_if_possible(obj); obj = ossl_to_der_if_possible(obj);
tmp = rb_str_new4(StringValue(obj)); tmp = rb_str_new4(StringValue(obj));
p = RSTRING_PTR(tmp); p = (unsigned char *)RSTRING_PTR(tmp);
ret = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 0); ret = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 0);
return ret; return ret;
@ -954,7 +958,7 @@ ossl_asn1prim_to_der(VALUE self)
ossl_ASN1_TYPE_free(asn1); ossl_ASN1_TYPE_free(asn1);
reallen = p - buf; reallen = p - buf;
assert(reallen <= length); assert(reallen <= length);
str = ossl_buf2str(buf, reallen); /* buf will be free in ossl_buf2str */ str = ossl_buf2str((char *)buf, reallen); /* buf will be free in ossl_buf2str */
return str; return str;
} }
@ -976,7 +980,7 @@ ossl_asn1cons_to_der(VALUE self)
seq_len = ASN1_object_size(1, RSTRING_LEN(value), tag); seq_len = ASN1_object_size(1, RSTRING_LEN(value), tag);
length = ASN1_object_size(1, seq_len, tn); length = ASN1_object_size(1, seq_len, tn);
str = rb_str_new(0, length); str = rb_str_new(0, length);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
if(tc == V_ASN1_UNIVERSAL) if(tc == V_ASN1_UNIVERSAL)
ASN1_put_object(&p, 1, RSTRING_LEN(value), tn, tc); ASN1_put_object(&p, 1, RSTRING_LEN(value), tn, tc);
else{ else{

8
ext/openssl/ossl_bn.c
View file

@ -131,12 +131,12 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
switch (base) { switch (base) {
case 0: case 0:
if (!BN_mpi2bn(RSTRING_PTR(str), RSTRING_LEN(str), bn)) { if (!BN_mpi2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
ossl_raise(eBNError, NULL); ossl_raise(eBNError, NULL);
} }
break; break;
case 2: case 2:
if (!BN_bin2bn(RSTRING_PTR(str), RSTRING_LEN(str), bn)) { if (!BN_bin2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
ossl_raise(eBNError, NULL); ossl_raise(eBNError, NULL);
} }
break; break;
@ -185,13 +185,13 @@ ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
case 0: case 0:
len = BN_bn2mpi(bn, NULL); len = BN_bn2mpi(bn, NULL);
str = rb_str_new(0, len); str = rb_str_new(0, len);
if (BN_bn2mpi(bn, RSTRING_PTR(str)) != len) if (BN_bn2mpi(bn, (unsigned char *)RSTRING_PTR(str)) != len)
ossl_raise(eBNError, NULL); ossl_raise(eBNError, NULL);
break; break;
case 2: case 2:
len = BN_num_bytes(bn); len = BN_num_bytes(bn);
str = rb_str_new(0, len); str = rb_str_new(0, len);
if (BN_bn2bin(bn, RSTRING_PTR(str)) != len) if (BN_bn2bin(bn, (unsigned char *)RSTRING_PTR(str)) != len)
ossl_raise(eBNError, NULL); ossl_raise(eBNError, NULL);
break; break;
case 10: case 10:

43
ext/openssl/ossl_cipher.c
View file

@ -186,7 +186,7 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
* We deprecated the arguments for this method, but we decided * We deprecated the arguments for this method, but we decided
* keeping this behaviour for backward compatibility. * keeping this behaviour for backward compatibility.
*/ */
char *cname = rb_class2name(rb_obj_class(self)); const char *cname = rb_class2name(rb_obj_class(self));
rb_warn("argumtents for %s#encrypt and %s#decrypt were deprecated; " rb_warn("argumtents for %s#encrypt and %s#decrypt were deprecated; "
"use %s#pkcs5_keyivgen to derive key and IV", "use %s#pkcs5_keyivgen to derive key and IV",
cname, cname, cname); cname, cname, cname);
@ -202,7 +202,7 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
else memcpy(iv, RSTRING_PTR(init_v), sizeof(iv)); else memcpy(iv, RSTRING_PTR(init_v), sizeof(iv));
} }
EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), EVP_md5(), iv, EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), EVP_md5(), iv,
RSTRING_PTR(pass), RSTRING_LEN(pass), 1, key, NULL); (unsigned char *)RSTRING_PTR(pass), RSTRING_LEN(pass), 1, key, NULL);
p_key = key; p_key = key;
p_iv = iv; p_iv = iv;
} }
@ -279,13 +279,13 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
StringValue(vsalt); StringValue(vsalt);
if(RSTRING_LEN(vsalt) != PKCS5_SALT_LEN) if(RSTRING_LEN(vsalt) != PKCS5_SALT_LEN)
rb_raise(eCipherError, "salt must be an 8-octet string"); rb_raise(eCipherError, "salt must be an 8-octet string");
salt = RSTRING_PTR(vsalt); salt = (unsigned char *)RSTRING_PTR(vsalt);
} }
iter = NIL_P(viter) ? 2048 : NUM2INT(viter); iter = NIL_P(viter) ? 2048 : NUM2INT(viter);
digest = NIL_P(vdigest) ? EVP_md5() : GetDigestPtr(vdigest); digest = NIL_P(vdigest) ? EVP_md5() : GetDigestPtr(vdigest);
GetCipher(self, ctx); GetCipher(self, ctx);
EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), digest, salt, EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), digest, salt,
RSTRING_PTR(vpass), RSTRING_LEN(vpass), iter, key, iv); (unsigned char *)RSTRING_PTR(vpass), RSTRING_LEN(vpass), iter, key, iv);
if (EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, -1) != 1) if (EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, -1) != 1)
ossl_raise(eCipherError, NULL); ossl_raise(eCipherError, NULL);
OPENSSL_cleanse(key, sizeof key); OPENSSL_cleanse(key, sizeof key);
@ -295,26 +295,6 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
} }
/*
* call-seq:
* cipher << data -> string
*
* === Parameters
* +data+ is a nonempty string.
*
* This method is deprecated and not available in 1.9.x or later.
*/
static VALUE
ossl_cipher_update_deprecated(VALUE self, VALUE data)
{
char *cname;
cname = rb_class2name(rb_obj_class(self));
rb_warning("%s#<< is deprecated; use %s#update instead", cname, cname);
return rb_funcall(self, rb_intern("update"), 1, data);
}
/* /*
* call-seq: * call-seq:
* cipher.update(data [, buffer]) -> string or buffer * cipher.update(data [, buffer]) -> string or buffer
@ -327,14 +307,14 @@ static VALUE
ossl_cipher_update(int argc, VALUE *argv, VALUE self) ossl_cipher_update(int argc, VALUE *argv, VALUE self)
{ {
EVP_CIPHER_CTX *ctx; EVP_CIPHER_CTX *ctx;
char *in; unsigned char *in;
int in_len, out_len; int in_len, out_len;
VALUE data, str; VALUE data, str;
rb_scan_args(argc, argv, "11", &data, &str); rb_scan_args(argc, argv, "11", &data, &str);
StringValue(data); StringValue(data);
in = RSTRING_PTR(data); in = (unsigned char *)RSTRING_PTR(data);
if ((in_len = RSTRING_LEN(data)) == 0) if ((in_len = RSTRING_LEN(data)) == 0)
rb_raise(rb_eArgError, "data must not be empty"); rb_raise(rb_eArgError, "data must not be empty");
GetCipher(self, ctx); GetCipher(self, ctx);
@ -347,7 +327,7 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
rb_str_resize(str, out_len); rb_str_resize(str, out_len);
} }
if (!EVP_CipherUpdate(ctx, RSTRING_PTR(str), &out_len, in, in_len)) if (!EVP_CipherUpdate(ctx, (unsigned char *)RSTRING_PTR(str), &out_len, in, in_len))
ossl_raise(eCipherError, NULL); ossl_raise(eCipherError, NULL);
assert(out_len < RSTRING_LEN(str)); assert(out_len < RSTRING_LEN(str));
rb_str_set_len(str, out_len); rb_str_set_len(str, out_len);
@ -372,7 +352,7 @@ ossl_cipher_final(VALUE self)
GetCipher(self, ctx); GetCipher(self, ctx);
str = rb_str_new(0, EVP_CIPHER_CTX_block_size(ctx)); str = rb_str_new(0, EVP_CIPHER_CTX_block_size(ctx));
if (!EVP_CipherFinal_ex(ctx, RSTRING_PTR(str), &out_len)) if (!EVP_CipherFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), &out_len))
ossl_raise(eCipherError, NULL); ossl_raise(eCipherError, NULL);
assert(out_len <= RSTRING_LEN(str)); assert(out_len <= RSTRING_LEN(str));
rb_str_set_len(str, out_len); rb_str_set_len(str, out_len);
@ -415,7 +395,7 @@ ossl_cipher_set_key(VALUE self, VALUE key)
if (RSTRING_LEN(key) < EVP_CIPHER_CTX_key_length(ctx)) if (RSTRING_LEN(key) < EVP_CIPHER_CTX_key_length(ctx))
ossl_raise(eCipherError, "key length too short"); ossl_raise(eCipherError, "key length too short");
if (EVP_CipherInit_ex(ctx, NULL, NULL, RSTRING_PTR(key), NULL, -1) != 1) if (EVP_CipherInit_ex(ctx, NULL, NULL, (unsigned char *)RSTRING_PTR(key), NULL, -1) != 1)
ossl_raise(eCipherError, NULL); ossl_raise(eCipherError, NULL);
return key; return key;
@ -440,7 +420,7 @@ ossl_cipher_set_iv(VALUE self, VALUE iv)
if (RSTRING_LEN(iv) < EVP_CIPHER_CTX_iv_length(ctx)) if (RSTRING_LEN(iv) < EVP_CIPHER_CTX_iv_length(ctx))
ossl_raise(eCipherError, "iv length too short"); ossl_raise(eCipherError, "iv length too short");
if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, RSTRING_PTR(iv), -1) != 1) if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, (unsigned char *)RSTRING_PTR(iv), -1) != 1)
ossl_raise(eCipherError, NULL); ossl_raise(eCipherError, NULL);
return iv; return iv;
@ -551,9 +531,6 @@ Init_ossl_cipher(void)
rb_define_method(cCipher, "decrypt", ossl_cipher_decrypt, -1); rb_define_method(cCipher, "decrypt", ossl_cipher_decrypt, -1);
rb_define_method(cCipher, "pkcs5_keyivgen", ossl_cipher_pkcs5_keyivgen, -1); rb_define_method(cCipher, "pkcs5_keyivgen", ossl_cipher_pkcs5_keyivgen, -1);
rb_define_method(cCipher, "update", ossl_cipher_update, -1); rb_define_method(cCipher, "update", ossl_cipher_update, -1);
#if RUBY_VERSION_CODE < 190
rb_define_method(cCipher, "<<", ossl_cipher_update_deprecated, 1);
#endif
rb_define_method(cCipher, "final", ossl_cipher_final, 0); rb_define_method(cCipher, "final", ossl_cipher_final, 0);
rb_define_method(cCipher, "name", ossl_cipher_name, 0); rb_define_method(cCipher, "name", ossl_cipher_name, 0);
rb_define_method(cCipher, "key=", ossl_cipher_set_key, 1); rb_define_method(cCipher, "key=", ossl_cipher_set_key, 1);

2
ext/openssl/ossl_config.c
View file

@ -421,7 +421,7 @@ static VALUE
ossl_config_inspect(VALUE self) ossl_config_inspect(VALUE self)
{ {
VALUE str, ary = ossl_config_get_sections(self); VALUE str, ary = ossl_config_get_sections(self);
char *cname = rb_class2name(rb_obj_class(self)); const char *cname = rb_class2name(rb_obj_class(self));
str = rb_str_new2("#<"); str = rb_str_new2("#<");
rb_str_cat2(str, cname); rb_str_cat2(str, cname);

3
ext/openssl/ossl_digest.c
View file

@ -96,7 +96,6 @@ ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
{ {
EVP_MD_CTX *ctx; EVP_MD_CTX *ctx;
const EVP_MD *md; const EVP_MD *md;
char *name;
VALUE type, data; VALUE type, data;
rb_scan_args(argc, argv, "11", &type, &data); rb_scan_args(argc, argv, "11", &type, &data);
@ -182,7 +181,7 @@ ossl_digest_finish(int argc, VALUE *argv, VALUE self)
rb_str_resize(str, EVP_MD_CTX_size(ctx)); rb_str_resize(str, EVP_MD_CTX_size(ctx));
} }
EVP_DigestFinal_ex(ctx, RSTRING_PTR(str), NULL); EVP_DigestFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), NULL);
return str; return str;
} }

2
ext/openssl/ossl_engine.c
View file

@ -326,7 +326,7 @@ static VALUE
ossl_engine_inspect(VALUE self) ossl_engine_inspect(VALUE self)
{ {
VALUE str; VALUE str;
char *cname = rb_class2name(rb_obj_class(self)); const char *cname = rb_class2name(rb_obj_class(self));
str = rb_str_new2("#<"); str = rb_str_new2("#<");
rb_str_cat2(str, cname); rb_str_cat2(str, cname);

30
ext/openssl/ossl_hmac.c
View file

@ -103,13 +103,13 @@ ossl_hmac_update(VALUE self, VALUE data)
StringValue(data); StringValue(data);
GetHMAC(self, ctx); GetHMAC(self, ctx);
HMAC_Update(ctx, RSTRING_PTR(data), RSTRING_LEN(data)); HMAC_Update(ctx, (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data));
return self; return self;
} }
static void static void
hmac_final(HMAC_CTX *ctx, char **buf, int *buf_len) hmac_final(HMAC_CTX *ctx, unsigned char **buf, unsigned int *buf_len)
{ {
HMAC_CTX final; HMAC_CTX final;
@ -132,13 +132,13 @@ static VALUE
ossl_hmac_digest(VALUE self) ossl_hmac_digest(VALUE self)
{ {
HMAC_CTX *ctx; HMAC_CTX *ctx;
char *buf; unsigned char *buf;
int buf_len; unsigned int buf_len;
VALUE digest; VALUE digest;
GetHMAC(self, ctx); GetHMAC(self, ctx);
hmac_final(ctx, &buf, &buf_len); hmac_final(ctx, &buf, &buf_len);
digest = ossl_buf2str(buf, buf_len); digest = ossl_buf2str((char *)buf, buf_len);
return digest; return digest;
} }
@ -152,8 +152,9 @@ static VALUE
ossl_hmac_hexdigest(VALUE self) ossl_hmac_hexdigest(VALUE self)
{ {
HMAC_CTX *ctx; HMAC_CTX *ctx;
char *buf, *hexbuf; unsigned char *buf;
int buf_len; char *hexbuf;
unsigned int buf_len;
VALUE hexdigest; VALUE hexdigest;
GetHMAC(self, ctx); GetHMAC(self, ctx);
@ -192,15 +193,15 @@ ossl_hmac_reset(VALUE self)
static VALUE static VALUE
ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data) ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
{ {
char *buf; unsigned char *buf;
int buf_len; unsigned int buf_len;
StringValue(key); StringValue(key);
StringValue(data); StringValue(data);
buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key), buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len); (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
return rb_str_new(buf, buf_len); return rb_str_new((const char *)buf, buf_len);
} }
/* /*
@ -211,15 +212,16 @@ ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
static VALUE static VALUE
ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data) ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
{ {
char *buf, *hexbuf; unsigned char *buf;
int buf_len; char *hexbuf;
unsigned int buf_len;
VALUE hexdigest; VALUE hexdigest;
StringValue(key); StringValue(key);
StringValue(data); StringValue(data);
buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key), buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len); (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) { if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
ossl_raise(eHMACError, "Cannot convert buf to hexbuf"); ossl_raise(eHMACError, "Cannot convert buf to hexbuf");
} }

8
ext/openssl/ossl_ns_spki.c
View file

@ -56,14 +56,14 @@ ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
{ {
NETSCAPE_SPKI *spki; NETSCAPE_SPKI *spki;
VALUE buffer; VALUE buffer;
unsigned char *p; const unsigned char *p;
if (rb_scan_args(argc, argv, "01", &buffer) == 0) { if (rb_scan_args(argc, argv, "01", &buffer) == 0) {
return self; return self;
} }
StringValue(buffer); StringValue(buffer);
if (!(spki = NETSCAPE_SPKI_b64_decode(RSTRING_PTR(buffer), -1))) { if (!(spki = NETSCAPE_SPKI_b64_decode(RSTRING_PTR(buffer), -1))) {
p = RSTRING_PTR(buffer); p = (unsigned char *)RSTRING_PTR(buffer);
if (!(spki = d2i_NETSCAPE_SPKI(NULL, &p, RSTRING_LEN(buffer)))) { if (!(spki = d2i_NETSCAPE_SPKI(NULL, &p, RSTRING_LEN(buffer)))) {
ossl_raise(eSPKIError, NULL); ossl_raise(eSPKIError, NULL);
} }
@ -87,7 +87,7 @@ ossl_spki_to_der(VALUE self)
if ((len = i2d_NETSCAPE_SPKI(spki, NULL)) <= 0) if ((len = i2d_NETSCAPE_SPKI(spki, NULL)) <= 0)
ossl_raise(eX509CertError, NULL); ossl_raise(eX509CertError, NULL);
str = rb_str_new(0, len); str = rb_str_new(0, len);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
if (i2d_NETSCAPE_SPKI(spki, &p) <= 0) if (i2d_NETSCAPE_SPKI(spki, &p) <= 0)
ossl_raise(eX509CertError, NULL); ossl_raise(eX509CertError, NULL);
ossl_str_adjust(str, p); ossl_str_adjust(str, p);
@ -172,7 +172,7 @@ ossl_spki_get_challenge(VALUE self)
return rb_str_new(0, 0); return rb_str_new(0, 0);
} }
return rb_str_new(spki->spkac->challenge->data, return rb_str_new((const char *)spki->spkac->challenge->data,
spki->spkac->challenge->length); spki->spkac->challenge->length);
} }

23
ext/openssl/ossl_ocsp.c
View file

@ -103,15 +103,15 @@ static VALUE
ossl_ocspreq_initialize(int argc, VALUE *argv, VALUE self) ossl_ocspreq_initialize(int argc, VALUE *argv, VALUE self)
{ {
VALUE arg; VALUE arg;
unsigned char *p; const unsigned char *p;
rb_scan_args(argc, argv, "01", &arg); rb_scan_args(argc, argv, "01", &arg);
if(!NIL_P(arg)){ if(!NIL_P(arg)){
OCSP_REQUEST *req = DATA_PTR(self);
arg = ossl_to_der_if_possible(arg); arg = ossl_to_der_if_possible(arg);
StringValue(arg); StringValue(arg);
p = (unsigned char*)RSTRING_PTR(arg); p = (unsigned char*)RSTRING_PTR(arg);
if(!d2i_OCSP_REQUEST((OCSP_REQUEST**)&DATA_PTR(self), &p, if(!d2i_OCSP_REQUEST(&req, &p, RSTRING_LEN(arg)) && (DATA_PTR(self) = req, 1)){
RSTRING_LEN(arg))){
ossl_raise(eOCSPError, "cannot load DER encoded request"); ossl_raise(eOCSPError, "cannot load DER encoded request");
} }
} }
@ -134,7 +134,7 @@ ossl_ocspreq_add_nonce(int argc, VALUE *argv, VALUE self)
else{ else{
StringValue(val); StringValue(val);
GetOCSPReq(self, req); GetOCSPReq(self, req);
ret = OCSP_request_add1_nonce(req, RSTRING_PTR(val), RSTRING_LEN(val)); ret = OCSP_request_add1_nonce(req, (unsigned char *)RSTRING_PTR(val), RSTRING_LEN(val));
} }
if(!ret) ossl_raise(eOCSPError, NULL); if(!ret) ossl_raise(eOCSPError, NULL);
@ -265,7 +265,7 @@ ossl_ocspreq_to_der(VALUE self)
if((len = i2d_OCSP_REQUEST(req, NULL)) <= 0) if((len = i2d_OCSP_REQUEST(req, NULL)) <= 0)
ossl_raise(eOCSPError, NULL); ossl_raise(eOCSPError, NULL);
str = rb_str_new(0, len); str = rb_str_new(0, len);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
if(i2d_OCSP_REQUEST(req, &p) <= 0) if(i2d_OCSP_REQUEST(req, &p) <= 0)
ossl_raise(eOCSPError, NULL); ossl_raise(eOCSPError, NULL);
ossl_str_adjust(str, p); ossl_str_adjust(str, p);
@ -310,15 +310,16 @@ static VALUE
ossl_ocspres_initialize(int argc, VALUE *argv, VALUE self) ossl_ocspres_initialize(int argc, VALUE *argv, VALUE self)
{ {
VALUE arg; VALUE arg;
unsigned char *p; const unsigned char *p;
rb_scan_args(argc, argv, "01", &arg); rb_scan_args(argc, argv, "01", &arg);
if(!NIL_P(arg)){ if(!NIL_P(arg)){
OCSP_RESPONSE *res = DATA_PTR(self);
arg = ossl_to_der_if_possible(arg); arg = ossl_to_der_if_possible(arg);
StringValue(arg); StringValue(arg);
p = RSTRING_PTR(arg); p = (unsigned char *)RSTRING_PTR(arg);
if(!d2i_OCSP_RESPONSE((OCSP_RESPONSE**)&DATA_PTR(self), &p, if(!d2i_OCSP_RESPONSE(&res, &p, RSTRING_LEN(arg)) &&
RSTRING_LEN(arg))){ (DATA_PTR(self) = res, 1)){
ossl_raise(eOCSPError, "cannot load DER encoded response"); ossl_raise(eOCSPError, "cannot load DER encoded response");
} }
} }
@ -377,7 +378,7 @@ ossl_ocspres_to_der(VALUE self)
if((len = i2d_OCSP_RESPONSE(res, NULL)) <= 0) if((len = i2d_OCSP_RESPONSE(res, NULL)) <= 0)
ossl_raise(eOCSPError, NULL); ossl_raise(eOCSPError, NULL);
str = rb_str_new(0, len); str = rb_str_new(0, len);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
if(i2d_OCSP_RESPONSE(res, NULL) <= 0) if(i2d_OCSP_RESPONSE(res, NULL) <= 0)
ossl_raise(eOCSPError, NULL); ossl_raise(eOCSPError, NULL);
ossl_str_adjust(str, p); ossl_str_adjust(str, p);
@ -436,7 +437,7 @@ ossl_ocspbres_add_nonce(int argc, VALUE *argv, VALUE self)
else{ else{
StringValue(val); StringValue(val);
GetOCSPBasicRes(self, bs); GetOCSPBasicRes(self, bs);
ret = OCSP_basic_add1_nonce(bs, RSTRING_PTR(val), RSTRING_LEN(val)); ret = OCSP_basic_add1_nonce(bs, (unsigned char *)RSTRING_PTR(val), RSTRING_LEN(val));
} }
if(!ret) ossl_raise(eOCSPError, NULL); if(!ret) ossl_raise(eOCSPError, NULL);

8
ext/openssl/ossl_pkcs12.c
View file

@ -137,15 +137,17 @@ ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
X509 *x509; X509 *x509;
STACK_OF(X509) *x509s = NULL; STACK_OF(X509) *x509s = NULL;
int st = 0; int st = 0;
PKCS12 *pkcs = DATA_PTR(self);
if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) return self; if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) return self;
passphrase = NIL_P(pass) ? NULL : StringValuePtr(pass); passphrase = NIL_P(pass) ? NULL : StringValuePtr(pass);
in = ossl_obj2bio(arg); in = ossl_obj2bio(arg);
d2i_PKCS12_bio(in, (PKCS12 **)&DATA_PTR(self)); d2i_PKCS12_bio(in, &pkcs);
DATA_PTR(self) = pkcs;
BIO_free(in); BIO_free(in);
pkey = cert = ca = Qnil; pkey = cert = ca = Qnil;
if(!PKCS12_parse((PKCS12*)DATA_PTR(self), passphrase, &key, &x509, &x509s)) if(!PKCS12_parse(pkcs, passphrase, &key, &x509, &x509s))
ossl_raise(ePKCS12Error, "PKCS12_parse"); ossl_raise(ePKCS12Error, "PKCS12_parse");
pkey = rb_protect((VALUE(*)_((VALUE)))ossl_pkey_new, (VALUE)key, pkey = rb_protect((VALUE(*)_((VALUE)))ossl_pkey_new, (VALUE)key,
&st); /* NO DUP */ &st); /* NO DUP */
@ -181,7 +183,7 @@ ossl_pkcs12_to_der(VALUE self)
if((len = i2d_PKCS12(p12, NULL)) <= 0) if((len = i2d_PKCS12(p12, NULL)) <= 0)
ossl_raise(ePKCS12Error, NULL); ossl_raise(ePKCS12Error, NULL);
str = rb_str_new(0, len); str = rb_str_new(0, len);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
if(i2d_PKCS12(p12, &p) <= 0) if(i2d_PKCS12(p12, &p) <= 0)
ossl_raise(ePKCS12Error, NULL); ossl_raise(ePKCS12Error, NULL);
ossl_str_adjust(str, p); ossl_str_adjust(str, p);

4
ext/openssl/ossl_pkcs5.c
View file

@ -72,7 +72,9 @@ ossl_pkcs5_pbkdf2_hmac_sha1(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALU
str = rb_str_new(0, len); str = rb_str_new(0, len);
if (PKCS5_PBKDF2_HMAC_SHA1(RSTRING_PTR(pass), RSTRING_LEN(pass), RSTRING_PTR(salt), RSTRING_LEN(salt), NUM2INT(iter), len, RSTRING_PTR(str)) != 1) if (PKCS5_PBKDF2_HMAC_SHA1(RSTRING_PTR(pass), RSTRING_LEN(pass),
(const unsigned char *)RSTRING_PTR(salt), RSTRING_LEN(salt), NUM2INT(iter),
len, (unsigned char *)RSTRING_PTR(str)) != 1)
ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC_SHA1"); ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC_SHA1");
return str; return str;

12
ext/openssl/ossl_pkcs7.c
View file

@ -309,7 +309,7 @@ ossl_pkcs7_alloc(VALUE klass)
static VALUE static VALUE
ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self) ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
{ {
PKCS7 *p7; PKCS7 *p7, *pkcs = DATA_PTR(self);
BIO *in; BIO *in;
VALUE arg; VALUE arg;
@ -317,10 +317,12 @@ ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
return self; return self;
arg = ossl_to_der_if_possible(arg); arg = ossl_to_der_if_possible(arg);
in = ossl_obj2bio(arg); in = ossl_obj2bio(arg);
p7 = PEM_read_bio_PKCS7(in, (PKCS7 **)&DATA_PTR(self), NULL, NULL); p7 = PEM_read_bio_PKCS7(in, &pkcs, NULL, NULL);
DATA_PTR(self) = pkcs;
if (!p7) { if (!p7) {
BIO_reset(in); (void)BIO_reset(in);
p7 = d2i_PKCS7_bio(in, (PKCS7 **)&DATA_PTR(self)); p7 = d2i_PKCS7_bio(in, &pkcs);
DATA_PTR(self) = pkcs;
} }
BIO_free(in); BIO_free(in);
ossl_pkcs7_set_data(self, Qnil); ossl_pkcs7_set_data(self, Qnil);
@ -778,7 +780,7 @@ ossl_pkcs7_to_der(VALUE self)
if((len = i2d_PKCS7(pkcs7, NULL)) <= 0) if((len = i2d_PKCS7(pkcs7, NULL)) <= 0)
ossl_raise(ePKCS7Error, NULL); ossl_raise(ePKCS7Error, NULL);
str = rb_str_new(0, len); str = rb_str_new(0, len);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
if(i2d_PKCS7(pkcs7, &p) <= 0) if(i2d_PKCS7(pkcs7, &p) <= 0)
ossl_raise(ePKCS7Error, NULL); ossl_raise(ePKCS7Error, NULL);
ossl_str_adjust(str, p); ossl_str_adjust(str, p);

6
ext/openssl/ossl_pkey.c
View file

@ -164,7 +164,7 @@ ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
{ {
EVP_PKEY *pkey; EVP_PKEY *pkey;
EVP_MD_CTX ctx; EVP_MD_CTX ctx;
int buf_len; unsigned int buf_len;
VALUE str; VALUE str;
if (rb_funcall(self, id_private_q, 0, NULL) != Qtrue) { if (rb_funcall(self, id_private_q, 0, NULL) != Qtrue) {
@ -175,7 +175,7 @@ ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
StringValue(data); StringValue(data);
EVP_SignUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data)); EVP_SignUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data));
str = rb_str_new(0, EVP_PKEY_size(pkey)+16); str = rb_str_new(0, EVP_PKEY_size(pkey)+16);
if (!EVP_SignFinal(&ctx, RSTRING_PTR(str), &buf_len, pkey)) if (!EVP_SignFinal(&ctx, (unsigned char *)RSTRING_PTR(str), &buf_len, pkey))
ossl_raise(ePKeyError, NULL); ossl_raise(ePKeyError, NULL);
assert(buf_len <= RSTRING_LEN(str)); assert(buf_len <= RSTRING_LEN(str));
rb_str_set_len(str, buf_len); rb_str_set_len(str, buf_len);
@ -194,7 +194,7 @@ ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
StringValue(sig); StringValue(sig);
StringValue(data); StringValue(data);
EVP_VerifyUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data)); EVP_VerifyUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data));
switch (EVP_VerifyFinal(&ctx, RSTRING_PTR(sig), RSTRING_LEN(sig), pkey)) { switch (EVP_VerifyFinal(&ctx, (unsigned char *)RSTRING_PTR(sig), RSTRING_LEN(sig), pkey)) {
case 0: case 0:
return Qfalse; return Qfalse;
case 1: case 1:

6
ext/openssl/ossl_pkey_dh.c
View file

@ -169,7 +169,7 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
in = ossl_obj2bio(arg); in = ossl_obj2bio(arg);
dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL); dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
if (!dh){ if (!dh){
BIO_reset(in); (void)BIO_reset(in);
dh = d2i_DHparams_bio(in, NULL); dh = d2i_DHparams_bio(in, NULL);
} }
BIO_free(in); BIO_free(in);
@ -254,7 +254,7 @@ ossl_dh_to_der(VALUE self)
if((len = i2d_DHparams(pkey->pkey.dh, NULL)) <= 0) if((len = i2d_DHparams(pkey->pkey.dh, NULL)) <= 0)
ossl_raise(eDHError, NULL); ossl_raise(eDHError, NULL);
str = rb_str_new(0, len); str = rb_str_new(0, len);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
if(i2d_DHparams(pkey->pkey.dh, &p) < 0) if(i2d_DHparams(pkey->pkey.dh, &p) < 0)
ossl_raise(eDHError, NULL); ossl_raise(eDHError, NULL);
ossl_str_adjust(str, p); ossl_str_adjust(str, p);
@ -407,7 +407,7 @@ ossl_dh_compute_key(VALUE self, VALUE pub)
pub_key = GetBNPtr(pub); pub_key = GetBNPtr(pub);
len = DH_size(dh); len = DH_size(dh);
str = rb_str_new(0, len); str = rb_str_new(0, len);
if ((len = DH_compute_key(RSTRING_PTR(str), pub_key, dh)) < 0) { if ((len = DH_compute_key((unsigned char *)RSTRING_PTR(str), pub_key, dh)) < 0) {
ossl_raise(eDHError, NULL); ossl_raise(eDHError, NULL);
} }
rb_str_set_len(str, len); rb_str_set_len(str, len);

19
ext/openssl/ossl_pkey_dsa.c
View file

@ -161,19 +161,19 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
in = ossl_obj2bio(arg); in = ossl_obj2bio(arg);
dsa = PEM_read_bio_DSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd); dsa = PEM_read_bio_DSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
if (!dsa) { if (!dsa) {
BIO_reset(in); (void)BIO_reset(in);
dsa = PEM_read_bio_DSAPublicKey(in, NULL, NULL, NULL); dsa = PEM_read_bio_DSAPublicKey(in, NULL, NULL, NULL);
} }
if (!dsa) { if (!dsa) {
BIO_reset(in); (void)BIO_reset(in);
dsa = PEM_read_bio_DSA_PUBKEY(in, NULL, NULL, NULL); dsa = PEM_read_bio_DSA_PUBKEY(in, NULL, NULL, NULL);
} }
if (!dsa) { if (!dsa) {
BIO_reset(in); (void)BIO_reset(in);
dsa = d2i_DSAPrivateKey_bio(in, NULL); dsa = d2i_DSAPrivateKey_bio(in, NULL);
} }
if (!dsa) { if (!dsa) {
BIO_reset(in); (void)BIO_reset(in);
dsa = d2i_DSA_PUBKEY_bio(in, NULL); dsa = d2i_DSA_PUBKEY_bio(in, NULL);
} }
BIO_free(in); BIO_free(in);
@ -289,7 +289,7 @@ ossl_dsa_to_der(VALUE self)
if((len = i2d_func(pkey->pkey.dsa, NULL)) <= 0) if((len = i2d_func(pkey->pkey.dsa, NULL)) <= 0)
ossl_raise(eDSAError, NULL); ossl_raise(eDSAError, NULL);
str = rb_str_new(0, len); str = rb_str_new(0, len);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
if(i2d_func(pkey->pkey.dsa, &p) < 0) if(i2d_func(pkey->pkey.dsa, &p) < 0)
ossl_raise(eDSAError, NULL); ossl_raise(eDSAError, NULL);
ossl_str_adjust(str, p); ossl_str_adjust(str, p);
@ -387,7 +387,7 @@ static VALUE
ossl_dsa_sign(VALUE self, VALUE data) ossl_dsa_sign(VALUE self, VALUE data)
{ {
EVP_PKEY *pkey; EVP_PKEY *pkey;
int buf_len; unsigned int buf_len;
VALUE str; VALUE str;
GetPKeyDSA(self, pkey); GetPKeyDSA(self, pkey);
@ -396,7 +396,8 @@ ossl_dsa_sign(VALUE self, VALUE data)
ossl_raise(eDSAError, "Private DSA key needed!"); ossl_raise(eDSAError, "Private DSA key needed!");
} }
str = rb_str_new(0, ossl_dsa_buf_size(pkey)); str = rb_str_new(0, ossl_dsa_buf_size(pkey));
if (!DSA_sign(0, RSTRING_PTR(data), RSTRING_LEN(data), RSTRING_PTR(str), if (!DSA_sign(0, (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data),
(unsigned char *)RSTRING_PTR(str),
&buf_len, pkey->pkey.dsa)) { /* type is ignored (0) */ &buf_len, pkey->pkey.dsa)) { /* type is ignored (0) */
ossl_raise(eDSAError, NULL); ossl_raise(eDSAError, NULL);
} }
@ -420,8 +421,8 @@ ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
StringValue(digest); StringValue(digest);
StringValue(sig); StringValue(sig);
/* type is ignored (0) */ /* type is ignored (0) */
ret = DSA_verify(0, RSTRING_PTR(digest), RSTRING_LEN(digest), ret = DSA_verify(0, (unsigned char *)RSTRING_PTR(digest), RSTRING_LEN(digest),
RSTRING_PTR(sig), RSTRING_LEN(sig), pkey->pkey.dsa); (unsigned char *)RSTRING_PTR(sig), RSTRING_LEN(sig), pkey->pkey.dsa);
if (ret < 0) { if (ret < 0) {
ossl_raise(eDSAError, NULL); ossl_raise(eDSAError, NULL);
} }

12
ext/openssl/ossl_pkey_ec.c
View file

@ -186,15 +186,15 @@ static VALUE ossl_ec_key_initialize(int argc, VALUE *argv, VALUE self)
ec = PEM_read_bio_ECPrivateKey(in, NULL, NULL, NULL); ec = PEM_read_bio_ECPrivateKey(in, NULL, NULL, NULL);
if (!ec) { if (!ec) {
BIO_reset(in); (void)BIO_reset(in);
ec = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, NULL); ec = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, NULL);
} }
if (!ec) { if (!ec) {
BIO_reset(in); (void)BIO_reset(in);
ec = d2i_ECPrivateKey_bio(in, NULL); ec = d2i_ECPrivateKey_bio(in, NULL);
} }
if (!ec) { if (!ec) {
BIO_reset(in); (void)BIO_reset(in);
ec = d2i_EC_PUBKEY_bio(in, NULL); ec = d2i_EC_PUBKEY_bio(in, NULL);
} }
@ -767,7 +767,7 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
group = PEM_read_bio_ECPKParameters(in, NULL, NULL, NULL); group = PEM_read_bio_ECPKParameters(in, NULL, NULL, NULL);
if (!group) { if (!group) {
BIO_reset(in); (void)BIO_reset(in);
group = d2i_ECPKParameters_bio(in, NULL); group = d2i_ECPKParameters_bio(in, NULL);
} }
@ -1081,7 +1081,7 @@ static VALUE ossl_ec_group_get_seed(VALUE self)
if (seed_len == 0) if (seed_len == 0)
return Qnil; return Qnil;
return rb_str_new(EC_GROUP_get0_seed(group), seed_len); return rb_str_new((const char *)EC_GROUP_get0_seed(group), seed_len);
} }
/* call-seq: /* call-seq:
@ -1096,7 +1096,7 @@ static VALUE ossl_ec_group_set_seed(VALUE self, VALUE seed)
Require_EC_GROUP(self, group); Require_EC_GROUP(self, group);
StringValue(seed); StringValue(seed);
if (EC_GROUP_set_seed(group, RSTRING_PTR(seed), RSTRING_LEN(seed)) != RSTRING_LEN(seed)) if (EC_GROUP_set_seed(group, (unsigned char *)RSTRING_PTR(seed), RSTRING_LEN(seed)) != RSTRING_LEN(seed))
ossl_raise(eEC_GROUP, "EC_GROUP_set_seed"); ossl_raise(eEC_GROUP, "EC_GROUP_set_seed");
return seed; return seed;

28
ext/openssl/ossl_pkey_rsa.c
View file

@ -151,23 +151,23 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
in = ossl_obj2bio(arg); in = ossl_obj2bio(arg);
rsa = PEM_read_bio_RSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd); rsa = PEM_read_bio_RSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
if (!rsa) { if (!rsa) {
BIO_reset(in); (void)BIO_reset(in);
rsa = PEM_read_bio_RSAPublicKey(in, NULL, NULL, NULL); rsa = PEM_read_bio_RSAPublicKey(in, NULL, NULL, NULL);
} }
if (!rsa) { if (!rsa) {
BIO_reset(in); (void)BIO_reset(in);
rsa = PEM_read_bio_RSA_PUBKEY(in, NULL, NULL, NULL); rsa = PEM_read_bio_RSA_PUBKEY(in, NULL, NULL, NULL);
} }
if (!rsa) { if (!rsa) {
BIO_reset(in); (void)BIO_reset(in);
rsa = d2i_RSAPrivateKey_bio(in, NULL); rsa = d2i_RSAPrivateKey_bio(in, NULL);
} }
if (!rsa) { if (!rsa) {
BIO_reset(in); (void)BIO_reset(in);
rsa = d2i_RSAPublicKey_bio(in, NULL); rsa = d2i_RSAPublicKey_bio(in, NULL);
} }
if (!rsa) { if (!rsa) {
BIO_reset(in); (void)BIO_reset(in);
rsa = d2i_RSA_PUBKEY_bio(in, NULL); rsa = d2i_RSA_PUBKEY_bio(in, NULL);
} }
BIO_free(in); BIO_free(in);
@ -288,7 +288,7 @@ ossl_rsa_to_der(VALUE self)
if((len = i2d_func(pkey->pkey.rsa, NULL)) <= 0) if((len = i2d_func(pkey->pkey.rsa, NULL)) <= 0)
ossl_raise(eRSAError, NULL); ossl_raise(eRSAError, NULL);
str = rb_str_new(0, len); str = rb_str_new(0, len);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
if(i2d_func(pkey->pkey.rsa, &p) < 0) if(i2d_func(pkey->pkey.rsa, &p) < 0)
ossl_raise(eRSAError, NULL); ossl_raise(eRSAError, NULL);
ossl_str_adjust(str, p); ossl_str_adjust(str, p);
@ -315,8 +315,8 @@ ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding); pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
StringValue(buffer); StringValue(buffer);
str = rb_str_new(0, ossl_rsa_buf_size(pkey)); str = rb_str_new(0, ossl_rsa_buf_size(pkey));
buf_len = RSA_public_encrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer), buf_len = RSA_public_encrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
RSTRING_PTR(str), pkey->pkey.rsa, (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
pad); pad);
if (buf_len < 0) ossl_raise(eRSAError, NULL); if (buf_len < 0) ossl_raise(eRSAError, NULL);
rb_str_set_len(str, buf_len); rb_str_set_len(str, buf_len);
@ -341,8 +341,8 @@ ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding); pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
StringValue(buffer); StringValue(buffer);
str = rb_str_new(0, ossl_rsa_buf_size(pkey)); str = rb_str_new(0, ossl_rsa_buf_size(pkey));
buf_len = RSA_public_decrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer), buf_len = RSA_public_decrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
RSTRING_PTR(str), pkey->pkey.rsa, (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
pad); pad);
if (buf_len < 0) ossl_raise(eRSAError, NULL); if (buf_len < 0) ossl_raise(eRSAError, NULL);
rb_str_set_len(str, buf_len); rb_str_set_len(str, buf_len);
@ -370,8 +370,8 @@ ossl_rsa_private_encrypt(int argc, VALUE *argv, VALUE self)
pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding); pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
StringValue(buffer); StringValue(buffer);
str = rb_str_new(0, ossl_rsa_buf_size(pkey)); str = rb_str_new(0, ossl_rsa_buf_size(pkey));
buf_len = RSA_private_encrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer), buf_len = RSA_private_encrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
RSTRING_PTR(str), pkey->pkey.rsa, (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
pad); pad);
if (buf_len < 0) ossl_raise(eRSAError, NULL); if (buf_len < 0) ossl_raise(eRSAError, NULL);
rb_str_set_len(str, buf_len); rb_str_set_len(str, buf_len);
@ -400,8 +400,8 @@ ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding); pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
StringValue(buffer); StringValue(buffer);
str = rb_str_new(0, ossl_rsa_buf_size(pkey)); str = rb_str_new(0, ossl_rsa_buf_size(pkey));
buf_len = RSA_private_decrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer), buf_len = RSA_private_decrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
RSTRING_PTR(str), pkey->pkey.rsa, (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
pad); pad);
if (buf_len < 0) ossl_raise(eRSAError, NULL); if (buf_len < 0) ossl_raise(eRSAError, NULL);
rb_str_set_len(str, buf_len); rb_str_set_len(str, buf_len);

4
ext/openssl/ossl_rand.c
View file

@ -99,7 +99,7 @@ ossl_rand_bytes(VALUE self, VALUE len)
int n = NUM2INT(len); int n = NUM2INT(len);
str = rb_str_new(0, n); str = rb_str_new(0, n);
if (!RAND_bytes(RSTRING_PTR(str), n)) { if (!RAND_bytes((unsigned char *)RSTRING_PTR(str), n)) {
ossl_raise(eRandomError, NULL); ossl_raise(eRandomError, NULL);
} }
@ -118,7 +118,7 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE len)
int n = NUM2INT(len); int n = NUM2INT(len);
str = rb_str_new(0, n); str = rb_str_new(0, n);
if (!RAND_pseudo_bytes(RSTRING_PTR(str), n)) { if (!RAND_pseudo_bytes((unsigned char *)RSTRING_PTR(str), n)) {
ossl_raise(eRandomError, NULL); ossl_raise(eRandomError, NULL);
} }

23
ext/openssl/ossl_ssl.c
View file

@ -297,7 +297,7 @@ ossl_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
static VALUE static VALUE
ossl_call_session_get_cb(VALUE ary) ossl_call_session_get_cb(VALUE ary)
{ {
VALUE ssl_obj, sslctx_obj, cb, ret; VALUE ssl_obj, sslctx_obj, cb;
Check_Type(ary, T_ARRAY); Check_Type(ary, T_ARRAY);
ssl_obj = rb_ary_entry(ary, 0); ssl_obj = rb_ary_entry(ary, 0);
@ -325,7 +325,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
ssl_obj = (VALUE)ptr; ssl_obj = (VALUE)ptr;
ary = rb_ary_new2(2); ary = rb_ary_new2(2);
rb_ary_push(ary, ssl_obj); rb_ary_push(ary, ssl_obj);
rb_ary_push(ary, rb_str_new(buf, len)); rb_ary_push(ary, rb_str_new((const char *)buf, len));
ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_get_cb, ary, &state); ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_get_cb, ary, &state);
if (state) { if (state) {
@ -344,7 +344,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
static VALUE static VALUE
ossl_call_session_new_cb(VALUE ary) ossl_call_session_new_cb(VALUE ary)
{ {
VALUE ssl_obj, sslctx_obj, cb, ret; VALUE ssl_obj, sslctx_obj, cb;
Check_Type(ary, T_ARRAY); Check_Type(ary, T_ARRAY);
ssl_obj = rb_ary_entry(ary, 0); ssl_obj = rb_ary_entry(ary, 0);
@ -387,10 +387,11 @@ ossl_sslctx_session_new_cb(SSL *ssl, SSL_SESSION *sess)
return RTEST(ret_obj) ? 1 : 0; return RTEST(ret_obj) ? 1 : 0;
} }
#if 0 /* unused */
static VALUE static VALUE
ossl_call_session_remove_cb(VALUE ary) ossl_call_session_remove_cb(VALUE ary)
{ {
VALUE sslctx_obj, cb, ret; VALUE sslctx_obj, cb;
Check_Type(ary, T_ARRAY); Check_Type(ary, T_ARRAY);
sslctx_obj = rb_ary_entry(ary, 0); sslctx_obj = rb_ary_entry(ary, 0);
@ -400,6 +401,7 @@ ossl_call_session_remove_cb(VALUE ary)
return rb_funcall(cb, rb_intern("call"), 1, ary); return rb_funcall(cb, rb_intern("call"), 1, ary);
} }
#endif
static void static void
ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess) ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess)
@ -563,7 +565,7 @@ ossl_sslctx_setup(VALUE self)
val = ossl_sslctx_get_sess_id_ctx(self); val = ossl_sslctx_get_sess_id_ctx(self);
if (!NIL_P(val)){ if (!NIL_P(val)){
StringValue(val); StringValue(val);
if (!SSL_CTX_set_session_id_context(ctx, RSTRING_PTR(val), if (!SSL_CTX_set_session_id_context(ctx, (unsigned char *)RSTRING_PTR(val),
RSTRING_LEN(val))){ RSTRING_LEN(val))){
ossl_raise(eSSLError, "SSL_CTX_set_session_id_context:"); ossl_raise(eSSLError, "SSL_CTX_set_session_id_context:");
} }
@ -815,7 +817,6 @@ ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
VALUE arg1; VALUE arg1;
SSL_CTX *ctx; SSL_CTX *ctx;
time_t tm = 0; time_t tm = 0;
int cb_state;
rb_scan_args(argc, argv, "01", &arg1); rb_scan_args(argc, argv, "01", &arg1);
@ -1344,13 +1345,13 @@ Init_ossl_ssl()
ID_callback_state = rb_intern("@callback_state"); ID_callback_state = rb_intern("@callback_state");
ossl_ssl_ex_vcb_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_vcb_idx",0,0,0); ossl_ssl_ex_vcb_idx = SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_vcb_idx",0,0,0);
ossl_ssl_ex_store_p = SSL_get_ex_new_index(0,"ossl_ssl_ex_store_p",0,0,0); ossl_ssl_ex_store_p = SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_store_p",0,0,0);
ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_ptr_idx",0,0,0); ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_ptr_idx",0,0,0);
ossl_ssl_ex_client_cert_cb_idx = ossl_ssl_ex_client_cert_cb_idx =
SSL_get_ex_new_index(0,"ossl_ssl_ex_client_cert_cb_idx",0,0,0); SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_client_cert_cb_idx",0,0,0);
ossl_ssl_ex_tmp_dh_callback_idx = ossl_ssl_ex_tmp_dh_callback_idx =
SSL_get_ex_new_index(0,"ossl_ssl_ex_tmp_dh_callback_idx",0,0,0); SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_tmp_dh_callback_idx",0,0,0);
mSSL = rb_define_module_under(mOSSL, "SSL"); mSSL = rb_define_module_under(mOSSL, "SSL");
eSSLError = rb_define_class_under(mSSL, "SSLError", eOSSLError); eSSLError = rb_define_class_under(mSSL, "SSLError", eOSSLError);

4
ext/openssl/ossl_ssl_session.c
View file

@ -36,8 +36,6 @@ static VALUE ossl_ssl_session_alloc(VALUE klass)
static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1) static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
{ {
SSL_SESSION *ctx = NULL; SSL_SESSION *ctx = NULL;
VALUE obj;
unsigned char *p;
if (RDATA(self)->data) if (RDATA(self)->data)
ossl_raise(eSSLSession, "SSL Session already initialized"); ossl_raise(eSSLSession, "SSL Session already initialized");
@ -55,7 +53,7 @@ static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
ctx = PEM_read_bio_SSL_SESSION(in, NULL, NULL, NULL); ctx = PEM_read_bio_SSL_SESSION(in, NULL, NULL, NULL);
if (!ctx) { if (!ctx) {
BIO_reset(in); (void)BIO_reset(in);
ctx = d2i_SSL_SESSION_bio(in, NULL); ctx = d2i_SSL_SESSION_bio(in, NULL);
} }

13
ext/openssl/ossl_x509attr.c
View file

@ -93,15 +93,14 @@ ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
{ {
VALUE oid, value; VALUE oid, value;
X509_ATTRIBUTE *attr; X509_ATTRIBUTE *attr;
unsigned char *p; const unsigned char *p;
GetX509Attr(self, attr); GetX509Attr(self, attr);
if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){ if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){
oid = ossl_to_der_if_possible(oid); oid = ossl_to_der_if_possible(oid);
StringValue(oid); StringValue(oid);
p = RSTRING_PTR(oid); p = (unsigned char *)RSTRING_PTR(oid);
if(!d2i_X509_ATTRIBUTE((X509_ATTRIBUTE**)&DATA_PTR(self), if(!d2i_X509_ATTRIBUTE(&attr, &p, RSTRING_LEN(oid)) && (DATA_PTR(self) = attr, 1)){
&p, RSTRING_LEN(oid))){
ossl_raise(eX509AttrError, NULL); ossl_raise(eX509AttrError, NULL);
} }
return self; return self;
@ -212,7 +211,7 @@ ossl_x509attr_get_value(VALUE self)
if(OSSL_X509ATTR_IS_SINGLE(attr)){ if(OSSL_X509ATTR_IS_SINGLE(attr)){
length = i2d_ASN1_TYPE(attr->value.single, NULL); length = i2d_ASN1_TYPE(attr->value.single, NULL);
str = rb_str_new(0, length); str = rb_str_new(0, length);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
i2d_ASN1_TYPE(attr->value.single, &p); i2d_ASN1_TYPE(attr->value.single, &p);
ossl_str_adjust(str, p); ossl_str_adjust(str, p);
} }
@ -220,7 +219,7 @@ ossl_x509attr_get_value(VALUE self)
length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL, length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL,
i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0); i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
str = rb_str_new(0, length); str = rb_str_new(0, length);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p, i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p,
i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0); i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
ossl_str_adjust(str, p); ossl_str_adjust(str, p);
@ -246,7 +245,7 @@ ossl_x509attr_to_der(VALUE self)
if((len = i2d_X509_ATTRIBUTE(attr, NULL)) <= 0) if((len = i2d_X509_ATTRIBUTE(attr, NULL)) <= 0)
ossl_raise(eX509AttrError, NULL); ossl_raise(eX509AttrError, NULL);
str = rb_str_new(0, len); str = rb_str_new(0, len);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
if(i2d_X509_ATTRIBUTE(attr, &p) <= 0) if(i2d_X509_ATTRIBUTE(attr, &p) <= 0)
ossl_raise(eX509AttrError, NULL); ossl_raise(eX509AttrError, NULL);
rb_str_set_len(str, p - (unsigned char*)RSTRING_PTR(str)); rb_str_set_len(str, p - (unsigned char*)RSTRING_PTR(str));

14
ext/openssl/ossl_x509cert.c
View file

@ -134,7 +134,7 @@ static VALUE
ossl_x509_initialize(int argc, VALUE *argv, VALUE self) ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
{ {
BIO *in; BIO *in;
X509 *x509; X509 *x509, *x = DATA_PTR(self);
VALUE arg; VALUE arg;
if (rb_scan_args(argc, argv, "01", &arg) == 0) { if (rb_scan_args(argc, argv, "01", &arg) == 0) {
@ -143,10 +143,12 @@ ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
} }
arg = ossl_to_der_if_possible(arg); arg = ossl_to_der_if_possible(arg);
in = ossl_obj2bio(arg); in = ossl_obj2bio(arg);
x509 = PEM_read_bio_X509(in, (X509 **)&DATA_PTR(self), NULL, NULL); x509 = PEM_read_bio_X509(in, &x, NULL, NULL);
DATA_PTR(self) = x;
if (!x509) { if (!x509) {
BIO_reset(in); (void)BIO_reset(in);
x509 = d2i_X509_bio(in, (X509 **)&DATA_PTR(self)); x509 = d2i_X509_bio(in, &x);
DATA_PTR(self) = x;
} }
BIO_free(in); BIO_free(in);
if (!x509) ossl_raise(eX509CertError, NULL); if (!x509) ossl_raise(eX509CertError, NULL);
@ -190,7 +192,7 @@ ossl_x509_to_der(VALUE self)
if ((len = i2d_X509(x509, NULL)) <= 0) if ((len = i2d_X509(x509, NULL)) <= 0)
ossl_raise(eX509CertError, NULL); ossl_raise(eX509CertError, NULL);
str = rb_str_new(0, len); str = rb_str_new(0, len);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
if (i2d_X509(x509, &p) <= 0) if (i2d_X509(x509, &p) <= 0)
ossl_raise(eX509CertError, NULL); ossl_raise(eX509CertError, NULL);
ossl_str_adjust(str, p); ossl_str_adjust(str, p);
@ -690,7 +692,7 @@ static VALUE
ossl_x509_inspect(VALUE self) ossl_x509_inspect(VALUE self)
{ {
VALUE str; VALUE str;
char *cname = rb_class2name(rb_obj_class(self)); const char *cname = rb_class2name(rb_obj_class(self));
str = rb_str_new2("#<"); str = rb_str_new2("#<");
rb_str_cat2(str, cname); rb_str_cat2(str, cname);

10
ext/openssl/ossl_x509crl.c
View file

@ -91,7 +91,7 @@ static VALUE
ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self) ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
{ {
BIO *in; BIO *in;
X509_CRL *crl; X509_CRL *crl, *x = DATA_PTR(self);
VALUE arg; VALUE arg;
if (rb_scan_args(argc, argv, "01", &arg) == 0) { if (rb_scan_args(argc, argv, "01", &arg) == 0) {
@ -99,10 +99,12 @@ ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
} }
arg = ossl_to_der_if_possible(arg); arg = ossl_to_der_if_possible(arg);
in = ossl_obj2bio(arg); in = ossl_obj2bio(arg);
crl = PEM_read_bio_X509_CRL(in, (X509_CRL **)&DATA_PTR(self), NULL, NULL); crl = PEM_read_bio_X509_CRL(in, &x, NULL, NULL);
DATA_PTR(self) = x;
if (!crl) { if (!crl) {
BIO_reset(in); (void)BIO_reset(in);
crl = d2i_X509_CRL_bio(in, (X509_CRL **)&DATA_PTR(self)); crl = d2i_X509_CRL_bio(in, &x);
DATA_PTR(self) = x;
} }
BIO_free(in); BIO_free(in);
if (!crl) ossl_raise(eX509CRLError, NULL); if (!crl) ossl_raise(eX509CRLError, NULL);

11
ext/openssl/ossl_x509ext.c
View file

@ -273,16 +273,15 @@ static VALUE
ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self) ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
{ {
VALUE oid, value, critical; VALUE oid, value, critical;
unsigned char *p; const unsigned char *p;
X509_EXTENSION *ext; X509_EXTENSION *ext, *x = DATA_PTR(self);
GetX509Ext(self, ext); GetX509Ext(self, ext);
if(rb_scan_args(argc, argv, "12", &oid, &value, &critical) == 1){ if(rb_scan_args(argc, argv, "12", &oid, &value, &critical) == 1){
oid = ossl_to_der_if_possible(oid); oid = ossl_to_der_if_possible(oid);
StringValue(oid); StringValue(oid);
p = RSTRING_PTR(oid); p = (unsigned char *)RSTRING_PTR(oid);
if(!d2i_X509_EXTENSION((X509_EXTENSION**)&DATA_PTR(self), if(!d2i_X509_EXTENSION(&x, &p, RSTRING_LEN(oid)) && (DATA_PTR(self) = x, 1))
&p, RSTRING_LEN(oid)))
ossl_raise(eX509ExtError, NULL); ossl_raise(eX509ExtError, NULL);
return self; return self;
} }
@ -409,7 +408,7 @@ ossl_x509ext_to_der(VALUE obj)
if((len = i2d_X509_EXTENSION(ext, NULL)) <= 0) if((len = i2d_X509_EXTENSION(ext, NULL)) <= 0)
ossl_raise(eX509ExtError, NULL); ossl_raise(eX509ExtError, NULL);
str = rb_str_new(0, len); str = rb_str_new(0, len);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
if(i2d_X509_EXTENSION(ext, &p) < 0) if(i2d_X509_EXTENSION(ext, &p) < 0)
ossl_raise(eX509ExtError, NULL); ossl_raise(eX509ExtError, NULL);
ossl_str_adjust(str, p); ossl_str_adjust(str, p);

13
ext/openssl/ossl_x509name.c
View file

@ -135,11 +135,12 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
rb_block_call(tmp, rb_intern("each"), 0, 0, ossl_x509name_init_i, args); rb_block_call(tmp, rb_intern("each"), 0, 0, ossl_x509name_init_i, args);
} }
else{ else{
unsigned char *p; const unsigned char *p;
VALUE str = ossl_to_der_if_possible(arg); VALUE str = ossl_to_der_if_possible(arg);
X509_NAME *x = DATA_PTR(self);
StringValue(str); StringValue(str);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
if(!d2i_X509_NAME((X509_NAME**)&DATA_PTR(self), &p, RSTRING_LEN(str))){ if(!d2i_X509_NAME(&x, &p, RSTRING_LEN(str)) && (DATA_PTR(self) = x, 1)){
ossl_raise(eX509NameError, NULL); ossl_raise(eX509NameError, NULL);
} }
} }
@ -164,7 +165,7 @@ VALUE ossl_x509name_add_entry(int argc, VALUE *argv, VALUE self)
if(NIL_P(type)) type = rb_aref(OBJECT_TYPE_TEMPLATE, oid); if(NIL_P(type)) type = rb_aref(OBJECT_TYPE_TEMPLATE, oid);
GetX509Name(self, name); GetX509Name(self, name);
if (!X509_NAME_add_entry_by_txt(name, RSTRING_PTR(oid), NUM2INT(type), if (!X509_NAME_add_entry_by_txt(name, RSTRING_PTR(oid), NUM2INT(type),
RSTRING_PTR(value), RSTRING_LEN(value), -1, 0)) { (const unsigned char *)RSTRING_PTR(value), RSTRING_LEN(value), -1, 0)) {
ossl_raise(eX509NameError, NULL); ossl_raise(eX509NameError, NULL);
} }
@ -245,7 +246,7 @@ ossl_x509name_to_a(VALUE self)
} }
short_name = OBJ_nid2sn(OBJ_ln2nid(long_name)); short_name = OBJ_nid2sn(OBJ_ln2nid(long_name));
ary = rb_ary_new3(3, rb_str_new2(short_name), ary = rb_ary_new3(3, rb_str_new2(short_name),
rb_str_new(entry->value->data, entry->value->length), rb_str_new((const char *)entry->value->data, entry->value->length),
INT2FIX(entry->value->type)); INT2FIX(entry->value->type));
rb_ary_push(ret, ary); rb_ary_push(ret, ary);
} }
@ -319,7 +320,7 @@ ossl_x509name_to_der(VALUE self)
if((len = i2d_X509_NAME(name, NULL)) <= 0) if((len = i2d_X509_NAME(name, NULL)) <= 0)
ossl_raise(eX509NameError, NULL); ossl_raise(eX509NameError, NULL);
str = rb_str_new(0, len); str = rb_str_new(0, len);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
if(i2d_X509_NAME(name, &p) <= 0) if(i2d_X509_NAME(name, &p) <= 0)
ossl_raise(eX509NameError, NULL); ossl_raise(eX509NameError, NULL);
ossl_str_adjust(str, p); ossl_str_adjust(str, p);

12
ext/openssl/ossl_x509req.c
View file

@ -99,7 +99,7 @@ static VALUE
ossl_x509req_initialize(int argc, VALUE *argv, VALUE self) ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
{ {
BIO *in; BIO *in;
X509_REQ *req; X509_REQ *req, *x = DATA_PTR(self);
VALUE arg; VALUE arg;
if (rb_scan_args(argc, argv, "01", &arg) == 0) { if (rb_scan_args(argc, argv, "01", &arg) == 0) {
@ -107,10 +107,12 @@ ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
} }
arg = ossl_to_der_if_possible(arg); arg = ossl_to_der_if_possible(arg);
in = ossl_obj2bio(arg); in = ossl_obj2bio(arg);
req = PEM_read_bio_X509_REQ(in, (X509_REQ **)&DATA_PTR(self), NULL, NULL); req = PEM_read_bio_X509_REQ(in, &x, NULL, NULL);
DATA_PTR(self) = x;
if (!req) { if (!req) {
BIO_reset(in); (void)BIO_reset(in);
req = d2i_X509_REQ_bio(in, (X509_REQ **)&DATA_PTR(self)); req = d2i_X509_REQ_bio(in, &x);
DATA_PTR(self) = x;
} }
BIO_free(in); BIO_free(in);
if (!req) ossl_raise(eX509ReqError, NULL); if (!req) ossl_raise(eX509ReqError, NULL);
@ -171,7 +173,7 @@ ossl_x509req_to_der(VALUE self)
if ((len = i2d_X509_REQ(req, NULL)) <= 0) if ((len = i2d_X509_REQ(req, NULL)) <= 0)
ossl_raise(eX509CertError, NULL); ossl_raise(eX509CertError, NULL);
str = rb_str_new(0, len); str = rb_str_new(0, len);
p = RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
if (i2d_X509_REQ(req, &p) <= 0) if (i2d_X509_REQ(req, &p) <= 0)
ossl_raise(eX509ReqError, NULL); ossl_raise(eX509ReqError, NULL);
ossl_str_adjust(str, p); ossl_str_adjust(str, p);