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

[ruby/openssl] ts: avoid using OpenSSL::PKCS7's internals

Browse Source 
Internals of OpenSSL::PKCS7 should be kept within ossl_pkcs7.c.

Add a new ossl_pkcs7_new() function for duplicating and wrapping an
OpenSSL PKCS7 object in OpenSSL::PKCS7. This follows the convention
used by other ossl_*_new() functions.

https://github.com/ruby/openssl/commit/b5f79f771e
This commit is contained in:
Kazuki Yamaguchi 2024-10-30 03:53:53 +09:00 committed by git
parent 870cce9798
commit f8e9302e66
3 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ext/openssl/ossl_pkcs7.c
View File

@ -9,6 +9,21 @@
*/ */
#include "ossl.h" #include "ossl.h"
#define NewPKCS7(klass) \
TypedData_Wrap_Struct((klass), &ossl_pkcs7_type, 0)
#define SetPKCS7(obj, pkcs7) do { \
if (!(pkcs7)) { \
ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
} \
RTYPEDDATA_DATA(obj) = (pkcs7); \
} while (0)
#define GetPKCS7(obj, pkcs7) do { \
TypedData_Get_Struct((obj), PKCS7, &ossl_pkcs7_type, (pkcs7)); \
if (!(pkcs7)) { \
ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
} \
} while (0)
#define NewPKCS7si(klass) \ #define NewPKCS7si(klass) \
TypedData_Wrap_Struct((klass), &ossl_pkcs7_signer_info_type, 0) TypedData_Wrap_Struct((klass), &ossl_pkcs7_signer_info_type, 0)
#define SetPKCS7si(obj, p7si) do { \ #define SetPKCS7si(obj, p7si) do { \
@ -49,10 +64,10 @@
/* /*
* Classes * Classes
*/ */
VALUE cPKCS7; static VALUE cPKCS7;
VALUE cPKCS7Signer; static VALUE cPKCS7Signer;
VALUE cPKCS7Recipient; static VALUE cPKCS7Recipient;
VALUE ePKCS7Error; static VALUE ePKCS7Error;
static void static void
ossl_pkcs7_free(void *ptr) ossl_pkcs7_free(void *ptr)
@ -60,7 +75,7 @@ ossl_pkcs7_free(void *ptr)
PKCS7_free(ptr); PKCS7_free(ptr);
} }
const rb_data_type_t ossl_pkcs7_type = { static const rb_data_type_t ossl_pkcs7_type = {
"OpenSSL/PKCS7", "OpenSSL/PKCS7",
{ {
0, ossl_pkcs7_free, 0, ossl_pkcs7_free,
@ -68,6 +83,20 @@ const rb_data_type_t ossl_pkcs7_type = {
0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
}; };
VALUE
ossl_pkcs7_new(PKCS7 *p7)
{
PKCS7 *new;
VALUE obj = NewPKCS7(cPKCS7);
new = PKCS7_dup(p7);
if (!new)
ossl_raise(ePKCS7Error, "PKCS7_dup");
SetPKCS7(obj, new);
return obj;
}
static void static void
ossl_pkcs7_signer_info_free(void *ptr) ossl_pkcs7_signer_info_free(void *ptr)
{ {

22
ext/openssl/ossl_pkcs7.h
View File

@ -10,27 +10,7 @@
#if !defined(_OSSL_PKCS7_H_) #if !defined(_OSSL_PKCS7_H_)
#define _OSSL_PKCS7_H_ #define _OSSL_PKCS7_H_
#define NewPKCS7(klass) \ VALUE ossl_pkcs7_new(PKCS7 *p7);
TypedData_Wrap_Struct((klass), &ossl_pkcs7_type, 0)
#define SetPKCS7(obj, pkcs7) do { \
if (!(pkcs7)) { \
ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
} \
RTYPEDDATA_DATA(obj) = (pkcs7); \
} while (0)
#define GetPKCS7(obj, pkcs7) do { \
TypedData_Get_Struct((obj), PKCS7, &ossl_pkcs7_type, (pkcs7)); \
if (!(pkcs7)) { \
ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
} \
} while (0)
extern const rb_data_type_t ossl_pkcs7_type;
extern VALUE cPKCS7;
extern VALUE cPKCS7Signer;
extern VALUE cPKCS7Recipient;
extern VALUE ePKCS7Error;
void Init_ossl_pkcs7(void); void Init_ossl_pkcs7(void);
#endif /* _OSSL_PKCS7_H_ */ #endif /* _OSSL_PKCS7_H_ */

13
ext/openssl/ossl_ts.c
View File

@ -691,21 +691,12 @@ static VALUE
ossl_ts_resp_get_token(VALUE self) ossl_ts_resp_get_token(VALUE self)
{ {
TS_RESP *resp; TS_RESP *resp;
PKCS7 *p7, *copy; PKCS7 *p7;
VALUE obj;
GetTSResponse(self, resp); GetTSResponse(self, resp);
if (!(p7 = TS_RESP_get_token(resp))) if (!(p7 = TS_RESP_get_token(resp)))
return Qnil; return Qnil;
return ossl_pkcs7_new(p7);
obj = NewPKCS7(cPKCS7);
if (!(copy = PKCS7_dup(p7)))
ossl_raise(eTimestampError, NULL);
SetPKCS7(obj, copy);
return obj;
} }
/* /*