Remove almost all OpenSSL patches.

Author: aardvark179

src/main/c/openssl/ossl.c

@@ -169,11 +169,7 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd_)
 {
     long len;
     int status;
-#ifdef TRUFFLERUBY
-    VALUE rflag, pass = (VALUE)rb_tr_managed_from_handle_release(pwd_);
-#else
     VALUE rflag, pass = (VALUE)pwd_;
-#endif
 
     if (RTEST(pass)) {
 	/* PEM_def_callback(buf, max_len, flag, StringValueCStr(pass)) does not
@@ -580,9 +576,7 @@ static void Init_ossl_locks(void)
     int i;
     int num_locks = CRYPTO_num_locks();
 
-    // Modified for TruffleRuby
-    //ossl_locks = ALLOC_N(struct CRYPTO_dynlock_value, num_locks);
-    ossl_locks = (struct CRYPTO_dynlock_value *) truffle_managed_malloc(num_locks * (int)sizeof(struct CRYPTO_dynlock_value));
+    ossl_locks = ALLOC_N(struct CRYPTO_dynlock_value, num_locks);
     for (i = 0; i < num_locks; i++)
 	ossl_lock_init(&ossl_locks[i]);
 

src/main/c/openssl/ossl.h

@@ -49,19 +49,17 @@ extern VALUE eOSSLError;
 /*
  * CheckTypes
  */
-// TruffleRuby: avoid passing managed to var-args
 #define OSSL_Check_Kind(obj, klass) do {\
   if (!rb_obj_is_kind_of((obj), (klass))) {\
-    ossl_raise(rb_eTypeError, "wrong argument (%s)! (Expected kind of %s)",\
-               RSTRING_PTR(rb_class_name(rb_obj_class(obj))), RSTRING_PTR(rb_class_name(klass)));\
+    ossl_raise(rb_eTypeError, "wrong argument (%"PRIsVALUE")! (Expected kind of %"PRIsVALUE")",\
+               rb_obj_class(obj), (klass));\
   }\
 } while (0)
 
-// TruffleRuby: avoid passing managed to var-args
 #define OSSL_Check_Instance(obj, klass) do {\
   if (!rb_obj_is_instance_of((obj), (klass))) {\
-    ossl_raise(rb_eTypeError, "wrong argument (%s)! (Expected instance of %s)",\
-               RSTRING_PTR(rb_class_name(rb_obj_class(obj))), RSTRING_PTR(rb_class_name(klass)));\
+    ossl_raise(rb_eTypeError, "wrong argument (%"PRIsVALUE")! (Expected instance of %"PRIsVALUE")",\
+               rb_obj_class(obj), (klass));\
   }\
 } while (0)
 

src/main/c/openssl/ossl_asn1.c

@@ -470,43 +470,40 @@ typedef struct {
     VALUE *klass;
 } ossl_asn1_info_t;
 
