urbit/ares
1
1
Fork 0
mirror of https://github.com/urbit/ares.git synced 2024-12-23 13:25:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

address @ashelkovnykov's comments, pt. 1

Browse Source
This commit is contained in:
Matthew LeVan 2023-11-22 13:27:44 -05:00
parent 8df78a4a8f
commit 479f311123
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rust/ares/src/jets/lock/aes.rs
View File

@ -1,8 +1,8 @@
use crate::interpreter::Context;
use crate::jets::bits::util::met;
use crate::jets::util::slot;
use crate::jets::{Error, JetErr, Result};
use crate::noun::{IndirectAtom, Noun, D};
use crate::jets::{JetErr, Result};
use crate::noun::{IndirectAtom, Noun};
use urcrypt_sys::*;
crate::gdb!();
@ -13,8 +13,7 @@ pub fn jet_siva_en(context: &mut Context, subject: Noun) -> Result {
let key = slot(subject, 60)?.as_atom()?;
let atoms = slot(subject, 61)?;
if (met(3, key) as usize) > 32 {
// XX vere punts; we should do the same in the future
if met(3, key) > 32 {
Err(JetErr::Punt)
} else {
unsafe {
@ -40,6 +39,10 @@ pub fn jet_siva_de(context: &mut Context, subject: Noun) -> Result {
let key = slot(subject, 60)?.as_atom()?;
let ads = slot(subject, 61)?;
if met(3, key) > 64 {
return Err(JetErr::Punt);
}
unsafe {
let (mut _key_ida, key_bytes) = IndirectAtom::new_raw_mut_bytes(stack, 32);
key_bytes[0..key.as_bytes().len()].copy_from_slice(key.as_bytes());
@ -62,9 +65,8 @@ pub fn jet_sivb_en(context: &mut Context, subject: Noun) -> Result {
let key = slot(subject, 60)?.as_atom()?;
let atoms = slot(subject, 61)?;
if (met(3, key) as usize) > 48 {
// XX vere punts; we should do the same in the future
Err(JetErr::Fail(Error::NonDeterministic(D(0))))
if met(3, key) > 48 {
Err(JetErr::Punt)
} else {
unsafe {
let (mut _key_ida, key_bytes) = IndirectAtom::new_raw_mut_bytes(stack, 48);
@ -89,6 +91,10 @@ pub fn jet_sivb_de(context: &mut Context, subject: Noun) -> Result {
let key = slot(subject, 60)?.as_atom()?;
let ads = slot(subject, 61)?;
if met(3, key) > 48 {
return Err(JetErr::Punt);
}
unsafe {
let (mut _key_ida, key_bytes) = IndirectAtom::new_raw_mut_bytes(stack, 48);
key_bytes[0..key.as_bytes().len()].copy_from_slice(key.as_bytes());
@ -111,8 +117,7 @@ pub fn jet_sivc_en(context: &mut Context, subject: Noun) -> Result {
let key = slot(subject, 60)?.as_atom()?;
let atoms = slot(subject, 61)?;
if (met(3, key) as usize) > 64 {
// XX vere punts; we should do the same in the future
if met(3, key) > 64 {
Err(JetErr::Punt)
} else {
unsafe {

2
rust/ares/src/jets/lock/ed.rs
View File

@ -95,13 +95,11 @@ pub fn jet_veri(context: &mut Context, subject: Noun) -> Result {
unsafe {
let sig_bytes = sig.as_bytes();
// vere punts; we should do the same in the future
if sig_bytes.len() > 64 {
return Err(JetErr::Punt);
};
let pub_bytes = puk.as_bytes();
// vere punts; we should do the same in the future
if pub_bytes.len() > 32 {
return Err(JetErr::Punt);
};