[Neuclear-develop] neuclear-id neuclear.iws,1.5,1.6

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/neuclear/neuclear-id
In directory sc8-pr-cvs1:/tmp/cvs-serv14496

Modified Files:
	neuclear.iws 
Log Message:
KeyInfo containing X509Certificates now work correctly.
10 out of 16 of merlin's tests now work. The missing ones are largely due to key resolution issues. (Read X509)

Index: neuclear.iws
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/neuclear.iws,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** neuclear.iws	14 Jan 2004 16:34:13 -0000	1.5
--- neuclear.iws	14 Jan 2004 17:07:52 -0000	1.6
***************
*** 67,71 ****
      <option name="SHOW_CHECKIN_OPTIONS" value="true" />
      <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
!     <option name="LAST_COMMIT_MESSAGE" value="Got rid of the verifyXXX() methods" />
      <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
      <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
--- 67,71 ----
      <option name="SHOW_CHECKIN_OPTIONS" value="true" />
      <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
!     <option name="LAST_COMMIT_MESSAGE" value="New model of references and signatures now pretty much works.&#10;I am still not 100% sure on the created enveloping signatures. I need to do more testing." />
      <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
      <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
***************
*** 107,177 ****
    </component>
    <component name="FileEditorManager" split-orientation="vertical" split-proportion="0.5">
!     <first-group selected-file="file:///home/pelleb/code/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SignatureTests.java">
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/Reference.java" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="164" column="19" selection-start="7541" selection-end="7541" vertical-scroll-proportion="0.33264032">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SignatureTests.java" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="129" column="39" selection-start="6113" selection-end="6113" vertical-scroll-proportion="0.32848233">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/InvalidSignatureException.java" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="12" column="54" selection-start="332" selection-end="332" vertical-scroll-proportion="0.3326613">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/KeyInfo.java" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="142" column="42" selection-start="5543" selection-end="5543" vertical-scroll-proportion="0.5301455">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/crypto/keyresolvers/KeyResolverFactory.java" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="58" column="85" selection-start="2161" selection-end="2161" vertical-scroll-proportion="0.9072581">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/crypto/keyresolvers/NullResolver.java" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="12" column="75" selection-start="331" selection-end="331" vertical-scroll-proportion="0.30241936">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/SignatureInfo.java" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="100" column="19" selection-start="4960" selection-end="4960" vertical-scroll-proportion="-2.2141373">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SimpleXMLSigTest.java" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="127" column="45" selection-start="6220" selection-end="6220" vertical-scroll-proportion="0.5301455">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSignature.java" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="213" column="11" selection-start="10521" selection-end="10521" vertical-scroll-proportion="0.33264032">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSecTools.java" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="335" column="54" selection-start="15012" selection-end="15012" vertical-scroll-proportion="0.48856547">
              <folding />
            </state>
--- 107,177 ----
    </component>
    <component name="FileEditorManager" split-orientation="vertical" split-proportion="0.5">
!     <first-group selected-file="file:///home/pelleb/code/neuclear-xmlsig/src/testdata/merlin-xmldsig-twenty-three/signature-retrievalmethod-rawx509crt.xml">
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/testdata/merlin-xmldsig-twenty-three/Readme.txt" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.9979839">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/testdata/merlin-xmldsig-twenty-three/signature-retrievalmethod-rawx509crt.xml" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/testdata/merlin-xmldsig-twenty-three/signature-x509-crt-crl.xml" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/testdata/merlin-xmldsig-twenty-three/signature-x509-crt.xml" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="29" column="38" selection-start="1644" selection-end="1644" vertical-scroll-proportion="0.5141129">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SignatureTests.java" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="149" column="0" selection-start="7055" selection-end="7055" vertical-scroll-proportion="0.45322245">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/KeyInfo.java" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="153" column="112" selection-start="6181" selection-end="6181" vertical-scroll-proportion="0.51975054">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/crypto/keyresolvers/KeyResolverFactory.java" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="44" column="6" selection-start="1673" selection-end="1673" vertical-scroll-proportion="0.09072581">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/testdata/merlin-xmldsig-twenty-three/signature-x509-ski.xml" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/testdata/merlin-xmldsig-twenty-three/signature-x509-sn.xml" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
              <folding />
            </state>
          </provider>
        </entry>
!       <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSignature.java" pinned="false">
          <provider selected="true" editor-type-id="text-editor">
!           <state line="213" column="11" selection-start="10521" selection-end="10521" vertical-scroll-proportion="0.23908524">
              <folding />
            </state>
***************
*** 198,209 ****
--- 198,212 ----
      <expanded_node url="file://$PROJECT_DIR$/src/schemas" module="neuclear" type="directory" />
      <expanded_node url="file:///home/pelleb/code/neuclear-pay/src" module="neuclear-pay" type="directory" />
+     <expanded_node url="file:///home/pelleb/code/neuclear-xmlsig/src/testdata/merlin-xmldsig-twenty-three" module="NeuClear XMLSig" type="directory" />
      <expanded_node url="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml" module="NeuClear XMLSig" type="directory" />
      <expanded_node url="file:///home/pelleb/code/neuclear-xmlsig/src/test" module="NeuClear XMLSig" type="directory" />
      <expanded_node url="file:///home/pelleb/code/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec" module="NeuClear XMLSig" type="directory" />
      <expanded_node url="file://$PROJECT_DIR$/src" module="neuclear" type="directory" />