-// TruffleRuby
 static const ossl_asn1_info_t ossl_asn1_info[] = {
-    { "EOC",               /*&cASN1EndOfContent*/ NULL,    },  /*  0 */
-    { "BOOLEAN",           /*&cASN1Boolean*/ NULL,         },  /*  1 */
-    { "INTEGER",           /*&cASN1Integer*/ NULL,         },  /*  2 */
-    { "BIT_STRING",        /*&cASN1BitString*/ NULL,       },  /*  3 */
-    { "OCTET_STRING",      /*&cASN1OctetString*/ NULL,     },  /*  4 */
-    { "NULL",              /*&cASN1Null*/ NULL,            },  /*  5 */
-    { "OBJECT",            /*&cASN1ObjectId*/ NULL,        },  /*  6 */
-    { "OBJECT_DESCRIPTOR", NULL,                           },  /*  7 */
-    { "EXTERNAL",          NULL,                           },  /*  8 */
-    { "REAL",              NULL,                           },  /*  9 */
-    { "ENUMERATED",        /*&cASN1Enumerated*/ NULL,      },  /* 10 */
-    { "EMBEDDED_PDV",      NULL,                           },  /* 11 */
-    { "UTF8STRING",        /*&cASN1UTF8String*/ NULL,      },  /* 12 */
-    { "RELATIVE_OID",      NULL,                           },  /* 13 */
-    { "[UNIVERSAL 14]",    NULL,                           },  /* 14 */
-    { "[UNIVERSAL 15]",    NULL,                           },  /* 15 */
-    { "SEQUENCE",          /*&cASN1Sequence*/ NULL,        },  /* 16 */
-    { "SET",               /*&cASN1Set*/ NULL,             },  /* 17 */
-    { "NUMERICSTRING",     /*&cASN1NumericString*/ NULL,   },  /* 18 */
-    { "PRINTABLESTRING",   /*&cASN1PrintableString*/ NULL, },  /* 19 */
-    { "T61STRING",         /*&cASN1T61String*/ NULL,       },  /* 20 */
-    { "VIDEOTEXSTRING",    /*&cASN1VideotexString*/ NULL,  },  /* 21 */
-    { "IA5STRING",         /*&cASN1IA5String*/ NULL,       },  /* 22 */
-    { "UTCTIME",           /*&cASN1UTCTime*/ NULL,         },  /* 23 */
-    { "GENERALIZEDTIME",   /*&cASN1GeneralizedTime*/ NULL, },  /* 24 */
-    { "GRAPHICSTRING",     /*&cASN1GraphicString*/ NULL,   },  /* 25 */
-    { "ISO64STRING",       /*&cASN1ISO64String*/ NULL,     },  /* 26 */
-    { "GENERALSTRING",     /*&cASN1GeneralString*/ NULL,   },  /* 27 */
-    { "UNIVERSALSTRING",   /*&cASN1UniversalString*/ NULL, },  /* 28 */
-    { "CHARACTER_STRING",  NULL,                           },  /* 29 */
-    { "BMPSTRING",         /*&cASN1BMPString*/ NULL,       },  /* 30 */
+    { "EOC",               &cASN1EndOfContent,    },  /*  0 */
+    { "BOOLEAN",           &cASN1Boolean,         },  /*  1 */
+    { "INTEGER",           &cASN1Integer,         },  /*  2 */
+    { "BIT_STRING",        &cASN1BitString,       },  /*  3 */
+    { "OCTET_STRING",      &cASN1OctetString,     },  /*  4 */
+    { "NULL",              &cASN1Null,            },  /*  5 */
+    { "OBJECT",            &cASN1ObjectId,        },  /*  6 */
+    { "OBJECT_DESCRIPTOR", NULL,                  },  /*  7 */
+    { "EXTERNAL",          NULL,                  },  /*  8 */
+    { "REAL",              NULL,                  },  /*  9 */
+    { "ENUMERATED",        &cASN1Enumerated,      },  /* 10 */
+    { "EMBEDDED_PDV",      NULL,                  },  /* 11 */
+    { "UTF8STRING",        &cASN1UTF8String,      },  /* 12 */
+    { "RELATIVE_OID",      NULL,                  },  /* 13 */
+    { "[UNIVERSAL 14]",    NULL,                  },  /* 14 */
+    { "[UNIVERSAL 15]",    NULL,                  },  /* 15 */
+    { "SEQUENCE",          &cASN1Sequence,        },  /* 16 */
+    { "SET",               &cASN1Set,             },  /* 17 */
+    { "NUMERICSTRING",     &cASN1NumericString,   },  /* 18 */
+    { "PRINTABLESTRING",   &cASN1PrintableString, },  /* 19 */
+    { "T61STRING",         &cASN1T61String,       },  /* 20 */
+    { "VIDEOTEXSTRING",    &cASN1VideotexString,  },  /* 21 */
+    { "IA5STRING",         &cASN1IA5String,       },  /* 22 */
+    { "UTCTIME",           &cASN1UTCTime,         },  /* 23 */
+    { "GENERALIZEDTIME",   &cASN1GeneralizedTime, },  /* 24 */
+    { "GRAPHICSTRING",     &cASN1GraphicString,   },  /* 25 */
+    { "ISO64STRING",       &cASN1ISO64String,     },  /* 26 */
+    { "GENERALSTRING",     &cASN1GeneralString,   },  /* 27 */
+    { "UNIVERSALSTRING",   &cASN1UniversalString, },  /* 28 */
+    { "CHARACTER_STRING",  NULL,                  },  /* 29 */
+    { "BMPSTRING",         &cASN1BMPString,       },  /* 30 */
 };
 
-VALUE** ossl_asn1_info_klass;
-
 enum {ossl_asn1_info_size = (sizeof(ossl_asn1_info)/sizeof(ossl_asn1_info[0]))};
 
 static VALUE class_tag_map;
@@ -597,8 +594,7 @@ ossl_asn1_default_tag(VALUE obj)
     tmp_class = CLASS_OF(obj);
     while (!NIL_P(tmp_class)) {
 	tag = rb_hash_lookup(class_tag_map, tmp_class);
-	// TODO BJF Apr-15-2017 - `if (tag != Qnil) {` - Investigate why 0L == DynamicObject<NilClass>
-	if (!NIL_P(tag))
+	if (tag != Qnil)
 	    return NUM2INT(tag);
 	tmp_class = rb_class_superclass(tmp_class);
     }
