Skip to content

Hacky fix to a bug caused by newer versions of the ruby openssl extenension #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bytecaster wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Hacky fix to a bug caused by newer versions of the ruby openssl extenension #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion ext/openssl/cipher/aead/aead.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,26 @@
#include <openssl/ssl.h>
#include <openssl/err.h>

// Hack derived from ruby.h (State Commit 0534b970bc83814e77ea4bd8ba9b2d31fefc9b1e)
// to derive the EVP_CIPHTER_CTX pointer from the Ruby Openssl\Cipher class
// after the swap to TypedData_Get_Struct by the ruby builtin openssl extension
// that prevented just using Data_Get_Struct
#define Data_Get_Struct_Unsafe(obj,type,sval) \
((sval) = (type*)rb_data_object_get_unsafe(obj))

static inline void *
rb_data_object_get_unsafe(VALUE obj)
{
//Check_Type(obj, RUBY_T_DATA);
return ((struct RData *)obj)->data;
}
// --------------------------------------------------------------------------------

VALUE dOSSL;
VALUE eCipherError;

#define GetCipherInit(obj, ctx) do { \
Data_Get_Struct((obj), EVP_CIPHER_CTX, (ctx)); \
Data_Get_Struct_Unsafe((obj), EVP_CIPHER_CTX, (ctx)); \
} while (0)

#define GetCipher(obj, ctx) do { \
Expand Down