create separate file for Freenet keys

This commit is contained in:
Horhik 2021-03-24 07:18:53 +03:00
parent 20725bf5a2
commit 3119403fa3
3 changed files with 36 additions and 33 deletions

View file

@ -13,3 +13,4 @@ description = "Implementation of FCPv2 freenet protocol"
[dependencies] [dependencies]
regex = "1.4.3" regex = "1.4.3"
rusqlite = "0.24.2" rusqlite = "0.24.2"
serde = { version = "1.0", features = ["derive"], optional = true }

33
src/types/key.rs Normal file
View file

@ -0,0 +1,33 @@
use super::traits::{FcpParser, FcpRequest};
use rusqlite::types::ToSqlOutput;
use rusqlite::{Result, ToSql, types::{FromSql, ValueRef, FromSqlResult, FromSqlError}};
#[derive(Debug, PartialEq)]
pub struct SSK {
pub sign_key: String,
pub decrypt_key: String,
pub settings: Option<String>,
}
impl ToSql for SSK {
fn to_sql(&self) -> Result<ToSqlOutput<'_>> {
Ok(ToSqlOutput::from(self.convert()))
}
}
impl FromSql for SSK{
fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self>{
match SSK::parse(value.as_str()?) {
Some(res) => Ok(res),
None => Err(FromSqlError::InvalidType)
}
}
}
#[derive(Debug, PartialEq)]
pub struct USK {
pub ssk: SSK,
pub index: i32,
}

View file

@ -1,39 +1,8 @@
pub mod traits; pub mod traits;
mod key;
use regex::Regex; use regex::Regex;
use traits::*; use traits::*;
pub use key::*;
use rusqlite::types::ToSqlOutput;
use rusqlite::{Result, ToSql, types::{FromSql, ValueRef, FromSqlResult, FromSqlError}};
#[derive(Debug, PartialEq)]
pub struct SSK {
pub sign_key: String,
pub decrypt_key: String,
pub settings: Option<String>,
}
impl ToSql for SSK {
fn to_sql(&self) -> Result<ToSqlOutput<'_>> {
Ok(ToSqlOutput::from(self.convert()))
}
}
impl FromSql for SSK{
fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self>{
match SSK::parse(value.as_str()?) {
Some(res) => Ok(res),
None => Err(FromSqlError::InvalidType)
}
}
}
#[derive(Debug, PartialEq)]
pub struct USK {
pub ssk: SSK,
pub index: i32,
}
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
pub struct SSKKeypair { pub struct SSKKeypair {