rack-tctp 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ecce3cfa21384152a0faeaf01d5ff7df51f9497
-  data.tar.gz: 6450adadc284f38854314a6df74d79536a912734
+  metadata.gz: f4e3c755444802e57349bd7046ad8f151de2f9b1
+  data.tar.gz: bdea2ab33607130a18f195cfc56b54eef24ea8d5
 SHA512:
-  metadata.gz: 538edea1d3a360ff4b5d91ea87c2125d3ac7a07eb1b4fa5ae7bb64238687f9d9ce5981a51fbb095754baffaeb2ebd3e2ab65f502a1826ab2b1a16613c045ca72
-  data.tar.gz: da634bdb41829394a7de1869dbf651022358ea6fa0bc5791983a8d87d95ef8d415d18359293d2c64b6ac5cb0a558b8b36bd4cddb4b00846fc7ca0b9f846ed5a0
+  metadata.gz: 499b9e7a53bafd4380a5770eaefdfeedd3d9bc4822689abc393f9d9424f657b522f3da2829391ad0e02fca3d14546d0ec35b9c0c9f6f174feb064f9336c50e58
+  data.tar.gz: 07baec6b6bdc036c630ae739b978fd7e9bdc6a846a594af85f9c23453f077eb39907b68bd18ede1d7686f62d89ca88e745821f0e7d90be10555d2a1a7f84506c

data/ext/engine/engine.c

