From 57022e534c4b5cc7e9aabb055cacfc1e81a9d708 Mon Sep 17 00:00:00 2001 From: Giulio De Pasquale Date: Mon, 29 May 2017 16:19:08 +0200 Subject: [PATCH] Modificato file assembly per rispecchiare modifiche del loop di encrypt-decrypt --- assembler/assembler.py | 1 - polictf/asms/encrypt.pstc | 7 ++++--- polictf/tea_cversion/encrypted | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assembler/assembler.py b/assembler/assembler.py index 4764dd5..cde589a 100644 --- a/assembler/assembler.py +++ b/assembler/assembler.py @@ -1,7 +1,6 @@ import sys import re import struct -import IPython import copy import argparse diff --git a/polictf/asms/encrypt.pstc b/polictf/asms/encrypt.pstc index b7623b6..d487f54 100644 --- a/polictf/asms/encrypt.pstc +++ b/polictf/asms/encrypt.pstc @@ -53,7 +53,7 @@ shli s0, 4 addi s0, 0x7065 # s0 = (text[1] << 4) + k0 movr s1, r3 poop s3 # restoring sum in s3 -addr s1, s3 # s1 = text[1] + sum +#addr s1, s3 # s1 = text[1] + sum push s3 # saving sum again xorr s0, s1 # s0 = ((text[1] << 4) + k0) ^ (text[1] + sum) push s0 @@ -71,7 +71,7 @@ shli s0, 4 addi s0, 0x7275 # s0 = (text[0] << 4) + k2 movr s1, r2 poop s3 # restoring sum in s3 -addr s1, s3 # s1 = text[0] + sum +#addr s1, s3 # s1 = text[0] + sum push s3 # saving sum again xorr s0, s1 # s0 = ((text[0] << 4) + k2) ^ (text[0] + sum) push s0 @@ -118,11 +118,12 @@ addr r0, s0 addr r1, s0 call round poop s0 -addi s0, 1 +addi s0, 4 cmpr s0, r2 jpbi encrypt lodi r0, 0 lodi r1, 2 lodi r2, 4 lodi r3, 6 +debg shit \ No newline at end of file diff --git a/polictf/tea_cversion/encrypted b/polictf/tea_cversion/encrypted index 7638b8a..b5d327a 100644 --- a/polictf/tea_cversion/encrypted +++ b/polictf/tea_cversion/encrypted @@ -1 +1 @@ -¯“©žÚÈÓÛgJ W‰\µž1bímŒ«Úre \ No newline at end of file +¯“©ž É \ No newline at end of file