+     <expanded_node url="file:///home/pelleb/code/neuclear-xmlsig/src/testdata/merlin-xmldsig-twenty-three/certs" module="NeuClear XMLSig" type="directory" />
      <expanded_node url="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/crypto/keyresolvers" module="neuclear-commons" type="directory" />
      <expanded_node url="file:///home/pelleb/code/neuclear-pay" module="neuclear-pay" type="directory" />
      <expanded_node url="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset" module="neuclear-pay" type="directory" />
      <expanded_node url="file://$PROJECT_DIR$/src/java/org/neuclear/id/builders" module="neuclear" type="directory" />
+     <expanded_node url="file:///home/pelleb/code/neuclear-xmlsig/src/testdata" module="NeuClear XMLSig" type="directory" />
      <expanded_node url="file:///home/pelleb/code/neuclear-commons/src/java" module="neuclear-commons" type="directory" />
      <expanded_node url="file:///home/pelleb/code/neuclear-commons/src" module="neuclear-commons" type="directory" />
***************
*** 426,530 ****
    </component>
    <component name="editorHistoryManager">
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/SignedElement.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="223" column="93" selection-start="10718" selection-end="10718" vertical-scroll-proportion="3.8669438">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/c14/Canonicalizer.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="212" column="0" selection-start="9080" selection-end="9080" vertical-scroll-proportion="0.53638256">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/RefTest.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="57" column="26" selection-start="1974" selection-end="1974" vertical-scroll-proportion="0.38045737">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/XMLTools.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="319" column="45" selection-start="12399" selection-end="12399" vertical-scroll-proportion="1.3306452">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/QuickEmbeddedSignature.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="146" column="81" selection-start="7670" selection-end="7670" vertical-scroll-proportion="0.6611227">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/SignatureInfo.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="100" column="19" selection-start="4960" selection-end="4960" vertical-scroll-proportion="-2.2141373">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSecTools.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="335" column="54" selection-start="15012" selection-end="15012" vertical-scroll-proportion="0.48856547">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/InvalidSignatureException.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="12" column="54" selection-start="332" selection-end="332" vertical-scroll-proportion="0.3326613">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SimpleXMLSigTest.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="127" column="45" selection-start="6220" selection-end="6220" vertical-scroll-proportion="0.5301455">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSignature.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="213" column="11" selection-start="10521" selection-end="10521" vertical-scroll-proportion="0.33264032">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/Reference.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="164" column="19" selection-start="7541" selection-end="7541" vertical-scroll-proportion="0.33264032">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/crypto/keyresolvers/KeyResolverFactory.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="58" column="85" selection-start="2161" selection-end="2161" vertical-scroll-proportion="0.9072581">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/KeyInfo.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="142" column="42" selection-start="5543" selection-end="5543" vertical-scroll-proportion="0.5301455">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/crypto/keyresolvers/NullResolver.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="12" column="75" selection-start="331" selection-end="331" vertical-scroll-proportion="0.30241936">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SignatureTests.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="129" column="39" selection-start="6113" selection-end="6113" vertical-scroll-proportion="0.32848233">
            <folding />
          </state>
--- 429,533 ----
    </component>
    <component name="editorHistoryManager">
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSecTools.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="339" column="54" selection-start="15217" selection-end="15217" vertical-scroll-proportion="0.48856547">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/InvalidSignatureException.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="12" column="54" selection-start="332" selection-end="332" vertical-scroll-proportion="0.3326613">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SimpleXMLSigTest.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="127" column="45" selection-start="6220" selection-end="6220" vertical-scroll-proportion="0.5301455">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/Reference.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="156" column="49" selection-start="7146" selection-end="7146" vertical-scroll-proportion="0.23908524">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/crypto/keyresolvers/NullResolver.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="12" column="75" selection-start="331" selection-end="331" vertical-scroll-proportion="0.30241936">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SignatureTests.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="149" column="0" selection-start="7055" selection-end="7055" vertical-scroll-proportion="0.45322245">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/testdata/merlin-xmldsig-twenty-three/signature-retrievalmethod-rawx509crt.xml">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/testdata/merlin-xmldsig-twenty-three/Readme.txt">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.9979839">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/testdata/merlin-xmldsig-twenty-three/signature-x509-crt-crl.xml">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/KeyInfo.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="153" column="112" selection-start="6181" selection-end="6181" vertical-scroll-proportion="0.51975054">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/testdata/merlin-xmldsig-twenty-three/signature-x509-crt.xml">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="29" column="38" selection-start="1644" selection-end="1644" vertical-scroll-proportion="0.5141129">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSignature.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="213" column="11" selection-start="10521" selection-end="10521" vertical-scroll-proportion="0.23908524">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/testdata/merlin-xmldsig-twenty-three/signature-x509-ski.xml">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/crypto/keyresolvers/KeyResolverFactory.java">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="44" column="6" selection-start="1673" selection-end="1673" vertical-scroll-proportion="0.09072581">
            <folding />
          </state>
        </provider>
      </entry>
!     <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/testdata/merlin-xmldsig-twenty-three/signature-x509-sn.xml">
        <provider selected="true" editor-type-id="text-editor">
!         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
            <folding />
          </state>