@@ -1,229 +1,229 @@
-//Modified from: https://github.com/puma/puma/blob/master/ext/puma_http11/mini_ssl.c
-#define RSTRING_NOT_MODIFIED 1
-#include <assert.h>
-#include <ruby.h>
-#include <rubyio.h>
-#include <openssl/bio.h>
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-
-typedef struct {
-  BIO* read;
-  BIO* write;
-  SSL* ssl;
-  SSL_CTX* ctx;
-} ms_conn;
-
-void engine_free(ms_conn* conn) {
-  BIO_free(conn->read);
-  BIO_free(conn->write);
-
-  free(conn);
-}
-
-static VALUE eError;
-
-void raise_error(SSL* ssl, int result) {
-  char buf[256];
-  u_long err;
-
-  while ((err = ERR_get_error()) != 0) {
-    ERR_error_string_n(err, buf, sizeof(buf));
-    printf("*** %s\n", buf);
-  }
-
-  ERR_clear_error();
-  rb_raise(eError, "OpenSSL error");
-}
-
-ms_conn* engine_alloc(VALUE klass, VALUE* obj) {
-  ms_conn* conn;
-
-  *obj = Data_Make_Struct(klass, ms_conn, 0, engine_free, conn);
-
-  conn->read = BIO_new(BIO_s_mem());
-  BIO_set_nbio(conn->read, 1);
-
-  conn->write = BIO_new(BIO_s_mem());
-  BIO_set_nbio(conn->write, 1);
-
-  conn->ssl = 0;
-  conn->ctx = 0;
-
-  return conn;
-}
-
-VALUE engine_init_server(VALUE self, VALUE key, VALUE cert) {
-  VALUE obj;
-  SSL_CTX* ctx;
-  SSL* ssl;
-  int use_certificate_file_ret, use_pk_file_ret;
-
-  ms_conn* conn = engine_alloc(self, &obj);
-
-  StringValue(key);
-  StringValue(cert);
-
-  ctx = SSL_CTX_new(TLSv1_server_method());
-  conn->ctx = ctx;
-
-  use_certificate_file_ret = SSL_CTX_use_certificate_file(ctx, RSTRING_PTR(cert), SSL_FILETYPE_PEM);
-  if(use_certificate_file_ret != 1) {
-    raise_error(conn->ssl, 0);
-  }
-
-  use_pk_file_ret = SSL_CTX_use_PrivateKey_file(ctx, RSTRING_PTR(key), SSL_FILETYPE_PEM);
-  if(use_pk_file_ret != 1) {
-    raise_error(conn->ssl, 0);
-  }
-
-  SSL_CTX_set_cipher_list(ctx, "ALL");
-  SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE);
-
-  ssl = SSL_new(ctx);
-  conn->ssl = ssl;
-
-  SSL_set_verify(ssl, SSL_VERIFY_NONE, NULL);
-
-  SSL_set_bio(conn->ssl, conn->read, conn->write);
-
-  SSL_set_accept_state(ssl);
-  return obj;
-}
-
-VALUE engine_init_client(VALUE klass) {
-  VALUE obj;
-  ms_conn* conn = engine_alloc(klass, &obj);
-
-  conn->ctx = SSL_CTX_new(TLSv1_client_method());
-  SSL_CTX_set_cipher_list(conn->ctx, "ALL");
-
-  conn->ssl = SSL_new(conn->ctx);
-
-  SSL_set_verify(conn->ssl, SSL_VERIFY_NONE, NULL);
-
-  SSL_set_bio(conn->ssl, conn->read, conn->write);
-
-  SSL_set_connect_state(conn->ssl);
-  return obj;
-}
-
-VALUE engine_inject(VALUE self, VALUE str) {
-  ms_conn* conn;
-  long used;
-
-  Data_Get_Struct(self, ms_conn, conn);
-
-  StringValue(str);
-
-  used = BIO_write(conn->read, RSTRING_PTR(str), (int)RSTRING_LEN(str));
-
-  if(used == 0 || used == -1) {
-    return Qfalse;
-  }
-
-  return INT2FIX(used);
-}
-
-VALUE engine_read(VALUE self) {
-  ms_conn* conn;
-  char buf[512];
-  int bytes, n;
-
-  Data_Get_Struct(self, ms_conn, conn);
-
-  bytes = SSL_read(conn->ssl, (void*)buf, sizeof(buf));
-
-  if(bytes > 0) {
-    return rb_str_new(buf, bytes);
-  }
-
-  if(SSL_want_read(conn->ssl)) return Qnil;
-
-  if(SSL_get_error(conn->ssl, bytes) == SSL_ERROR_ZERO_RETURN) {
-    rb_eof_error();
-  }
-
-  raise_error(conn->ssl, bytes);
-
-  return Qnil;
-}
-
-VALUE engine_write(VALUE self, VALUE str) {
-  ms_conn* conn;
-  char buf[512];
-  int bytes;
-
-  Data_Get_Struct(self, ms_conn, conn);
-
-  StringValue(str);
-
-  bytes = SSL_write(conn->ssl, (void*)RSTRING_PTR(str), (int)RSTRING_LEN(str));
-  if(bytes > 0) {
-    return INT2FIX(bytes);
-  }
-
-  if(SSL_want_write(conn->ssl)) return Qnil;
-
-  raise_error(conn->ssl, bytes);
-
-  return Qnil;
-}
-
-VALUE engine_extract(VALUE self) {
-  ms_conn* conn;
-  int bytes;
-  size_t pending;
-  char buf[512];
-
-  Data_Get_Struct(self, ms_conn, conn);
-
-  pending = BIO_pending(conn->write);
-  if(pending > 0) {
-    bytes = BIO_read(conn->write, buf, sizeof(buf));
-    if(bytes > 0) {
-      return rb_str_new(buf, bytes);
-    } else if(!BIO_should_retry(conn->write)) {
-      raise_error(conn->ssl, bytes);
-    }
-  }
-
-  return Qnil;
-}
-
-VALUE engine_state(VALUE self) {
-  ms_conn* conn;
-  VALUE str;
-
-  Data_Get_Struct(self, ms_conn, conn);
-
-  str = rb_str_new(SSL_state_string(conn->ssl), 6);
-
-  return str;
-}
-
-void Init_engine() {
-  VALUE mod, eng, rack;
-  
-  SSL_library_init();
-  OpenSSL_add_ssl_algorithms();
-  SSL_load_error_strings();
-  ERR_load_crypto_strings();
-
-  rack = rb_define_module("Rack");
-  mod = rb_define_class_under(rack, "TCTP", rb_cObject);
-  eng = rb_define_class_under(mod, "Engine", rb_cObject);
-
-  eError = rb_define_class_under(mod, "SSLError", rb_eStandardError);
-
-  rb_define_singleton_method(eng, "server", engine_init_server, 2);
-  rb_define_singleton_method(eng, "client", engine_init_client, 0);
-
-  rb_define_method(eng, "inject", engine_inject, 1);
-  rb_define_method(eng, "read",  engine_read, 0);
-
-  rb_define_method(eng, "write",  engine_write, 1);
-  rb_define_method(eng, "extract", engine_extract, 0);
-
-  rb_define_method(eng, "state", engine_state, 0);
-}
+//Modified from: https://github.com/puma/puma/blob/master/ext/puma_http11/mini_ssl.c
+#define RSTRING_NOT_MODIFIED 1
+#include <assert.h>
+#include <ruby.h>
+#include <rubyio.h>
+#include <openssl/bio.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+
+typedef struct {
+  BIO* read;
+  BIO* write;
+  SSL* ssl;
+  SSL_CTX* ctx;
+} ms_conn;
+
+void engine_free(ms_conn* conn) {
+  BIO_free(conn->read);
+  BIO_free(conn->write);
+
+  free(conn);
+}
+
+static VALUE eError;
+
+void raise_error(SSL* ssl, int result) {
+  char buf[256];
+  u_long err;
+
+  while ((err = ERR_get_error()) != 0) {
+    ERR_error_string_n(err, buf, sizeof(buf));
+    printf("*** %s\n", buf);
+  }
+
+  ERR_clear_error();
+  rb_raise(eError, "OpenSSL error");
+}
+
+ms_conn* engine_alloc(VALUE klass, VALUE* obj) {
+  ms_conn* conn;
+
+  *obj = Data_Make_Struct(klass, ms_conn, 0, engine_free, conn);
+
+  conn->read = BIO_new(BIO_s_mem());
+  BIO_set_nbio(conn->read, 1);
+
+  conn->write = BIO_new(BIO_s_mem());
+  BIO_set_nbio(conn->write, 1);
+
+  conn->ssl = 0;
+  conn->ctx = 0;
+
+  return conn;
+}
+
+VALUE engine_init_server(VALUE self, VALUE key, VALUE cert) {
+  VALUE obj;
+  SSL_CTX* ctx;
+  SSL* ssl;
+  int use_certificate_file_ret, use_pk_file_ret;
+
+  ms_conn* conn = engine_alloc(self, &obj);
+
+  StringValue(key);
+  StringValue(cert);
+
+  ctx = SSL_CTX_new(TLSv1_server_method());
+  conn->ctx = ctx;
+
+  use_certificate_file_ret = SSL_CTX_use_certificate_file(ctx, RSTRING_PTR(cert), SSL_FILETYPE_PEM);
+  if(use_certificate_file_ret != 1) {
+    raise_error(conn->ssl, 0);
+  }
+
+  use_pk_file_ret = SSL_CTX_use_PrivateKey_file(ctx, RSTRING_PTR(key), SSL_FILETYPE_PEM);
+  if(use_pk_file_ret != 1) {
+    raise_error(conn->ssl, 0);
+  }
+
+  SSL_CTX_set_cipher_list(ctx, "ALL");
+  SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE);
+
+  ssl = SSL_new(ctx);
+  conn->ssl = ssl;
+
+  SSL_set_verify(ssl, SSL_VERIFY_NONE, NULL);
+
+  SSL_set_bio(conn->ssl, conn->read, conn->write);
+
+  SSL_set_accept_state(ssl);
+  return obj;
+}
+
+VALUE engine_init_client(VALUE klass) {
+  VALUE obj;
+  ms_conn* conn = engine_alloc(klass, &obj);
+
+  conn->ctx = SSL_CTX_new(TLSv1_client_method());
+  SSL_CTX_set_cipher_list(conn->ctx, "ALL");
+
+  conn->ssl = SSL_new(conn->ctx);
+
+  SSL_set_verify(conn->ssl, SSL_VERIFY_NONE, NULL);
+
+  SSL_set_bio(conn->ssl, conn->read, conn->write);
+
+  SSL_set_connect_state(conn->ssl);
+  return obj;
+}
+
+VALUE engine_inject(VALUE self, VALUE str) {
+  ms_conn* conn;
+  long used;
+
+  Data_Get_Struct(self, ms_conn, conn);
+
+  StringValue(str);
+
+  used = BIO_write(conn->read, RSTRING_PTR(str), (int)RSTRING_LEN(str));
+
+  if(used == 0 || used == -1) {
+    return Qfalse;
+  }
+
+  return INT2FIX(used);
+}
+
+VALUE engine_read(VALUE self) {
+  ms_conn* conn;
+  char buf[512];
+  int bytes, n;
+
+  Data_Get_Struct(self, ms_conn, conn);
+
+  bytes = SSL_read(conn->ssl, (void*)buf, sizeof(buf));
+
+  if(bytes > 0) {
+    return rb_str_new(buf, bytes);
+  }
+
+  if(SSL_want_read(conn->ssl)) return Qnil;
+
+  if(SSL_get_error(conn->ssl, bytes) == SSL_ERROR_ZERO_RETURN) {
+    rb_eof_error();
+  }
+
+  raise_error(conn->ssl, bytes);
+
+  return Qnil;
+}
+
+VALUE engine_write(VALUE self, VALUE str) {
+  ms_conn* conn;
+  char buf[512];
+  int bytes;
+
+  Data_Get_Struct(self, ms_conn, conn);
+
+  StringValue(str);
+
+  bytes = SSL_write(conn->ssl, (void*)RSTRING_PTR(str), (int)RSTRING_LEN(str));
+  if(bytes > 0) {
+    return INT2FIX(bytes);
+  }
+
+  if(SSL_want_write(conn->ssl)) return Qnil;
+
+  raise_error(conn->ssl, bytes);
+
+  return Qnil;
+}
+
+VALUE engine_extract(VALUE self) {
+  ms_conn* conn;
+  int bytes;
+  size_t pending;
+  char buf[512];
+
+  Data_Get_Struct(self, ms_conn, conn);
+
+  pending = BIO_pending(conn->write);
+  if(pending > 0) {
+    bytes = BIO_read(conn->write, buf, sizeof(buf));
+    if(bytes > 0) {
+      return rb_str_new(buf, bytes);
+    } else if(!BIO_should_retry(conn->write)) {
+      raise_error(conn->ssl, bytes);
+    }
+  }
+
+  return Qnil;
+}
+
+VALUE engine_state(VALUE self) {
+  ms_conn* conn;
+  VALUE str;
+
+  Data_Get_Struct(self, ms_conn, conn);
+
+  str = rb_str_new(SSL_state_string(conn->ssl), 6);
+
+  return str;
+}
+
+void Init_engine() {
+  VALUE mod, eng, rack;
+  
+  SSL_library_init();
+  OpenSSL_add_ssl_algorithms();
+  SSL_load_error_strings();
+  ERR_load_crypto_strings();
+
+  rack = rb_define_module("Rack");
+  mod = rb_define_class_under(rack, "TCTP", rb_cObject);
+  eng = rb_define_class_under(mod, "Engine", rb_cObject);
+
+  eError = rb_define_class_under(mod, "SSLError", rb_eStandardError);
+
+  rb_define_singleton_method(eng, "server", engine_init_server, 2);
+  rb_define_singleton_method(eng, "client", engine_init_client, 0);
+
+  rb_define_method(eng, "inject", engine_inject, 1);
+  rb_define_method(eng, "read",  engine_read, 0);
+
+  rb_define_method(eng, "write",  engine_write, 1);
+  rb_define_method(eng, "extract", engine_extract, 0);
+
+  rb_define_method(eng, "state", engine_state, 0);
+}