From 8d55ae4b6da3a20a7cd7cfe24887e170ea94c7f5 Mon Sep 17 00:00:00 2001
From: anomen <ludek.h@gmail.com>
Date: Wed, 21 Sep 2011 21:52:57 +0200
Subject: [PATCH] www-apps/pmwiki - cookbook - AesCrypt

---
 .../org/pmwiki/cookbook/aescrypt/PmWikiTest.java   |  3 ++
 www-apps/pmwiki/cookbook/AesCrypt/aes.js           |  6 +---
 www-apps/pmwiki/cookbook/AesCrypt/aescrypt.php     | 34 +++++++++++++---------
 www-apps/pmwiki/cookbook/AesCrypt/readme.txt       | 25 +++++++++++++---
 4 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/www-apps/pmwiki/cookbook/AesCrypt/JavaAesCryptTest/src/test/java/org/pmwiki/cookbook/aescrypt/PmWikiTest.java b/www-apps/pmwiki/cookbook/AesCrypt/JavaAesCryptTest/src/test/java/org/pmwiki/cookbook/aescrypt/PmWikiTest.java
index 1b54488..97a2c5d 100644
--- a/www-apps/pmwiki/cookbook/AesCrypt/JavaAesCryptTest/src/test/java/org/pmwiki/cookbook/aescrypt/PmWikiTest.java
+++ b/www-apps/pmwiki/cookbook/AesCrypt/JavaAesCryptTest/src/test/java/org/pmwiki/cookbook/aescrypt/PmWikiTest.java
@@ -54,6 +54,9 @@ public class PmWikiTest extends TestCase {
         assertEquals("abc",
                 AesCrypto.decryptFromBase64RawKey("1ohjTsnJycmALuk=", keyData));
 
+        assertEquals(" Encrypt this text ",
+                AesCrypto.decryptFromBase64RawKey("jvJ5Tnl5eXnpdK89gmpkiWxjkmi73OoGc72C", keyData));
+
 
     }
 }
diff --git a/www-apps/pmwiki/cookbook/AesCrypt/aes.js b/www-apps/pmwiki/cookbook/AesCrypt/aes.js
index 61f784d..488b5b6 100644
--- a/www-apps/pmwiki/cookbook/AesCrypt/aes.js
+++ b/www-apps/pmwiki/cookbook/AesCrypt/aes.js
@@ -305,14 +305,10 @@ AesCtr.kdf_aes = function(password, nBits) {
   for (var i=0; i<nBytes; i++) {  // use 1st 16/24/32 chars of password for key
     pwBytes[i] = isNaN(password.charCodeAt(i)) ? 0 : password.charCodeAt(i);
   }
-  var key = Aes.cipher(pwBytes, Aes.keyExpansion(pwBytes));  // gives us 16-byte key
+  var key = Aes.Cipher(pwBytes, Aes.KeyExpansion(pwBytes));  // gives us 16-byte key
   return key.concat(key.slice(0, nBytes-16));  // expand key to 16/24/32 bytes long
 }
 
-AesCtr.kdf = function(password, nBits) {
-    return AesCtr.kdf_sha256(password, nBits);
-}
-
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
 /*  Base64 class: Base 64 encoding / decoding (c) Chris Veness 2002-2010                          */
 /*    note: depends on Utf8 class                                                                 */
diff --git a/www-apps/pmwiki/cookbook/AesCrypt/aescrypt.php b/www-apps/pmwiki/cookbook/AesCrypt/aescrypt.php
index 88d542f..73b1f23 100644
--- a/www-apps/pmwiki/cookbook/AesCrypt/aescrypt.php
+++ b/www-apps/pmwiki/cookbook/AesCrypt/aescrypt.php
@@ -3,14 +3,14 @@
 /*
     AesCrypt
 
-    Copyright 2006 Anomen (ludek_h@seznam.cz)
+    Copyright 2011 Anomen (ludek_h@seznam.cz)
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published
     by the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 */
 
-$RecipeInfo['AesCrypt']['Version'] = '2011-09-20';
+$RecipeInfo['AesCrypt']['Version'] = '2011-09-21';
 
 SDV($AesCryptKDF, 'sha256');
 SDV($AesCryptPlainToken, '(:encrypt ');
@@ -18,7 +18,6 @@ SDV($AesCryptCipherToken, '(:aes ');
 SDV($AesCryptEndToken, ':)');
 SDV($AesCryptPadding, 8);
 
-
 $HTMLHeaderFmt['aescrypt'] = "
 
 <script type=\"text/javascript\" src=\"\$PubDirUrl/aescrypt/sha256.js\"></script>