@@ -806,8 +802,8 @@ int_ossl_asn1_decode0_prim(unsigned char **pp, long length, long hlen, int tag,
     *num_read = hlen + length;
 
     if (tc == sym_UNIVERSAL &&
-	tag < ossl_asn1_info_size && ossl_asn1_info_klass[tag]) { // TruffleRuby instead of ossl_asn1_info[tag].klass
-	VALUE klass = *ossl_asn1_info_klass[tag]; // TruffleRuby instead of *ossl_asn1_info[tag].klass
+	tag < ossl_asn1_info_size && ossl_asn1_info[tag].klass) {
+	VALUE klass = *ossl_asn1_info[tag].klass;
 	VALUE args[4];
 	args[0] = value;
 	args[1] = INT2NUM(tag);
@@ -870,7 +866,7 @@ int_ossl_asn1_decode0_cons(unsigned char **pp, long max_len, long length,
 	    }
 	}
 	else {
-	    VALUE klass = *ossl_asn1_info_klass[tag]; // TruffleRuby instead of *ossl_asn1_info[tag].klass
+	    VALUE klass = *ossl_asn1_info[tag].klass;
 	    asn1data = rb_obj_alloc(klass);
 	}
 	args[0] = ary;
@@ -1416,40 +1412,6 @@ OSSL_ASN1_IMPL_FACTORY_METHOD(EndOfContent)
 void
 Init_ossl_asn1(void)
 {
-    // TruffleRuby
-    ossl_asn1_info_klass = truffle_managed_malloc(sizeof(VALUE *) * 31);
-    ossl_asn1_info_klass[ 0] = &cASN1EndOfContent;
-    ossl_asn1_info_klass[ 1] = &cASN1Boolean;
-    ossl_asn1_info_klass[ 2] = &cASN1Integer;
-    ossl_asn1_info_klass[ 3] = &cASN1BitString;
-    ossl_asn1_info_klass[ 4] = &cASN1OctetString;
-    ossl_asn1_info_klass[ 5] = &cASN1Null;
-    ossl_asn1_info_klass[ 6] = &cASN1ObjectId;
-    ossl_asn1_info_klass[ 7] = NULL;
-    ossl_asn1_info_klass[ 8] = NULL;
-    ossl_asn1_info_klass[ 9] = NULL;
-    ossl_asn1_info_klass[10] = &cASN1Enumerated;
-    ossl_asn1_info_klass[11] = NULL;
-    ossl_asn1_info_klass[12] = &cASN1UTF8String;
-    ossl_asn1_info_klass[13] = NULL;
-    ossl_asn1_info_klass[14] = NULL;
-    ossl_asn1_info_klass[15] = NULL;
-    ossl_asn1_info_klass[16] = &cASN1Sequence;
-    ossl_asn1_info_klass[17] = &cASN1Set;
-    ossl_asn1_info_klass[18] = &cASN1NumericString;
-    ossl_asn1_info_klass[19] = &cASN1PrintableString;
-    ossl_asn1_info_klass[20] = &cASN1T61String;
-    ossl_asn1_info_klass[21] = &cASN1VideotexString;
-    ossl_asn1_info_klass[22] = &cASN1IA5String;
-    ossl_asn1_info_klass[23] = &cASN1UTCTime;
-    ossl_asn1_info_klass[24] = &cASN1GeneralizedTime;
-    ossl_asn1_info_klass[25] = &cASN1GraphicString;
-    ossl_asn1_info_klass[26] = &cASN1ISO64String;
-    ossl_asn1_info_klass[27] = &cASN1GeneralString;
-    ossl_asn1_info_klass[28] = &cASN1UniversalString;
-    ossl_asn1_info_klass[29] = NULL;
-    ossl_asn1_info_klass[30] = &cASN1BMPString;
-
     VALUE ary;
     int i;
 

src/main/c/openssl/ossl_bio.c

@@ -9,8 +9,6 @@
  */
 #include "ossl.h"
 
-#ifndef TRUFFLERUBY
-
 BIO *
 ossl_obj2bio(volatile VALUE *pobj)
 {
@@ -27,8 +25,6 @@ ossl_obj2bio(volatile VALUE *pobj)
     return bio;
 }
 
-#endif
-
 VALUE
 ossl_membio2str0(BIO *bio)
 {

src/main/c/openssl/ossl_bio.h

@@ -10,39 +10,7 @@
 #if !defined(_OSSL_BIO_H_)
 #define _OSSL_BIO_H_
 
-#ifdef TRUFFLERUBY
-
-/*
- * This is ossl_obj2bio copied from ossl_bio.c with the only modification being
- * the addition of MUST_INLINE, so that the local variable referenced by pobj
- * can be put into a register, and the removal of the volatile, which would
- * prevent that. I think MRI uses the volatile and the address just in order
- * to support conservative GC. We don't need this as our GC is precise.
- */
-
-MUST_INLINE
-BIO *
-ossl_obj2bio(VALUE *pobj)
-{
-    VALUE obj = *pobj;
-    BIO *bio;
-
-    if (RB_TYPE_P(obj, T_FILE))
-	obj = rb_funcallv(obj, rb_intern("read"), 0, NULL);
-    StringValue(obj);
-    bio = BIO_new_mem_buf(RSTRING_PTR(obj), RSTRING_LENINT(obj));
-    if (!bio)
-	ossl_raise(eOSSLError, "BIO_new_mem_buf");
-    *pobj = obj;
-    return bio;
-}
-
-#else
-
 BIO *ossl_obj2bio(volatile VALUE *);
-
-#endif
-
 VALUE ossl_membio2str0(BIO*);
 VALUE ossl_membio2str(BIO*);
 VALUE ossl_protect_membio2str(BIO*,int*);

src/main/c/openssl/ossl_bn.c

@@ -152,22 +152,6 @@ ossl_bn_value_ptr(volatile VALUE *ptr)
     return bn;
 }
 
-// TruffleRuby: _x version added that doesn't take a pointer to a local
-// variable - the variable is apparently only to protect against conservative GC
-BIGNUM *
-ossl_bn_value_ptr_x(VALUE obj)
-{
-    VALUE tmp;
-    BIGNUM *bn;
-
-    tmp = try_convert_to_bn(obj);
-    if (NIL_P(tmp))
-	ossl_raise(rb_eTypeError, "Cannot convert into OpenSSL::BN");
-    GetBN(tmp, bn);
-
-    return bn;
-}
-
 /*
  * Private
  */

src/main/c/openssl/ossl_bn.h

@@ -15,12 +15,10 @@ extern VALUE eBNError;
 
 extern BN_CTX *ossl_bn_ctx;
 
-// TruffleRuby: avoid taking address of local variables
-#define GetBNPtr(obj) ossl_bn_value_ptr_x(obj)
+#define GetBNPtr(obj) ossl_bn_value_ptr(&(obj))
 
 VALUE ossl_bn_new(const BIGNUM *);
 BIGNUM *ossl_bn_value_ptr(volatile VALUE *);
-BIGNUM *ossl_bn_value_ptr_x(VALUE);
 void Init_ossl_bn(void);
 
 

src/main/c/openssl/ossl_cipher.c

@@ -154,9 +154,8 @@ ossl_cipher_copy(VALUE self, VALUE other)
 }
 
 static void*
-add_cipher_name_to_ary(const OBJ_NAME *name, void* ary_handle) // TruffleRuby void* instead of VALUE
+add_cipher_name_to_ary(const OBJ_NAME *name, VALUE ary)
 {
-    VALUE ary = rb_tr_managed_from_handle(ary_handle);
     rb_ary_push(ary, rb_str_new2(name->name));
     return NULL;
 }
@@ -175,7 +174,7 @@ ossl_s_ciphers(VALUE self)
     ary = rb_ary_new();
     OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
                     (void(*)(const OBJ_NAME*,void*))add_cipher_name_to_ary,
-                    rb_tr_handle_for_managed_leaking(ary));
+                    (void*)ary);
 
     return ary;
 }

