capbac 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b7076bd32f529211ece0a6a16efe8c1fc37ad412241f1c10392cd1bdd722f4c
-  data.tar.gz: 9d1d9bde2412d98785d964e774a91378d00fa70a662d6e66775c2813f34f0170
+  metadata.gz: adda2cca9f2268e6630ebcf446a122a16f47af4cb8e8da244ec02dcc29ecacee
+  data.tar.gz: cd4d014f2e6f2e33e29be3084dc061cf4a24766bc486234e077916f786c8a430
 SHA512:
-  metadata.gz: 227eb36d3513826e5dd9f5771958dd9b833903cb8181cb7e6d15889e0932ad21f8ea5303fc49e33b2bf5aa255237c1ae99214de09ed37a2dab947268021ddd20
-  data.tar.gz: 7c6de742856e11d91071e602538a28cd217490bcfa469ad5f09c677f9d5e9abb4964cc7243fe3b863f2988e9fab74248928612a5dbfc40a3ee77305cc8e184ac
+  metadata.gz: 7a9e336f88154e277e3f98add0f0b1312ef7b6963602f47e02bfcac32c248624811600ce33cbcfc391e2780c3a8d687eefda388cb80f7e3f1e29ad9c19cf1a88
+  data.tar.gz: d78605c676018174d3af5ffee304d8d4a60e3f4bef9891e238478c08ddb34c34d16a9253e465163086f6493eb75ad71a029a16c683c828d36fe780416278c163

data/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "capbac-ruby"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Kirill Chernyshov <delaguardo@gmail.com>"]
 edition = "2018"
 
@@ -14,4 +14,4 @@ openssl = "0.10"
 ring = "0.16.15"
 lazy_static = "1"
 protobuf = "2.16.2"
-capbac = "0.2.1"
+capbac = "0.3.0"

data/lib/capbac/version.rb

@@ -1,3 +1,3 @@
 module CapBAC
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.3'.freeze
 end

data/src/lib.rs

@@ -5,14 +5,11 @@ extern crate lazy_static;
 
 use capbac::{CertificateBlueprint, InvokeBlueprint};
 use openssl::{
-    ec::EcKey,
+    ec::{EcKey, EcGroup},
     pkey::{PKey, Public},
 };
+use openssl::nid::Nid;
 use protobuf::Message;
-use ring::{
-    rand,
-    signature::{self, EcdsaKeyPair, KeyPair},
-};
 use rutie::{
     AnyObject, Boolean, Class, Encoding, Fixnum, Hash, Module, Object, RString, Symbol,
     VerifiedObject, GC, VM, Array,
@@ -190,7 +187,7 @@ methods!(
         let me = Url::parse(&ruby_me)
             .map_err(|e| VM::raise(Class::from_existing("ArgumentError"), &e.to_string()))
             .unwrap();
-        let sk = PKey::private_key_from_pkcs8(&ruby_sk.as_bytes())
+        let sk = PKey::private_key_from_pem(&ruby_sk.as_bytes())
             .map_err(|e| {
                 VM::raise(
                     Class::from_existing("ArgumentError"),
@@ -290,7 +287,7 @@ impl capbac::Pubs for IntValidator {
         match res {
             Ok(pk) => {
                 Some(
-                    PKey::public_key_from_der(&pk.to_string_unchecked().as_bytes())
+                    PKey::public_key_from_pem(&pk.to_string_unchecked().as_bytes())
                         .unwrap()
                         .ec_key()
                         .unwrap(),
@@ -431,40 +428,6 @@ methods!(
     }
 );
 
-class!(KeyGen);
-
-methods!(
-    KeyGen,
-    itself,
-
-    fn ruby_generate_keypair() -> Hash {
-        let rng = rand::SystemRandom::new();
-
-        let key_pair =
-            EcdsaKeyPair::generate_pkcs8(&signature::ECDSA_P256_SHA256_FIXED_SIGNING, &rng)
-                .unwrap();
-        let sk = key_pair.as_ref();
-
-        let key_pair = EcdsaKeyPair::from_pkcs8(
-            &signature::ECDSA_P256_SHA256_FIXED_SIGNING,
-            &key_pair.as_ref(),
-        )
-        .unwrap();
-        let pk = key_pair.public_key().as_ref();
-
-        let mut res = Hash::new();
-        res.store(
-            Symbol::new("sk"),
-            RString::from_bytes(&sk, &Encoding::us_ascii()),
-        );
-        res.store(
-            Symbol::new("pk"),
-            RString::from_bytes(&pk, &Encoding::us_ascii()),
-        );
-        res
-    }
-);
-
 #[allow(non_snake_case)]
 #[no_mangle]
 pub extern "C" fn Init_capbac() {
@@ -483,11 +446,5 @@ pub extern "C" fn Init_capbac() {
                 itself.def("validate_cert", ruby_validator_validate_cert);
                 itself.def("validate_invocation", ruby_validator_validate_invocation);
             });
-
-        itself
-            .define_nested_class("KeyPair", None)
-            .define(|itself| {
-                itself.def("generate!", ruby_generate_keypair);
-            });
     });
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capbac
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Kirill Chernyshov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-27 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thermite