From 2a23c5e8dcbbdb972949a65ad716d68671eb0fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Sat, 15 Feb 1997 23:03:28 +0100
Subject: [PATCH] Use module system.
Rev: src/modules/_Crypto/test_crypto.pike:1.3
---
src/modules/_Crypto/test_crypto.pike | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/modules/_Crypto/test_crypto.pike b/src/modules/_Crypto/test_crypto.pike
index 50f10c4e19..b31efb54cf 100755
--- a/src/modules/_Crypto/test_crypto.pike
+++ b/src/modules/_Crypto/test_crypto.pike
@@ -2,11 +2,12 @@
/* test_crypto.pike */
-inherit "StdCrypt";
+import Crypto;
#define K(a) hex_to_string(a)
#define H(a) string_to_hex(a)
+
int test_des()
{
string *keys = ({ K("0101010101010180"),
@@ -41,7 +42,7 @@ int test_des()
{
string gibberish;
write(sprintf("Testing key %d\n", i));
- c = DES()->set_encrypt_key(keys[i]);
+ c = des()->set_encrypt_key(keys[i]);
gibberish = c->crypt_block(texts[i]);
if (gibberish != cipher[i])
{
@@ -71,7 +72,7 @@ int test_idea()
object c;
write("IDEA...\n");
- c = IDEA()->set_encrypt_key(key);
+ c = idea()->set_encrypt_key(key);
gibberish = c->crypt_block(msg);
if (gibberish != cipher)
{
@@ -196,7 +197,7 @@ int test_cbc()
write("CBC...\n");
// c = Crypto(CBC(IDEA)->set_encrypt_key(key)->set_iv(iv)); /* correct */
- c = Crypto(CBC(IDEA)->set_iv(iv)->set_encrypt_key(key)); /* bad */
+ c = crypto(cbc(idea)->set_iv(iv)->set_encrypt_key(key)); /* bad */
gibberish = c->crypt(msg) + c->pad();
write("\"" + gibberish[..50] + "\"\n");
write("\"" + H(gibberish) + "\"\n");
@@ -205,7 +206,7 @@ int test_cbc()
write("Encryption failed\n");
err++;
}
- c = Crypto(CBC(IDEA)->set_decrypt_key(key)->set_iv(iv));
+ c = crypto(cbc(idea)->set_decrypt_key(key)->set_iv(iv));
recovered = c->unpad(c->crypt(gibberish));
write("\"" + recovered[..50] + "...\"\n");
if (recovered != msg)
--
GitLab