1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

proper function prototypes for openssl

Browse Source 
Just to reroute compiler warnings.
This commit is contained in:
卜部昌平 2022-09-21 10:14:00 +09:00
parent 437800d3b0
commit 7060b23ffa
Notes: git 2022-09-21 11:44:32 +09:00 
Merged: https://github.com/ruby/ruby/pull/6358
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ext/openssl/ossl_asn1.c
View File

@ -509,7 +509,8 @@ ossl_asn1_get_asn1type(VALUE obj)
ASN1_TYPE *ret; ASN1_TYPE *ret;
VALUE value, rflag; VALUE value, rflag;
void *ptr; void *ptr;
void (*free_func)(); typedef void free_func_type(void *);
free_func_type *free_func;
int tag; int tag;
tag = ossl_asn1_default_tag(obj); tag = ossl_asn1_default_tag(obj);
@ -522,16 +523,16 @@ ossl_asn1_get_asn1type(VALUE obj)
case V_ASN1_INTEGER: /* FALLTHROUGH */ case V_ASN1_INTEGER: /* FALLTHROUGH */
case V_ASN1_ENUMERATED: case V_ASN1_ENUMERATED:
ptr = obj_to_asn1int(value); ptr = obj_to_asn1int(value);
free_func = ASN1_INTEGER_free; free_func = (free_func_type *)ASN1_INTEGER_free;
break; break;
case V_ASN1_BIT_STRING: case V_ASN1_BIT_STRING:
rflag = rb_attr_get(obj, sivUNUSED_BITS); rflag = rb_attr_get(obj, sivUNUSED_BITS);
ptr = obj_to_asn1bstr(value, NUM2INT(rflag)); ptr = obj_to_asn1bstr(value, NUM2INT(rflag));
free_func = ASN1_BIT_STRING_free; free_func = (free_func_type *)ASN1_BIT_STRING_free;
break; break;
case V_ASN1_NULL: case V_ASN1_NULL:
ptr = obj_to_asn1null(value); ptr = obj_to_asn1null(value);
free_func = ASN1_NULL_free; free_func = (free_func_type *)ASN1_NULL_free;
break; break;
case V_ASN1_OCTET_STRING: /* FALLTHROUGH */ case V_ASN1_OCTET_STRING: /* FALLTHROUGH */
case V_ASN1_UTF8STRING: /* FALLTHROUGH */ case V_ASN1_UTF8STRING: /* FALLTHROUGH */
@ -546,24 +547,24 @@ ossl_asn1_get_asn1type(VALUE obj)
case V_ASN1_UNIVERSALSTRING: /* FALLTHROUGH */ case V_ASN1_UNIVERSALSTRING: /* FALLTHROUGH */
case V_ASN1_BMPSTRING: case V_ASN1_BMPSTRING:
ptr = obj_to_asn1str(value); ptr = obj_to_asn1str(value);
free_func = ASN1_STRING_free; free_func = (free_func_type *)ASN1_STRING_free;
break; break;
case V_ASN1_OBJECT: case V_ASN1_OBJECT:
ptr = obj_to_asn1obj(value); ptr = obj_to_asn1obj(value);
free_func = ASN1_OBJECT_free; free_func = (free_func_type *)ASN1_OBJECT_free;
break; break;
case V_ASN1_UTCTIME: case V_ASN1_UTCTIME:
ptr = obj_to_asn1utime(value); ptr = obj_to_asn1utime(value);
free_func = ASN1_TIME_free; free_func = (free_func_type *)ASN1_TIME_free;
break; break;
case V_ASN1_GENERALIZEDTIME: case V_ASN1_GENERALIZEDTIME:
ptr = obj_to_asn1gtime(value); ptr = obj_to_asn1gtime(value);
free_func = ASN1_TIME_free; free_func = (free_func_type *)ASN1_TIME_free;
break; break;
case V_ASN1_SET: /* FALLTHROUGH */ case V_ASN1_SET: /* FALLTHROUGH */
case V_ASN1_SEQUENCE: case V_ASN1_SEQUENCE:
ptr = obj_to_asn1derstr(obj); ptr = obj_to_asn1derstr(obj);
free_func = ASN1_STRING_free; free_func = (free_func_type *)ASN1_STRING_free;
break; break;
default: default:
ossl_raise(eASN1Error, "unsupported ASN.1 type"); ossl_raise(eASN1Error, "unsupported ASN.1 type");

2
ext/openssl/ossl_ssl.c
View File

@ -1662,7 +1662,7 @@ io_wait_readable(rb_io_t *fptr)
} }
static VALUE static VALUE
ossl_start_ssl(VALUE self, int (*func)(), const char *funcname, VALUE opts) ossl_start_ssl(VALUE self, int (*func)(SSL *), const char *funcname, VALUE opts)
{ {
SSL *ssl; SSL *ssl;
rb_io_t *fptr; rb_io_t *fptr;