fixup import

Signed-off-by: Arthur Gautier <[email protected]>

Author: baloo

cryptoki-rustcrypto/src/ecdsa.rs

@@ -17,10 +17,10 @@ use ecdsa::{
         point::PointCompression,
         sec1::{FromEncodedPoint, ModulusSize, ToEncodedPoint},
         subtle::CtOption,
-        AffinePoint, CurveArithmetic, FieldBytesSize, PublicKey, Scalar,
+        AffinePoint, CurveArithmetic, FieldBytesSize, PublicKey, Scalar, SecretKey,
     },
     hazmat::{DigestPrimitive, SignPrimitive},
-    PrimeCurve, Signature, SignatureSize, SigningKey, VerifyingKey,
+    PrimeCurve, Signature, SignatureSize, VerifyingKey,
 };
 use signature::{digest::Digest, DigestSigner};
 use spki::{
@@ -73,7 +73,7 @@ where
     }
 }
 
-impl<C> CryptokiImport for SigningKey<C>
+impl<C> CryptokiImport for SecretKey<C>
 where
     C: PrimeCurve + CurveArithmetic,
     Scalar<C>: Invert<Output = CtOption<Scalar<C>>> + SignPrimitive<C>,
@@ -98,7 +98,7 @@ where
     }
 }
 
-impl<C> CryptokiImport for VerifyingKey<C>
+impl<C> CryptokiImport for PublicKey<C>
 where
     C: PrimeCurve + CurveArithmetic + PointCompression,
     AffinePoint<C>: FromEncodedPoint<C> + ToEncodedPoint<C>,

cryptoki-rustcrypto/src/rsa/mod.rs

@@ -6,15 +6,15 @@ use cryptoki::{
         rsa::{PkcsMgfType, PkcsPssParams},
         Mechanism, MechanismType,
     },
-    object::{Attribute, AttributeType, KeyType, ObjectClass},
+    object::{Attribute, AttributeType, KeyType, ObjectClass, ObjectHandle},
 };
 use der::oid::AssociatedOid;
-use rsa::{BigUint, RsaPublicKey};
+use rsa::{traits::PublicKeyParts, BigUint, RsaPublicKey};
 use signature::digest::Digest;
 use std::convert::TryInto;
 use thiserror::Error;
 
-use crate::SessionLike;
+use crate::{CryptokiImport, SessionLike};
 
 pub mod pkcs1v15;
 pub mod pss;
@@ -126,3 +126,21 @@ impl_digest_signing!(
     SHA512,
     MGF1_SHA512
 );
+
+impl CryptokiImport for RsaPublicKey {
+    fn put_key<S: SessionLike>(
+        &self,
+        session: &S,
+        template: impl Into<Vec<Attribute>>,
+    ) -> cryptoki::error::Result<ObjectHandle> {
+        let mut template = template.into();
+        template.push(Attribute::Class(ObjectClass::PUBLIC_KEY));
+        template.push(Attribute::KeyType(KeyType::RSA));
+        template.push(Attribute::Modulus(self.n().to_bytes_be()));
+        template.push(Attribute::PublicExponent(self.e().to_bytes_be()));
+
+        let handle = session.create_object(&template)?;
+
+        Ok(handle)
+    }
+}