@@ -54,7 +53,7 @@ function aesClick() {
    while ((tpart.length % padding) > 0) {
        tpart = tpart.concat(' ');
    }
-   alert(tpart);
+
    tarr +=AesCtr.encrypt(tpart,tpass,256);
    tarr += ' ';
    tarr += markup_end;
@@ -88,14 +87,16 @@ function decAesClick(elem) {
 function registerAesEvent()
 {
   var formElement = document.getElementById('text').parentNode;
-  alert(formElement.nodeValue);
+  //alert(formElement.nodeValue);
+  
+  // TODO: add protection handler to save buttons
   
 }
 
 if ( document.addEventListener ) {
-//  window.addEventListener( 'load', registerAesEvent, false );
+  window.addEventListener( 'load', registerAesEvent, false );
 } else if ( document.attachEvent ) {
-//  window.attachEvent( 'onload', registerAesEvent );
+  window.attachEvent( 'onload', registerAesEvent );
 }
 
 // ]]>
@@ -103,16 +104,21 @@ if ( document.addEventListener ) {
 ";
 
 Markup('aescrypt',
-       'inline',
-       "/\\(:aes\\s+(.*?)\s*:\\)/se",
+       '_begin',
+       "/\\Q$AesCryptCipherToken\\E\\s*(.*?)\\s*\\Q$AesCryptEndToken\\E/se",
        "'\n'.'<a href=\"javascript:void (0);\" onClick=\"decAesClick(this);\"><span style=\"display:none;\">$1</span><span>[Decrypt]</span></a>'");
 
 if ($action == 'edit') {
- $GUIButtons['aescrypt'] = array(750, '', '', '',
-  '<a href=\"#\" onclick=\"aesClick(0);\"><img src=\"$GUIButtonDirUrlFmt/aescrypt.png\" title=\"Encrypt\" /></a>');
-
- $GUIButtons['aescryptDebug'] = array(1750, '', '', '',
-  '<a href=\"#\" onclick=\"registerAesEvent();\"><img src=\"$GUIButtonDirUrlFmt/aescrypt.png\" title=\"Encrypt\" /></a>');
 
+ if ($EnableGUIButtons) {
+  $GUIButtons['aescrypt'] = array(750, '', '', '',
+   '<a href=\"#\" onclick=\"aesClick(0);\"><img src=\"$GUIButtonDirUrlFmt/aescrypt.png\" title=\"Encrypt\" /></a>');
+ } else {
+  $MessagesFmt[] = "<input type='button' name='aesButton' value='Encrypt' onClick='aesClick(0);'/>";
+ }
 }
 
+ // DEV
+ $GUIButtons['aescryptDebug'] = array(1750, '', '', '',
+  '<a href=\"#\" onclick=\"registerAesEvent();\"><img src=\"$GUIButtonDirUrlFmt/aescrypt.png\" title=\"dev\" /></a>');
+
diff --git a/www-apps/pmwiki/cookbook/AesCrypt/readme.txt b/www-apps/pmwiki/cookbook/AesCrypt/readme.txt
index a3b21b9..d0e0dda 100644
--- a/www-apps/pmwiki/cookbook/AesCrypt/readme.txt
+++ b/www-apps/pmwiki/cookbook/AesCrypt/readme.txt
@@ -3,7 +3,8 @@
 !!!Alternative version by [[~Anomen]].
 : git repo : http://repo.or.cz/w/anomen-overlay.git/tree/HEAD:/www-apps/pmwiki/cookbook/AesCrypt
 
-My version fixes several problems:
+
+This version fixes several problems:
 * non-standard and weak (only 128bit) key derivation function replaced with SHA-256
 * rewritten low quality javascript code
 * created alternative implementation - see Java testing application
@@ -16,8 +17,24 @@ My version fixes several problems:
 * random 64bit nonce is extended to 128bit by appending 64bit counter (zeroes)
 * key derivation algorithm (configurable by $AesCryptKDF)
 ** sha256 (SHA-256 hash of password)
-** aes (encrypt password with AES)
+** aes (encrypt password with AES, compatible with original aescrypt-0.1 recipe)
 ** pbkdf2 (not yet implemented)
 * plaintext is encripted using AES-256 in CTR mode
-* output is concatenation of upper 64 bits of nonce and ciphertext
-* output is Base64-encoded
+* output is Base64-encoded concatenation of upper 64 bits of nonce and ciphertext
+
+To replace previous version use:
+[@
+$AesCryptKDF='aes';
+$AesCryptPlainToken='(:aescrypt:) [=';
+$AesCryptCipherToken='(:aescrypted:) [=';
+$AesCryptEndToken='=]';
+require_once('cookbook/aescrypt.php');
+@]
+
+!!Configuration
+: $AesCryptKDF : aes, sha256, pbkdf2;
+: $AesCryptPlainToken : starting token for plaintext
+: $AesCryptCipherToken : starting token for ciphertext
+: $AesCryptEndToken : closing token
+: $AesCryptPadding : size of padding block
+: $EnableGUIButtons : affects rendering of Encrypt button (do not modify it after including aescrypt.php)
-- 
2.11.4.GIT