src/main/c/openssl/ossl_engine.c

@@ -212,9 +212,7 @@ ossl_engine_s_by_id(VALUE klass, VALUE id)
     VALUE obj;
 
     StringValueCStr(id);
-    VALUE argv[1]; // TruffleRuby to allow the preprocessor to turn into a managed malloc
-    argv[0] = id; // TruffleRuby
-    ossl_engine_s_load(1, argv, klass); // TruffleRuby
+    ossl_engine_s_load(1, &id, klass);
     obj = NewEngine(klass);
     if(!(e = ENGINE_by_id(RSTRING_PTR(id))))
 	ossl_raise(eEngineError, NULL);

src/main/c/openssl/ossl_pkcs12.c

@@ -126,11 +126,11 @@ ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
 /* TODO: make a VALUE to nid function */
     if (!NIL_P(key_nid)) {
         if ((nkey = OBJ_txt2nid(StringValueCStr(key_nid))) == NID_undef)
-	    ossl_raise(rb_eArgError, "Unknown PBE algorithm %s", StringValueCStr(key_nid)); // TruffleRuby: avoid passing managed to var-args
+	    ossl_raise(rb_eArgError, "Unknown PBE algorithm %"PRIsVALUE, key_nid);
     }
     if (!NIL_P(cert_nid)) {
         if ((ncert = OBJ_txt2nid(StringValueCStr(cert_nid))) == NID_undef)
-	    ossl_raise(rb_eArgError, "Unknown PBE algorithm %s", StringValueCStr(cert_nid)); // TruffleRuby: avoid passing managed to var-args
+	    ossl_raise(rb_eArgError, "Unknown PBE algorithm %"PRIsVALUE, cert_nid);
     }
     if (!NIL_P(key_iter))
         kiter = NUM2INT(key_iter);