[enigma~subversion:4] ongoing updates
- From: ejoftheweb@kenai.com
- To: commits@enigma.kenai.com
- Subject: [enigma~subversion:4] ongoing updates
- Date: Fri, 26 Mar 2010 17:49:25 +0000
Project: enigma
Repository: subversion
Revision: 4
Author: ejoftheweb
Date: 2010-03-26 17:49:22 UTC
Link:
Log Message:
------------
ongoing updates
Revisions:
----------
4
Modified Paths:
---------------
enigma/test/store.enigma
enigma/src/uk/co/platosys/enigma/EnigmaStore.java
enigma/test/uk/co/platosys/enigma/CryptDecryptTest.java
enigma/nbproject/genfiles.properties
enigma/nbproject/build-impl.xml
enigma/test/storetest1/secring.asc
enigma/test/test/pubring.asc
enigma/test/test/secring.asc
enigma/test/storetest.asc
enigma/test/storetest2/pubring.asc
enigma/test/clearSignedFile.xml
enigma/test/uk/co/platosys/enigma/SignVerifyTest.java
enigma/test/storetest2/seedring.asc
enigma/src/uk/co/platosys/enigma/Kidney.java
enigma/test/test/seedring.asc
enigma/src/uk/co/platosys/enigma/Key.java
enigma/test/storetest1/pubring.asc
enigma/test/storetest2/secring.asc
enigma/test/cryptFile.xml
enigma/test/uk/co/platosys/enigma/LockStoreTest.java
enigma/src/uk/co/platosys/enigma/Lock.java
enigma/nbproject/project.properties
enigma/test/storetest1/seedring.asc
Added Paths:
------------
enigma/test/uk/co/platosys/enigma/EnigmaSuite.java
Diffs:
------
Index: enigma/test/clearSignedFile.xml
===================================================================
--- enigma/test/clearSignedFile.xml (revision 3)
+++ enigma/test/clearSignedFile.xml (revision 4)
@@ -7,14 +7,13 @@
test fixture for enigma testing
-->
<root>
- <testelement name="one" Id="19-d3-77-e5-65-9c-95-59">
+ <testelement name="one" Id="55-f6-23-10-a4-fc-4c-20">
<content type="text">the quick brown fox jumps over the lazy
dog</content>
- <enigma:SignedBy xmlns:enigma="http://www.platosys.co.uk/enigma" ;
KeyID="a4-db-d0-c5-ef-1a-ac-8d" />
- <ds:Signature xmlns:ds="http://www.w3.org/2001/04/xmldsig#" ;
name="19-d3-77-e5-65-9c-95-59">
+ <ds:Signature xmlns:ds="http://www.w3.org/2001/04/xmldsig#" ;
name="55-f6-23-10-a4-fc-4c-20">
<ds:SignedInfo>
<ds:CanonicalizationMethod
Algorithm="http://www.w3.org/2006/12/xml-c14n11" />
<ds:SignatureMethod Algorithm="" />
- <ds:Reference URI="#19-d3-77-e5-65-9c-95-59">
+ <ds:Reference URI="#55-f6-23-10-a4-fc-4c-20">
<ds:Transforms>
<ds:Transform Algorithm="http://www.w3.org/2006/12/xml-c14n11" />
</ds:Transforms>
@@ -22,12 +21,12 @@
<ds:DigestValue>nBGFpcXp/FRhKAiXfuj1SLIljTE=</ds:DigestValue>
</ds:Reference>
</ds:SignedInfo>
-
<ds:SignatureValue>iEYEARECAAYFAkqt784ACgkQpNvQxe8arI1kFACgo9IikUMdscOlRp8Nvb9iLwbwNf0AoJNMSrMCMVU4Ay13yygQYrkvzeow</ds:SignatureValue>
+
<ds:SignatureValue>iEYEARECAAYFAkqx4X4ACgkQw37thOAJZwP1MwCgtNAe6uFBEDCoMeGbA8W768nKSssAoLcSW5EXPe0qjQbwK6iFFtu7EPkE</ds:SignatureValue>
<ds:KeyInfo>
<ds:PGPData>
- <ds:PGPKeyID>pNvQxe8arI0=</ds:PGPKeyID>
- <enigma:PGPKeyID
xmlns:enigma="http://www.platosys.co.uk/enigma";>a4-db-d0-c5-ef-1a-ac-8d</enigma:PGPKeyID>
- <enigma:PGPFingerPrint
xmlns:enigma="http://www.platosys.co.uk/enigma";>98-a8-e1-c2-f6-e9-b8-14-1f-aa-62-4a-a4-db-d0-c5-ef-1a-ac-8d</enigma:PGPFingerPrint>
+ <ds:PGPKeyID>w37thOAJZwM=</ds:PGPKeyID>
+ <enigma:PGPKeyID
xmlns:enigma="http://www.platosys.co.uk/enigma";>c3-7e-ed-84-e0-09-67-03</enigma:PGPKeyID>
+ <enigma:PGPFingerPrint
xmlns:enigma="http://www.platosys.co.uk/enigma";>01-fd-15-28-01-84-7a-3c-44-0c-43-50-c3-7e-ed-84-e0-09-67-03</enigma:PGPFingerPrint>
</ds:PGPData>
</ds:KeyInfo>
</ds:Signature>
Index: enigma/test/test/secring.asc
===================================================================
--- enigma/test/test/secring.asc (revision 3)
+++ enigma/test/test/secring.asc (revision 4)
@@ -1,25 +1,25 @@
-----BEGIN PGP PRIVATE KEY BLOCK-----
Version: BCPG v1.43
-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
+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
-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
-lI7WrkT6nXiuCXaJTkD5xw==
-=3T+a
+Xj/SBEiV1gnPm0ELeg8Syhy5pCjMAf9aGNbBuP6V8iagFcHGBYIJ6CAMJSiD91Ln
+NfQiH9sVq0sXH8L6YVmjQsoSwPqm+DEGSPXo7472Wu3HUq/nwkND/wkDAnIjNYHf
++/avYKG54IYrftUVXEFhx/WkWWAQONW/jTJLdJYh2uCWh9bS30+eJ16wOP0c1vw5
+hlFcTXdE2U+jLF2BXvS+6eCo1YW3z3pkUaykc5i9gmo+0DYmD/QO4IhGBBgRAgAG
+BQJKseGbAAoJED+Sjj1/PNboP84AoLJN1M/shgt3Yukx7CqT7uodg9CDAJ9E4MzE
+qYcZMrUCmUqApYDs+lTYFQ==
+=SfaR
-----END PGP PRIVATE KEY BLOCK-----
Index: enigma/test/test/seedring.asc
===================================================================
--- enigma/test/test/seedring.asc (revision 3)
+++ enigma/test/test/seedring.asc (revision 4)
@@ -1,22 +1,22 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: BCPG v1.43
-mQGiBEqBEUMRBAD1I4jeEDcIdWgoeD9BdEysE+DvH2PTwuMWsbVsC98R2mCNutjn
-fnXS5I7GWKb4cYyW5J1Ik8aAEVJUbiXGBU00RhS8+Uipjb0F/dPHPau2dC/Q2ZTv
-MR2gZGDERPzwOrKvVSEbLXLxrOgdWkduyMS3SyUrGK1B8sfPx4kFeBb0TwCgpex3
-KWcFY9UUEAeRbJiSWTATbYUD/2RKXCXf+1ndZKbjjzu33bn2+W4ydzpDsdRyMxxw
-6Pgp/rvN1KcMvTLp3UIgt8MB/gSjFNNnHvINsK4txd1nhVO+b/0Ljv2VwWB8gyf9
-XUZd+ydYHnTIG72qmgn8glUeEUDsTtmOQrQqnlPkj50V0m6o8SWzwlUUg5Y5B19c
-EftfBADXjA5M7UNuJK5DePGemqstrvDv704XysAcqSTUNNu+cDWuXWNoCLCTM873
-abF/gkbKub320tYrVBuJeLASOB5WH8ZDjG2Oo3KnC/dXjoARSOzNvV3m2hf/3d2Z
-nhzeYfFEj6LO5iSQrNjp84VILPPiLsTK/6jC6pfPSCwijXdD+7QEdGVzdIhGBBMR
-AgAGBQJKgRFDAAoJEJy794NsxDHjY5IAmQHkcKqZVqnj4BT4Jd0bUQHBh/4XAJ43
-8RZvmn4csWmQ6jqqk7cSCP2cHbjMBEqBEUMQAgCUlP7AlfO4XuKGVCs4NvyBpd0K
+mQGiBEqx4ZsRBAClkjEKKh3zhsD/5QQIyBvDRkxlVGdDTEUmGnepNnbLsbiLD+Vq
+wX9caITfICSIObDPqOWT+aZKSUvySQG8k+1mVrO+jXdVIULyBb86ICS+sJ7LPxWW
+GQ3N/V6CLRkroiSVB3rGAw98kbITcxt4OeL3mim/8zeKK2mmM48n7HCRPwCg3k57
+ov1WXfPVxjipSu/UZRxWgkED/19NF/uufoLzSynez4r7QB+Vos4NJ+w0jbtpvyiA
+kG7GUg4fkrwQ30c/hkUW7+CjrtvvwEL/0zpMnzjeR9NCMI+JEYO20wz8/PTPnWES
+3ooPBLueQvlBqBOk9LuH2AlrNYCD7chi1QrfL4k54oKXe/tgUv4tho6mHR8/sz9v
+aDJnA/9lGxsJ4NTEgczhFWSgjthhRR8B8FHjIUGn/4U6WOsPm0lCHwTK63WCZtzI
+YuUm0jrM+mre+MNL3rEG0G2ko0n2ETqROa8q0cIwn24hUAtInUHisXVf9i9D6Tfx
+saNCnZmUP9eoTlYRcwcVwpTcMRd0pbl0k966U3+tMx0SVST2erQEdGVzdIhGBBMR
+AgAGBQJKseGbAAoJED+Sjj1/PNboT00AoIExdOT5FmYWH/iY6BPZHw0Z9nF+AKDA
+na7FkxShzt2esMjfQJJpyo/6NbjMBEqx4ZsQAgCUlP7AlfO4XuKGVCs4NvyBpd0K
A0m0wjndOHRNSIz44x24vLfTO0GrueWjPMqRRLHO8zLJS/BXO/BHo6ypjN87Af0V
PV1hcq20MEW2iujh3hBwthNwBWhtKdPXOndJGZaB7lshLJuWv9z6WyDNXj/SBEiV
-1gnPm0ELeg8Syhy5pCjMAf9x3Z1fTXGdYCzvPomCPtGmPJimUObI3i/wDWZmY/nx
-j0hIUBbT4Poxi1jNPcJjugrzJX2/mCwidcM6ZdOzfiJDiEYEGBECAAYFAkqBEUQA
-CgkQnLv3g2zEMePiAACeO9zteEL4gz9DB2htYQCTh3DmCxcAni0qHhmUjtauRPqd
-eK4JdolOQPnH
-=ua+y
+1gnPm0ELeg8Syhy5pCjMAf9aGNbBuP6V8iagFcHGBYIJ6CAMJSiD91LnNfQiH9sV
+q0sXH8L6YVmjQsoSwPqm+DEGSPXo7472Wu3HUq/nwkNDiEYEGBECAAYFAkqx4ZsA
+CgkQP5KOPX881ug/zgCgsk3Uz+yGC3di6THsKpPu6h2D0IMAn0TgzMSphxkytQKZ
+SoClgOz6VNgV
+=rfI4
-----END PGP PUBLIC KEY BLOCK-----
Index: enigma/test/test/pubring.asc
===================================================================
--- enigma/test/test/pubring.asc (revision 3)
+++ enigma/test/test/pubring.asc (revision 4)
@@ -1,22 +1,22 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: BCPG v1.43
-mQGiBEqBEUMRBAD1I4jeEDcIdWgoeD9BdEysE+DvH2PTwuMWsbVsC98R2mCNutjn
-fnXS5I7GWKb4cYyW5J1Ik8aAEVJUbiXGBU00RhS8+Uipjb0F/dPHPau2dC/Q2ZTv
-MR2gZGDERPzwOrKvVSEbLXLxrOgdWkduyMS3SyUrGK1B8sfPx4kFeBb0TwCgpex3
-KWcFY9UUEAeRbJiSWTATbYUD/2RKXCXf+1ndZKbjjzu33bn2+W4ydzpDsdRyMxxw
-6Pgp/rvN1KcMvTLp3UIgt8MB/gSjFNNnHvINsK4txd1nhVO+b/0Ljv2VwWB8gyf9
-XUZd+ydYHnTIG72qmgn8glUeEUDsTtmOQrQqnlPkj50V0m6o8SWzwlUUg5Y5B19c
-EftfBADXjA5M7UNuJK5DePGemqstrvDv704XysAcqSTUNNu+cDWuXWNoCLCTM873
-abF/gkbKub320tYrVBuJeLASOB5WH8ZDjG2Oo3KnC/dXjoARSOzNvV3m2hf/3d2Z
-nhzeYfFEj6LO5iSQrNjp84VILPPiLsTK/6jC6pfPSCwijXdD+7QEdGVzdIhGBBMR
-AgAGBQJKgRFDAAoJEJy794NsxDHjY5IAmQHkcKqZVqnj4BT4Jd0bUQHBh/4XAJ43
-8RZvmn4csWmQ6jqqk7cSCP2cHbjMBEqBEUMQAgCUlP7AlfO4XuKGVCs4NvyBpd0K
+mQGiBEqx4ZsRBAClkjEKKh3zhsD/5QQIyBvDRkxlVGdDTEUmGnepNnbLsbiLD+Vq
+wX9caITfICSIObDPqOWT+aZKSUvySQG8k+1mVrO+jXdVIULyBb86ICS+sJ7LPxWW
+GQ3N/V6CLRkroiSVB3rGAw98kbITcxt4OeL3mim/8zeKK2mmM48n7HCRPwCg3k57
+ov1WXfPVxjipSu/UZRxWgkED/19NF/uufoLzSynez4r7QB+Vos4NJ+w0jbtpvyiA
+kG7GUg4fkrwQ30c/hkUW7+CjrtvvwEL/0zpMnzjeR9NCMI+JEYO20wz8/PTPnWES
+3ooPBLueQvlBqBOk9LuH2AlrNYCD7chi1QrfL4k54oKXe/tgUv4tho6mHR8/sz9v
+aDJnA/9lGxsJ4NTEgczhFWSgjthhRR8B8FHjIUGn/4U6WOsPm0lCHwTK63WCZtzI
+YuUm0jrM+mre+MNL3rEG0G2ko0n2ETqROa8q0cIwn24hUAtInUHisXVf9i9D6Tfx
+saNCnZmUP9eoTlYRcwcVwpTcMRd0pbl0k966U3+tMx0SVST2erQEdGVzdIhGBBMR
+AgAGBQJKseGbAAoJED+Sjj1/PNboT00AoIExdOT5FmYWH/iY6BPZHw0Z9nF+AKDA
+na7FkxShzt2esMjfQJJpyo/6NbjMBEqx4ZsQAgCUlP7AlfO4XuKGVCs4NvyBpd0K
A0m0wjndOHRNSIz44x24vLfTO0GrueWjPMqRRLHO8zLJS/BXO/BHo6ypjN87Af0V
PV1hcq20MEW2iujh3hBwthNwBWhtKdPXOndJGZaB7lshLJuWv9z6WyDNXj/SBEiV
-1gnPm0ELeg8Syhy5pCjMAf9x3Z1fTXGdYCzvPomCPtGmPJimUObI3i/wDWZmY/nx
-j0hIUBbT4Poxi1jNPcJjugrzJX2/mCwidcM6ZdOzfiJDiEYEGBECAAYFAkqBEUQA
-CgkQnLv3g2zEMePiAACeO9zteEL4gz9DB2htYQCTh3DmCxcAni0qHhmUjtauRPqd
-eK4JdolOQPnH
-=ua+y
+1gnPm0ELeg8Syhy5pCjMAf9aGNbBuP6V8iagFcHGBYIJ6CAMJSiD91LnNfQiH9sV
+q0sXH8L6YVmjQsoSwPqm+DEGSPXo7472Wu3HUq/nwkNDiEYEGBECAAYFAkqx4ZsA
+CgkQP5KOPX881ug/zgCgsk3Uz+yGC3di6THsKpPu6h2D0IMAn0TgzMSphxkytQKZ
+SoClgOz6VNgV
+=rfI4
-----END PGP PUBLIC KEY BLOCK-----
Index: enigma/test/uk/co/platosys/enigma/EnigmaTest.java
===================================================================
--- enigma/test/uk/co/platosys/enigma/EnigmaTest.java (revision 3)
+++ enigma/test/uk/co/platosys/enigma/EnigmaTest.java (revision 4)
@@ -1,324 +0,0 @@
-/*
- * Copyright Edward Barrow and Platosys.
- * Most Platosys code is licensed under the GPL.
- */
-
-package uk.co.platosys.enigma;
-
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import uk.co.platosys.util.DocMan;
-import uk.co.platosys.util.ISODate;
-import uk.co.platosys.util.Logger;
-
-import uk.co.platosys.util.PlatosysProperties;
-import static org.junit.Assert.*;
-
-/**
- *
- * @author edward
- */
-public class EnigmaTest {
- static File docFolder;
- static File keyFolder;
- static File clearFile;
- static File cipherFile;
- static File clearSignedFile;
-
-static char [] passphrase1 = {'t','e','s','t'};
-static Lock lock1;
-static Key key1;
-static char [] passphrase2 = {'t','s','e','t'};
-static Lock lock2;
-static Key key2;
-
-
-
-
-static EnigmaStore lockStore;
-
-static Logger debugLogger = Logger.getLogger("enigma");
-static Document clearDocument;
- public EnigmaTest() {
- }
-
- @BeforeClass
- public static void setUpClass() throws Exception {
- docFolder=new File(PlatosysProperties.readProperty("enigma",
"test.documents.directory"));
-
- keyFolder=new File(PlatosysProperties.readProperty("enigma",
"test.keys.directory"));
-
- LockSet lockSet = LockSmith.createLockSet(keyFolder, "test1",
passphrase1);
- lock1=lockSet.getLock();
- lockStore=new EnigmaStore(lock1);
- lockStore.setFile(new File(keyFolder,
PlatosysProperties.readProperty("enigma", "test.keys.store")));
- lockStore.save();
- key1= lockSet.getKey();
-
- lockSet = LockSmith.createLockSet(keyFolder, "test2", passphrase2);
- lock2 = lockSet.getLock();
- lockStore.addLock(lock2);
- key2=lockSet.getKey();
-
- clearFile=new File(docFolder,
PlatosysProperties.readProperty("enigma","test.clearfile"));
- cipherFile=new File(docFolder,
PlatosysProperties.readProperty("enigma", "test.cryptfile"));
- clearSignedFile=new File(docFolder,
PlatosysProperties.readProperty("enigma", "test.clearsignedfile"));
-
- }
-
- @AfterClass
- public static void tearDownClass() throws Exception {
- }
-
- @Before
- public void setUp() {
- clearDocument = DocMan.build(clearFile);
- }
-
- @After
- public void tearDown() {
- }
-
- //
- // @Test
- // public void hello() {}
- @Test
- public void elementSignTest(){
- System.out.println("ElementSignTest");
- Element testElement =
clearDocument.getRootElement().getChild("testelement");
- Enigma.sign(testElement, key1, passphrase1);
-
-
-
- long keyID = key1.getKeyID();
- long testID=0;
- List<Element> signedByElements = testElement.getChildren("SignedBy",
Enigma.ENIGMA_NAMESPACE);
- System.out.println(signedByElements.size());
-
- Iterator<Element> it = signedByElements.iterator();
-
- while (it.hasNext()){
- Element signedByElement= it.next();
- String signingkeyid = signedByElement.getAttributeValue("KeyID");
- long signingKeyID = Kidney.toLong(signingkeyid);
- if (signingKeyID==keyID){
- testID=signingKeyID;
- }
-
- }
- assertTrue(testID==keyID);
- System.out.println("testID ok");
-
- Element signatureElement = (testElement.getChild("Signature",
Enigma.SIGNATURE_NAMESPACE));
- assertNotNull(signatureElement);
- System.out.println("sig el ok");
-
- Element signedInfoElement = signatureElement.getChild("SignedInfo",
Enigma.SIGNATURE_NAMESPACE);
- assertNotNull(signedInfoElement);
- System.out.println("sig info ok");
-
- Element signatureValueElement =
signatureElement.getChild("SignatureValue",Enigma.SIGNATURE_NAMESPACE);
- System.out.println(signatureValueElement.getText());
-
- assertNotNull(signatureValueElement.getText());
-
- //DocMan.write(clearSignedFile, clearDocument);
-
-
-
- try{
- Element signedByElement=null;
- testElement = Enigma.verify(testElement, lockStore);
- DocMan.write(clearSignedFile, clearDocument);
-
- signedByElements = testElement.getChildren("SignedBy",
Enigma.ENIGMA_NAMESPACE);
- System.out.println(signedByElements.size());
- it = signedByElements.iterator();
-
- while (it.hasNext()){
- Element signedbyElement= it.next();
- String signingkeyid =
signedbyElement.getAttributeValue("KeyID");
- long signingKeyID = Kidney.toLong(signingkeyid);
- if (signingKeyID==keyID){
- testID=signingKeyID;
- signedByElement=signedbyElement;
- }
- assertNotNull(signedByElement);
- System.out.println("signedByElement ok");
- List verificationElements =
signedByElement.getChildren("Verification",Enigma.ENIGMA_NAMESPACE);
- it=verificationElements.iterator();
- Element verificationElement=null;
- while (it.hasNext()){
- Element test = it.next();
- if
((test.getAttributeValue("agent")).equals(Kidney.toString(lockStore.getStoreID()))){
- verificationElement=test;
- }
- }
-
- assertNotNull(verificationElement);
- System.out.println("verificationElement ok");
- List<Attribute> attributes =
verificationElement.getAttributes();
- Iterator<Attribute> atit = attributes.iterator();
- while(atit.hasNext()){
- System.out.println(atit.next().getName());
- }
- if (verificationElement.getAttribute("passed")!=null){
- ISODate isoDate = new
ISODate(verificationElement.getAttributeValue("passed"));
- ISODate now = new ISODate();
- assertTrue(isoDate.before(now));
- System.out.println("passed attribute ok");
- }else{
- fail("verification element has no passed attribute");
- }
- }
- }catch(Exception uae){
- debugLogger.log("error", uae);
-
- }
- }
- @Test
- public void ElementCryptTest(){
- System.out.println("ElementCryptTest");
- Element testElement =
clearDocument.getRootElement().getChild("testelement");
- String testDigest = DigestEngine.digest(testElement);
- Element cryptElement=Enigma.lock(testElement, lock2, true );
- Document cipherDocument = cryptElement.getDocument();
- DocMan.write(cipherFile, cipherDocument);
- cipherDocument=DocMan.build(cipherFile);
- List<Element> encryptedElements =
cipherDocument.getRootElement().getChildren("EncryptedData",
Enigma.ENCRYPTION_NAMESPACE);
- Iterator<Element> itel = encryptedElements.iterator();
- Element clearElement=null;
- if(! itel.hasNext()){
- fail("no encrypted element found in test document");
- }
- while(itel.hasNext()){
- Element encryptedElement=itel.next();
- try{
- clearElement = Enigma.unlock(encryptedElement, key2,
passphrase2);
- }catch(Exception e){
-
- }
- }
- assertNotNull(clearElement);
- String clearDigest=DigestEngine.digest(clearElement);
- assertTrue(testDigest.equals(clearDigest));
- }
- @Test
- public void CryptSignTest(){
- System.out.println("CryptSignTest");
- Element testElement =
clearDocument.getRootElement().getChild("testelement");
- testElement=Enigma.sign(testElement, key2, passphrase2);
- String testDigest = DigestEngine.digest(testElement);
- testElement=Enigma.lock(testElement, lock1, true);
- Document cipherDocument = testElement.getDocument();
- DocMan.write(cipherFile, cipherDocument);
- cipherDocument=DocMan.build(cipherFile);
-
- List<Element> encryptedElements =
cipherDocument.getRootElement().getChildren("EncryptedData",
Enigma.ENCRYPTION_NAMESPACE);
- Iterator<Element> itel = encryptedElements.iterator();
- Element clearElement=null;
- if(! itel.hasNext()){
- fail("no encrypted element found in test document");
- }
- while(itel.hasNext()){
- Element encryptedElement=itel.next();
- try{
- clearElement = Enigma.unlock(encryptedElement, key1,
passphrase1);
- }catch(Exception e){
-
- }
- }
- assertNotNull(clearElement);
- System.out.println("clear element ok");
- String clearDigest=DigestEngine.digest(clearElement);
- assertTrue(testDigest.equals(clearDigest));
-
- System.out.println("digests match");
- long keyID = key2.getKeyID();
- long testID=0;
- List<Element> signedByElements =
clearElement.getChildren("SignedBy", Enigma.ENIGMA_NAMESPACE);
- System.out.println(signedByElements.size());
-
- Iterator<Element> it = signedByElements.iterator();
-
- while (it.hasNext()){
- Element signedByElement= it.next();
- String signingkeyid = signedByElement.getAttributeValue("KeyID");
- long signingKeyID = Kidney.toLong(signingkeyid);
- if (signingKeyID==keyID){
- testID=signingKeyID;
- }
-
- }
- assertTrue(testID==keyID);
- System.out.println("testID ok");
-
- Element signatureElement = (clearElement.getChild("Signature",
Enigma.SIGNATURE_NAMESPACE));
- assertNotNull(signatureElement);
- System.out.println("sig el ok");
-
- Element signedInfoElement = signatureElement.getChild("SignedInfo",
Enigma.SIGNATURE_NAMESPACE);
- assertNotNull(signedInfoElement);
- System.out.println("sig info ok");
-
- Element signatureValueElement =
signatureElement.getChild("SignatureValue",Enigma.SIGNATURE_NAMESPACE);
- System.out.println(signatureValueElement.getText());
-
- assertNotNull(signatureValueElement.getText());
-
- //DocMan.write(clearSignedFile, clearDocument);
-
-
-
- try{
- Element signedByElement=null;
- clearElement = Enigma.verify(clearElement, lockStore);
- DocMan.write(clearSignedFile, clearDocument);
-
- signedByElements = clearElement.getChildren("SignedBy",
Enigma.ENIGMA_NAMESPACE);
- System.out.println(signedByElements.size());
- it = signedByElements.iterator();
-
- while (it.hasNext()){
- Element signedbyElement= it.next();
- String signingkeyid =
signedbyElement.getAttributeValue("KeyID");
- long signingKeyID = Kidney.toLong(signingkeyid);
- if (signingKeyID==keyID){
- testID=signingKeyID;
- signedByElement=signedbyElement;
- }
- assertNotNull(signedByElement);
- System.out.println("signedByElement ok");
- List verificationElements =
signedByElement.getChildren("Verification",Enigma.ENIGMA_NAMESPACE);
- it=verificationElements.iterator();
- Element verificationElement=null;
- while (it.hasNext()){
- Element test = it.next();
- if
((test.getAttributeValue("agent")).equals(Kidney.toString(lockStore.getStoreID()))){
- verificationElement=test;
- }
- }
- assertNotNull(verificationElement);
- System.out.println("verificationElement ok");
- ISODate isoDate = new
ISODate(verificationElement.getAttributeValue("passed"));
- ISODate now = new ISODate();
- assertTrue(isoDate.before(now));
- System.out.println("passed attribute ok");
-
- }
- }catch(Exception uae){
- debugLogger.log("error", uae);
-
- }
- }
-
-}
\ No newline at end of file
Index: enigma/test/uk/co/platosys/enigma/KeyTest.java
===================================================================
--- enigma/test/uk/co/platosys/enigma/KeyTest.java (revision 3)
+++ enigma/test/uk/co/platosys/enigma/KeyTest.java (revision 4)
@@ -1,58 +0,0 @@
-/*
- * Copyright Edward Barrow and Platosys.
- * Most Platosys code is licensed under the GPL.
- */
-
-package uk.co.platosys.enigma;
-
-import java.io.File;
-import org.bouncycastle.openpgp.PGPSecretKey;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import uk.co.platosys.util.PlatosysProperties;
-import static org.junit.Assert.*;
-
-/**
- *
- * @author edward
- */
-public class KeyTest {
- Key key;
- public KeyTest() {
- }
-
- @BeforeClass
- public static void setUpClass() throws Exception {
- }
-
- @AfterClass
- public static void tearDownClass() throws Exception {
- }
-
- @Before
- public void setUp() {
-
- key = new Key(new File(new
File(PlatosysProperties.readProperty("enigma", "test.keys.directory")),
PlatosysProperties.readProperty("enigma", "ring.secret")));
- }
-
- @After
- public void tearDown() {
- }
-
- /**
- * Test of getSigningKey method, of class Key.
- */
- @Test
- public void testGetSigningKey() {
- System.out.println("getSigningKey");
- assertNotNull(key.getSigningKey());
- // TODO review the generated test code and remove the default call
to fail.
- //fail("The test case is a prototype.");
- }
-
-
-
-}
\ No newline at end of file
Index: enigma/test/uk/co/platosys/enigma/enigmaSuite.java
===================================================================
--- enigma/test/uk/co/platosys/enigma/enigmaSuite.java (revision 3)
+++ enigma/test/uk/co/platosys/enigma/enigmaSuite.java (revision 4)
@@ -1,39 +0,0 @@
-/*
- * Copyright Edward Barrow and Platosys.
- * Most Platosys code is licensed under the GPL.
- */
-
-package uk.co.platosys.enigma;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- *
- * @author edward
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({uk.co.platosys.enigma.KeyTest.class,uk.co.platosys.enigma.LockSetTest.class,uk.co.platosys.enigma.LockStoreTest.class,uk.co.platosys.enigma.KidneyTest.class})
-public class enigmaSuite {
-
- @BeforeClass
- public static void setUpClass() throws Exception {
- }
-
- @AfterClass
- public static void tearDownClass() throws Exception {
- }
-
- @Before
- public void setUp() throws Exception {
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
-}
\ No newline at end of file
Index: enigma/test/uk/co/platosys/enigma/LockStoreTest.java
===================================================================
--- enigma/test/uk/co/platosys/enigma/LockStoreTest.java (revision 3)
+++ enigma/test/uk/co/platosys/enigma/LockStoreTest.java (revision 4)
@@ -40,7 +40,8 @@
LockSet lockSet2 = LockSmith.createLockSet(testKeysDirectory,
userid2, passPhrase);
lock1 = lockSet1.getLock();
lock2 = lockSet2.getLock();
-
+ testid1=lock1.getLockID();
+ testid2=lock2.getLockID();
EnigmaStore store;
store = new EnigmaStore(lock1);
store.setFile(storeFile);
@@ -118,8 +119,7 @@
System.out.println("addLock");
boolean expResult = true;
- System.out.println("add Lock2 "+lock2.getLockID());
-
+ System.out.println("add Lock2 "+Kidney.toString(testid2));
boolean result = lockStore.addLock(lock2);
assertEquals(expResult, result);
@@ -130,9 +130,12 @@
*/
@Test
public void testGetLock_long() {
- System.out.println("getLock");
+ System.out.println("getLock "+Kidney.toString(testid1));
assertNotNull(lockStore.getLock(testid1));
+ System.out.println("getLock "+Kidney.toString(testid2));
+
+
assertNotNull(lockStore.getLock(testid2));
}
@@ -155,12 +158,16 @@
*/
@Test
public void testGetLock_String() {
- System.out.println("getLock");
+ System.out.println("getLock " +userid1);
- assertNotNull(lockStore.getLock(userid1));
- assertNotNull(lockStore.getLock(userid2));
- // TODO review the generated test code and remove the default call
to fail.
- //fail("The test case is a prototype.");
+ Lock lock =lockStore.getLock(userid1);
+ assertTrue(lock.getLockID()==testid1);
+
+ System.out.println("getLock " +userid2);
+
+ lock=lockStore.getLock(userid2);
+ assertTrue(lock.getLockID()==testid2);
+
}
}
\ No newline at end of file
Index: enigma/test/uk/co/platosys/enigma/SignVerifyTest.java
===================================================================
--- enigma/test/uk/co/platosys/enigma/SignVerifyTest.java (revision 3)
+++ enigma/test/uk/co/platosys/enigma/SignVerifyTest.java (revision 4)
@@ -6,8 +6,7 @@
package uk.co.platosys.enigma;
import java.io.File;
-import java.util.Iterator;
-import java.util.List;
+import java.util.Set;
import org.jdom.Document;
import org.jdom.Element;
import org.junit.After;
@@ -16,7 +15,6 @@
import org.junit.BeforeClass;
import org.junit.Test;
import uk.co.platosys.util.DocMan;
-import uk.co.platosys.util.ISODate;
import uk.co.platosys.util.Logger;
import uk.co.platosys.util.PlatosysProperties;
import static org.junit.Assert.*;
@@ -73,33 +71,15 @@
public void tearDown() {
}
- // TODO add test methods here.
- // The methods must be annotated with annotation @Test. For example:
- //
- // @Test
- // public void hello() {}
+
@Test
public void elementSignTest(){
System.out.println("ElementSignTest");
Element testElement =
clearDocument.getRootElement().getChild("testelement");
- Enigma.sign(testElement, key, passphrase);
- long keyID = key.getKeyID();
- long testID=0;
- List<Element> signedByElements = testElement.getChildren("SignedBy",
Enigma.ENIGMA_NAMESPACE);
- System.out.println(signedByElements.size());
-
- Iterator<Element> it = signedByElements.iterator();
-
- while (it.hasNext()){
- Element signedByElement= it.next();
- String signingkeyid = signedByElement.getAttributeValue("KeyID");
- long signingKeyID = Kidney.toLong(signingkeyid);
- if (signingKeyID==keyID){
- testID=signingKeyID;
- }
-
- }
- assertTrue(testID==keyID);
+ System.out.println("test element
namattr:="+testElement.getAttributeValue("name"));
+ testElement=key.sign(testElement, passphrase);
+ DocMan.write(clearSignedFile, clearDocument);
+
System.out.println("testID ok");
Element signatureElement = (testElement.getChild("Signature",
Enigma.SIGNATURE_NAMESPACE));
@@ -115,49 +95,18 @@
assertNotNull(signatureValueElement.getText());
- //DocMan.write(clearSignedFile, clearDocument);
+
try{
Element signedByElement=null;
- testElement = Enigma.verify(testElement, lockStore);
+ Set<Lock> signors = lockStore.verify(testElement);
DocMan.write(clearSignedFile, clearDocument);
+ assertTrue(signors.size()>0);
- signedByElements = testElement.getChildren("SignedBy",
Enigma.ENIGMA_NAMESPACE);
- System.out.println(signedByElements.size());
- it = signedByElements.iterator();
-
- while (it.hasNext()){
- Element signedbyElement= it.next();
- String signingkeyid =
signedbyElement.getAttributeValue("KeyID");
- long signingKeyID = Kidney.toLong(signingkeyid);
- if (signingKeyID==keyID){
- testID=signingKeyID;
- signedByElement=signedbyElement;
- }
- assertNotNull(signedByElement);
- System.out.println("signedByElement ok");
- List verificationElements =
signedByElement.getChildren("Verification",Enigma.ENIGMA_NAMESPACE);
- it=verificationElements.iterator();
- Element verificationElement=null;
- while (it.hasNext()){
- Element test = it.next();
- if
((test.getAttributeValue("agent")).equals(Kidney.toString(lockStore.getStoreID()))){
- verificationElement=testElement;
- }
- }
- assertNotNull(verificationElement);
- System.out.println("verificationElement ok");
- ISODate isoDate = new
ISODate(verificationElement.getAttributeValue("passed"));
- ISODate now = new ISODate();
- assertTrue(isoDate.before(now));
- System.out.println("passed attribute ok");
-
- }
- }catch(Exception uae){
- debugLogger.log("error", uae);
-
+ }catch(Exception e){
+ debugLogger.log("error", e);
}
- }
+}
}
\ No newline at end of file
Index: enigma/test/uk/co/platosys/enigma/EnigmaSuite.java
===================================================================
--- enigma/test/uk/co/platosys/enigma/EnigmaSuite.java (revision 0)
+++ enigma/test/uk/co/platosys/enigma/EnigmaSuite.java (revision 4)
@@ -0,0 +1,48 @@
+/*
+ * Copyright Edward Barrow and Platosys.
+ * This software is licensed under the Free Software Foundation's
+General Public Licence, version 2 ("the GPL").
+The full terms of the licence can be found online at http://www.fsf.org/
+
+In brief, you are free to copy and to modify the code in any way you wish,
but if you
+publish the modified code you may only do so under the GPL, and (if asked)
you must
+ supply a copy of the source code alongside any compiled code.
+
+Platosys software can also be licensed on negotiated terms if the GPL is
inappropriate.
+For further information about this, please contact
software.licensing@platosys.co.uk
+ */
+
+package uk.co.platosys.enigma;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ *
+ * @author edward
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({uk.co.platosys.enigma.SignVerifyTest.class,uk.co.platosys.enigma.LockTest.class,uk.co.platosys.enigma.CryptDecryptTest.class,uk.co.platosys.enigma.LockSetTest.class,uk.co.platosys.enigma.LockStoreTest.class,uk.co.platosys.enigma.KidneyTest.class})
+public class EnigmaSuite {
+
+ @BeforeClass
+ public static void setUpClass() throws Exception {
+ }
+
+ @AfterClass
+ public static void tearDownClass() throws Exception {
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ }
+
+}
\ No newline at end of file
Index: enigma/test/uk/co/platosys/enigma/CryptDecryptTest.java
===================================================================
--- enigma/test/uk/co/platosys/enigma/CryptDecryptTest.java (revision 3)
+++ enigma/test/uk/co/platosys/enigma/CryptDecryptTest.java (revision 4)
@@ -78,7 +78,7 @@
System.out.println("ElementCryptTest");
Element testElement =
clearDocument.getRootElement().getChild("testelement");
String testDigest = DigestEngine.digest(testElement);
- Element cryptElement=Enigma.lock(testElement, lock, true );
+ Element cryptElement=lock.lock(testElement);
Document cipherDocument = cryptElement.getDocument();
DocMan.write(cipherFile, cipherDocument);
cipherDocument=DocMan.build(cipherFile);
@@ -91,7 +91,7 @@
while(itel.hasNext()){
Element encryptedElement=itel.next();
try{
- clearElement = Enigma.unlock(encryptedElement, key,
passphrase);
+ clearElement = key.unlock(encryptedElement, passphrase);
}catch(Exception e){
}
Index: enigma/test/cryptFile.xml
===================================================================
--- enigma/test/cryptFile.xml (revision 3)
+++ enigma/test/cryptFile.xml (revision 4)
@@ -13,7 +13,7 @@
<test>England expects that every man will do his duty</test>
<xenc:EncryptedData xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
<xenc:CipherData>
-
<xenc:CipherValue>hI4DioeKmVuP7moQAf48tTGXzDHS0wkPNv2SLgH8J8aQBAc02cO1ZJWwwMescAPIp7tcn4E6X6CQjm1+YAK73YQY58bOG/loKV9P3n65Af925YGsaFb2z9IndeBDjGiqAJUTjJt6oIZZP9j8nN1T2qpMwDJHx9J25etnB8VvKJdMqYJr1BkkVF7p3GQJhhD/0pQBzZJu3JdaTViVZDOsAJYsSnXf7RhlJJ6Vv2wMCXlxXsaabEN3LsiNIsbxL5QTpzyx93tjwFZwV4ZWSZopkOopU9PdPsq3q4TL75KOlzUVPpH9KgnsGYNA+Tuphan0Cpj2LOL22FXM07khHyqRMNb18HNi+nfieg8u/KCd9K8DuyzsB2TBT6wjiQD8z1bCB0PbL1PM</xenc:CipherValue>
+
<xenc:CipherValue>hI4DnE4Zrl58Jw0QAf4r0ZS4bpQJT6LErSlzlIQTj0BflIBTzlpFTTnXa2WdoCoqJE7zhtzB2MiFn1VrgektqPAU5svjRfZUkOrT2E24AfwKMpxtMzmPdZV8Ravk+xoXosxUJJ1Z5e68BXk1gIUvvGnTrr6PmjMWx7z6iIVNhBL+LA6QzscSYSV96kdhVoVP0pQBO1KYDPJfMgLzgc+dZhZJzL2pWodK4lnmL9/ifwkCf9egn/0xBf4o/iN4xDJG38jDiYnE4X5F+pSzD51vfxWI3OGNJfSyqLJOkq+oNOcpFiBKpFCmcZC4LdWE3+3uA/+lqy6WvYNT6atLd0m7bfcF9fRyzuonbtGSfNsqq593dimj8Rj4i40DhmzxrcSeHKYrPweX</xenc:CipherValue>
</xenc:CipherData>
</xenc:EncryptedData>
</root>
Index: enigma/test/storetest.asc
===================================================================
--- enigma/test/storetest.asc (revision 3)
+++ enigma/test/storetest.asc (revision 4)
@@ -1,22 +1,22 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: BCPG v1.43
-mQGiBEqtP6QRBAD7W1MXLxPXWsOnEo16mBaEJ2e96Z2pFnTm1kAEw+oY0t/Kxo1A
-wCtJdvsSQETGTjYz9imnQxNLlI6ASHeHC3CZ5Yu9ahlWiK5jujAMMb3AJ8l+pwQx
-TVcj7kQ2bqnaeb2DOxs4Hwa3zKnhjYMrNpQZtPSBDPDRFY+ZyVFGGzg4PQCg0Z5T
-fLJO2AftvnXEdswNdVAEFasD/iKJP0bIenPIm131vTmRqjYlaeHM6VzoqVDO+qGG
-Z/yey9Cg/Umg6hiO8cCoPfm7nWWuYF07O1OXrP5718WfSngIJ3VDiEa2wYqatz4h
-M0rxaU/P6zoPHaxoKC4rUSCjDCxqLxUeifra84u+RZlTnR1fmaAKBbM+oI0qJzYa
-ke0vA/9sSXVCMlLpaOD8+KfDLAAMmNR2AEhmTTDWIcOdQ6x+u6aXKMdH0fJ/z14t
-hKzk7KjOK0FmjBUe6seaPczZXH60ViL9LH03kddq9PSZRr5ICS6gxtCbvnZAyAZR
-Y8FMxpou2qslP45DO4SFm/aAjfCAhbXhQBdKhJE++YL1qxqYmbQKc3RvcmV0ZXN0
-MYhGBBMRAgAGBQJKrT+kAAoJEFkb4H3+u7o8k2oAoL42dFYzPQlfzNtygM9uPRgn
-/mNqAJ0RqLK09atNYWseNBGb85q5dL5e0LjLBEqtP6QQAgCUlP7AlfO4XuKGVCs4
+mQGiBEqx4Z8RBAC3a+w7Xd7fmWMWCv9bqvDK5jOJLC0mytMzeLt3SSikFfL6TpLn
+tGKQZF4C03UIHVcu/qX1H1Ly7X3EWRuih9uSkMvoZpw3UpyeN3ktkUT5pT46HbF4
+joZXTPZS3AiOmfzKDxDAQaYvT7DCUUaaLaJrRtja7XhSUZBk9EgFaHxFSwCg1tJc
+7L0HFg8YtwgLbxjF4RMhjRsD/jX4p8gx/nMTNigJ0hXeQMng+QS3hcLoNgD/qZHn
+GwINWA/c9Zt5wTqsUsbB9/qtksoBA+uWT3FByTiVCivLHQyVBr1MlSZPL1XS7D/+
+iIbwVYDJJpKSApTqvqQ9/2aQ0+cFWtHbZfK3p6jjcrYzzU5+eHZlQ8vAhHyk1S9J
+MkQOA/wKbleWGTHUcxekXZG2oK/xkk5dIsONAHsce88QO9b/0hRRsFpYRW6mDNW4
+cR7x607fiGktTekUy/X8b/8dSL3hPf12bWpCHmJWCc7A8Gga+xLDmaZ5aYA0ri8H
+cqGFVIjOaPx6AgJ/uz2Vj4td5zEH4PBNdnnW8hgd1IyTc2MAY7QKc3RvcmV0ZXN0
+MYhGBBMRAgAGBQJKseGfAAoJEL7whr0PP2Fxn4kAn0+Swg5wMJl7QoeiK9B2Nd+A
+1QwUAJ9GIMbN7U4/A0IkslASLfIVaeHtobjMBEqx4Z8QAgCUlP7AlfO4XuKGVCs4
NvyBpd0KA0m0wjndOHRNSIz44x24vLfTO0GrueWjPMqRRLHO8zLJS/BXO/BHo6yp
jN87Af0VPV1hcq20MEW2iujh3hBwthNwBWhtKdPXOndJGZaB7lshLJuWv9z6WyDN
-Xj/SBEiV1gnPm0ELeg8Syhy5pCjMAfjlXFACpWjqGRtD/6cY9l7qc3aW/HVJNgZu
-tmUAH4FxgE/JTfjCTvVYBsfWLZD5l8zq7YX8wOO04UUg/DyrQGWIRgQYEQIABgUC
-Sq0/pQAKCRBZG+B9/ru6PDCCAKDQd1xhjxJOQddr8tlRc6gGsE9RBgCffEdiIbKw
-n4xksBXqji8lUKQhU4U=
-=b1Nf
+Xj/SBEiV1gnPm0ELeg8Syhy5pCjMAf0eLhtMS7HVZxq4mVCLDSF+Nl99yz7nVb+N
+x/omykUCCxmNK81r25QSAwi7CE9UblCPrzoWFOzDMJpcLbQcyZnEiEYEGBECAAYF
+Akqx4Z8ACgkQvvCGvQ8/YXG+/wCfXtCth68FmY/mhzFUkCnnHTGph5IAn2PGZuyg
+tHAfpANfiaGIEu3RSPmq
+=aO3W
-----END PGP PUBLIC KEY BLOCK-----
Index: enigma/test/store.enigma
===================================================================
--- enigma/test/store.enigma (revision 3)
+++ enigma/test/store.enigma (revision 4)
@@ -1,38 +1,38 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: BCPG v1.43
-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
+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
-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
-41uKdE10WACePbKQn121zDBtXob0MfY6sNb+EOk=
-=5yJ7
+Xj/SBEiV1gnPm0ELeg8Syhy5pCjMAf0eLhtMS7HVZxq4mVCLDSF+Nl99yz7nVb+N
+x/omykUCCxmNK81r25QSAwi7CE9UblCPrzoWFOzDMJpcLbQcyZnEiEYEGBECAAYF
+Akqx4Z8ACgkQvvCGvQ8/YXG+/wCfXtCth68FmY/mhzFUkCnnHTGph5IAn2PGZuyg
+tHAfpANfiaGIEu3RSPmqmQGiBEqx4aURBAC4vBdbfYEbC3i4LpZlz80bXcGA37LG
+CW8D3GjWVm/3uvVPcyHIocVYo5kPCuoRAuY4Tpo4JduRkhd25ilqlU5T6frEzcdX
+hZS6psNQFx90HmfWS2iXhl1+cKtrXW6QOoRZmSEwM7MjYp0PTw0zuNl2JCptra+I
+VN5bdrdqfAZTfwCg9v6vW0oFwHEjcQrkwmlgLRbwNhED/1jNcHzEB5WGoV3CjZai
+xdrRWJ1rjU9zGm3POSOIxp9YfF7NHxb9+TK6bvmQBQVSVYHsHrHZlmQOUIsuMhmj
+HhlEX8lRyGPW20at7ae4HZSD0lvilp1QvF9PhXUmSpQBvc8QLmEPNoMKUZ/e5fhr
+KRCAmYVge3uIX3Jm7I70xnCCA/4rtKak2/3gZ7Z9/foGa1t9ZW76AtKSWZaMU+/k
+zou3yVmTgZCj3QmZtuB5X4eW7MKJ7WYUOSJA5WYLIuj/XRqgPy69KtEB8UCvBJBE
+9KL4sUoK79QAznr+c0xatvX/ZE+C3SUVhODmFlEbjh6Ml1bpN/1uWj8pmTrYAf84
+ahz5RrQKc3RvcmV0ZXN0MohGBBMRAgAGBQJKseGlAAoJED2okTsgCMapd5AAmQEG
+wWCUdICyYFyGLiXzQdF3zAxCAJ4pGyiKmkU77Pfjl2vGtEwTT/vOwbjMBEqx4aUQ
+AgCUlP7AlfO4XuKGVCs4NvyBpd0KA0m0wjndOHRNSIz44x24vLfTO0GrueWjPMqR
+RLHO8zLJS/BXO/BHo6ypjN87Af0VPV1hcq20MEW2iujh3hBwthNwBWhtKdPXOndJ
+GZaB7lshLJuWv9z6WyDNXj/SBEiV1gnPm0ELeg8Syhy5pCjMAf9Ou7JxjtPS1Tyx
+yHs12oD/mVZeMFsLcTKzOq2Rx1PjOIQaRfHxgDspllZuqD7ncvNau3gr7rjh+hcW
+kPhUx411iEYEGBECAAYFAkqx4aUACgkQPaiROyAIxqnEdgCg51NSR1c3TCZkmoym
+oZwW50PUYBgAnRIzrFKWRie0uitjsboR2Kfjronw
+=p6eE
-----END PGP PUBLIC KEY BLOCK-----
Index: enigma/test/storetest1/secring.asc
===================================================================
--- enigma/test/storetest1/secring.asc (revision 3)
+++ enigma/test/storetest1/secring.asc (revision 4)
@@ -1,25 +1,25 @@
-----BEGIN PGP PRIVATE KEY BLOCK-----
Version: BCPG v1.43
-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
+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
-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
-AJ9DTfCcebM9GaxEg+OfvHxNRcTboA==
-=zLcW
+v9z6WyDNXj/SBEiV1gnPm0ELeg8Syhy5pCjMAf0eLhtMS7HVZxq4mVCLDSF+Nl99
+yz7nVb+Nx/omykUCCxmNK81r25QSAwi7CE9UblCPrzoWFOzDMJpcLbQcyZnE/wkD
+AmCyBvj22RA6YCfR4kJ/o3+KLOKvK8v9gKt/lgMsourOwIi+AA4mxzL8CVPDw0Pu
+C37fs2oF3ljPnu5HmbiI5N0CCikqGb75r2H5TpHcZsypTYRo81RggqVAhJOAUohG
+BBgRAgAGBQJKseGfAAoJEL7whr0PP2Fxvv8An17QrYevBZmP5ocxVJAp5x0xqYeS
+AJ9jxmbsoLRwH6QDX4mhiBLt0Uj5qg==
+=sinN
-----END PGP PRIVATE KEY BLOCK-----
Index: enigma/test/storetest1/seedring.asc
===================================================================
--- enigma/test/storetest1/seedring.asc (revision 3)
+++ enigma/test/storetest1/seedring.asc (revision 4)
@@ -1,22 +1,22 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: BCPG v1.43
-mQGiBEqHBMkRBADeMQy/3muHaWwdGDvE4WPjoTzadztqmgwE2eTsYie7uZ2viN4F
-+NDb7XJsEx2BR7nIGBB+ARVoA1LCQKHRadqvyLuLGtWq2JvSXjbl1QPJd5guYdAI
-Rj6wla9goJ9vye6bgrO3J1gMnpJWzs6I5iQdZrdYOccLps43VANw0GMCKwCg3uYR
-KCTJp5+H62sWtAO/OYyCs2cD/3nStnNyVM4XlaI2ht4EyHA6sSuFlCT2w1qt9ouz
-7p02TcSDJZGYpEaHfPBwUHxYIrQGy/9z3LzKn2GboLOh3YN4zRu3EVa109vOpeAm
-sIinayS93KyVZK1HRSacdCxqznN2fLBrV6IlB0pxi8cOX/FkNEtwfiJOyKDwfl3W
-QuZoA/4ncq/o1CdPp/qQ1RBzgz7IEYTnbr2MrpVD3nPAYw8dD+8gn0jpO3Hq+B/r
-MkvHP4gyWzDaTKpyXuO3osH6GJWuItzOxcNgeSmfijgxSxfVcSLsUQwIhdD0CXht
-6908MAFAQAW/mFjcevaoU7M2EzokVtrmW55ktzwJfQ2d2RdNurQKc3RvcmV0ZXN0
-MYhGBBMRAgAGBQJKhwTJAAoJEL+HVvqi2/9Mbl0AoNiDAutrdjr1C6ih6OkLmea2
-zqXYAKCPjbGnE5lRx1+eYmJOChEwlRdPSbjMBEqHBMkQAgCUlP7AlfO4XuKGVCs4
+mQGiBEqx4Z8RBAC3a+w7Xd7fmWMWCv9bqvDK5jOJLC0mytMzeLt3SSikFfL6TpLn
+tGKQZF4C03UIHVcu/qX1H1Ly7X3EWRuih9uSkMvoZpw3UpyeN3ktkUT5pT46HbF4
+joZXTPZS3AiOmfzKDxDAQaYvT7DCUUaaLaJrRtja7XhSUZBk9EgFaHxFSwCg1tJc
+7L0HFg8YtwgLbxjF4RMhjRsD/jX4p8gx/nMTNigJ0hXeQMng+QS3hcLoNgD/qZHn
+GwINWA/c9Zt5wTqsUsbB9/qtksoBA+uWT3FByTiVCivLHQyVBr1MlSZPL1XS7D/+
+iIbwVYDJJpKSApTqvqQ9/2aQ0+cFWtHbZfK3p6jjcrYzzU5+eHZlQ8vAhHyk1S9J
+MkQOA/wKbleWGTHUcxekXZG2oK/xkk5dIsONAHsce88QO9b/0hRRsFpYRW6mDNW4
+cR7x607fiGktTekUy/X8b/8dSL3hPf12bWpCHmJWCc7A8Gga+xLDmaZ5aYA0ri8H
+cqGFVIjOaPx6AgJ/uz2Vj4td5zEH4PBNdnnW8hgd1IyTc2MAY7QKc3RvcmV0ZXN0
+MYhGBBMRAgAGBQJKseGfAAoJEL7whr0PP2Fxn4kAn0+Swg5wMJl7QoeiK9B2Nd+A
+1QwUAJ9GIMbN7U4/A0IkslASLfIVaeHtobjMBEqx4Z8QAgCUlP7AlfO4XuKGVCs4
NvyBpd0KA0m0wjndOHRNSIz44x24vLfTO0GrueWjPMqRRLHO8zLJS/BXO/BHo6yp
jN87Af0VPV1hcq20MEW2iujh3hBwthNwBWhtKdPXOndJGZaB7lshLJuWv9z6WyDN
-Xj/SBEiV1gnPm0ELeg8Syhy5pCjMAf4mTB0IU+h7i9wb7OH0ODFmk47UMdfZLm+u
-Ro9Wyag9hHYC+qZnV6S1pSzjB4WczoORxI7m5vxxXroe+tQ0b3pXiEYEGBECAAYF
-AkqHBMsACgkQv4dW+qLb/0yV8gCgjd84F8jPPWH1hku79NQnQYKLk8sAn0NN8Jx5
-sz0ZrESD45+8fE1FxNug
-=Okqz
+Xj/SBEiV1gnPm0ELeg8Syhy5pCjMAf0eLhtMS7HVZxq4mVCLDSF+Nl99yz7nVb+N
+x/omykUCCxmNK81r25QSAwi7CE9UblCPrzoWFOzDMJpcLbQcyZnEiEYEGBECAAYF
+Akqx4Z8ACgkQvvCGvQ8/YXG+/wCfXtCth68FmY/mhzFUkCnnHTGph5IAn2PGZuyg
+tHAfpANfiaGIEu3RSPmq
+=aO3W
-----END PGP PUBLIC KEY BLOCK-----
Index: enigma/test/storetest1/pubring.asc
===================================================================
--- enigma/test/storetest1/pubring.asc (revision 3)
+++ enigma/test/storetest1/pubring.asc (revision 4)
@@ -1,22 +1,22 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: BCPG v1.43
-mQGiBEqHBMkRBADeMQy/3muHaWwdGDvE4WPjoTzadztqmgwE2eTsYie7uZ2viN4F
-+NDb7XJsEx2BR7nIGBB+ARVoA1LCQKHRadqvyLuLGtWq2JvSXjbl1QPJd5guYdAI
-Rj6wla9goJ9vye6bgrO3J1gMnpJWzs6I5iQdZrdYOccLps43VANw0GMCKwCg3uYR
-KCTJp5+H62sWtAO/OYyCs2cD/3nStnNyVM4XlaI2ht4EyHA6sSuFlCT2w1qt9ouz
-7p02TcSDJZGYpEaHfPBwUHxYIrQGy/9z3LzKn2GboLOh3YN4zRu3EVa109vOpeAm
-sIinayS93KyVZK1HRSacdCxqznN2fLBrV6IlB0pxi8cOX/FkNEtwfiJOyKDwfl3W
-QuZoA/4ncq/o1CdPp/qQ1RBzgz7IEYTnbr2MrpVD3nPAYw8dD+8gn0jpO3Hq+B/r
-MkvHP4gyWzDaTKpyXuO3osH6GJWuItzOxcNgeSmfijgxSxfVcSLsUQwIhdD0CXht
-6908MAFAQAW/mFjcevaoU7M2EzokVtrmW55ktzwJfQ2d2RdNurQKc3RvcmV0ZXN0
-MYhGBBMRAgAGBQJKhwTJAAoJEL+HVvqi2/9Mbl0AoNiDAutrdjr1C6ih6OkLmea2
-zqXYAKCPjbGnE5lRx1+eYmJOChEwlRdPSbjMBEqHBMkQAgCUlP7AlfO4XuKGVCs4
+mQGiBEqx4Z8RBAC3a+w7Xd7fmWMWCv9bqvDK5jOJLC0mytMzeLt3SSikFfL6TpLn
+tGKQZF4C03UIHVcu/qX1H1Ly7X3EWRuih9uSkMvoZpw3UpyeN3ktkUT5pT46HbF4
+joZXTPZS3AiOmfzKDxDAQaYvT7DCUUaaLaJrRtja7XhSUZBk9EgFaHxFSwCg1tJc
+7L0HFg8YtwgLbxjF4RMhjRsD/jX4p8gx/nMTNigJ0hXeQMng+QS3hcLoNgD/qZHn
+GwINWA/c9Zt5wTqsUsbB9/qtksoBA+uWT3FByTiVCivLHQyVBr1MlSZPL1XS7D/+
+iIbwVYDJJpKSApTqvqQ9/2aQ0+cFWtHbZfK3p6jjcrYzzU5+eHZlQ8vAhHyk1S9J
+MkQOA/wKbleWGTHUcxekXZG2oK/xkk5dIsONAHsce88QO9b/0hRRsFpYRW6mDNW4
+cR7x607fiGktTekUy/X8b/8dSL3hPf12bWpCHmJWCc7A8Gga+xLDmaZ5aYA0ri8H
+cqGFVIjOaPx6AgJ/uz2Vj4td5zEH4PBNdnnW8hgd1IyTc2MAY7QKc3RvcmV0ZXN0
+MYhGBBMRAgAGBQJKseGfAAoJEL7whr0PP2Fxn4kAn0+Swg5wMJl7QoeiK9B2Nd+A
+1QwUAJ9GIMbN7U4/A0IkslASLfIVaeHtobjMBEqx4Z8QAgCUlP7AlfO4XuKGVCs4
NvyBpd0KA0m0wjndOHRNSIz44x24vLfTO0GrueWjPMqRRLHO8zLJS/BXO/BHo6yp
jN87Af0VPV1hcq20MEW2iujh3hBwthNwBWhtKdPXOndJGZaB7lshLJuWv9z6WyDN
-Xj/SBEiV1gnPm0ELeg8Syhy5pCjMAf4mTB0IU+h7i9wb7OH0ODFmk47UMdfZLm+u
-Ro9Wyag9hHYC+qZnV6S1pSzjB4WczoORxI7m5vxxXroe+tQ0b3pXiEYEGBECAAYF
-AkqHBMsACgkQv4dW+qLb/0yV8gCgjd84F8jPPWH1hku79NQnQYKLk8sAn0NN8Jx5
-sz0ZrESD45+8fE1FxNug
-=Okqz
+Xj/SBEiV1gnPm0ELeg8Syhy5pCjMAf0eLhtMS7HVZxq4mVCLDSF+Nl99yz7nVb+N
+x/omykUCCxmNK81r25QSAwi7CE9UblCPrzoWFOzDMJpcLbQcyZnEiEYEGBECAAYF
+Akqx4Z8ACgkQvvCGvQ8/YXG+/wCfXtCth68FmY/mhzFUkCnnHTGph5IAn2PGZuyg
+tHAfpANfiaGIEu3RSPmq
+=aO3W
-----END PGP PUBLIC KEY BLOCK-----
Index: enigma/test/storetest2/secring.asc
===================================================================
--- enigma/test/storetest2/secring.asc (revision 3)
+++ enigma/test/storetest2/secring.asc (revision 4)
@@ -1,25 +1,25 @@
-----BEGIN PGP PRIVATE KEY BLOCK-----
Version: BCPG v1.43
-lQHXBEqHBMwRBADgWO4vJUleWQYKKr1Q0qjdYgJ0kP/l4pnO7Izjk2KSM2jVsrhp
-JE86D2C2EVN+k/nVwxRs4L8PBs20A6/v1ok8oBYyBqQQ+PBl3bUP1ny1hSeM9Lps
-u4KBwumLBWEPRD/GImy1YFraEVSHo6VQxztVvJ+wyHs4djgPk8UeyZD3QwCg5Za6
-bs0xTr1E29Sh3sLo9Mu6HhUD/1bmrzqtTBpa67cqK1dSbbT+DAyhVc2bJjd9+tOg
-t5zvHhajV4Bp7LjzapZ9PyZt8U01nEzoxhISvBK2f7xe6kDLiBE0HlVdQCg/EOCV
-qAGty2EkmPLqJDPDGUbMrP5ejbhvvGj3H
[truncated due to length]
|
[enigma~subversion:4] ongoing updates |
ejoftheweb | 03/26/2010 |
