Menu
▾
▴
[Neuclear-develop] neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec EnvelopedSignature.java,1.3,1.4 SignedElement.java,1.12,1.13 SignedInfo.java,1.8,1.9 XMLSignature.java,1.20,1.21
|
From: Pelle B. <pe...@us...> - 2004-04-12 15:14:33
|
Update of /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6806/src/java/org/neuclear/xml/xmlsec Modified Files: EnvelopedSignature.java SignedElement.java SignedInfo.java XMLSignature.java Log Message: Now have a slightly better way of handling the waiting for input using the WaitForInput class. This will later be put into a command queue for execution. Index: EnvelopedSignature.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/EnvelopedSignature.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EnvelopedSignature.java 7 Apr 2004 17:22:22 -0000 1.3 --- EnvelopedSignature.java 12 Apr 2004 15:00:42 -0000 1.4 *************** *** 53,61 **** * @param elem * @throws XMLSecurityException ! * @throws UserCancellationException ! * @throws NonExistingSignerException * @see Signer */ ! public EnvelopedSignature(BrowsableSigner signer, Element elem) throws XMLSecurityException, UserCancellationException, NonExistingSignerException { super(new SignedInfo(SignedInfo.SIG_ALG_RSA, 1)); si.setEnvelopedReference(elem); --- 53,60 ---- * @param elem * @throws XMLSecurityException ! * @throws UserCancellationException * @see Signer */ ! public EnvelopedSignature(BrowsableSigner signer, Element elem) throws XMLSecurityException, UserCancellationException { super(new SignedInfo(SignedInfo.SIG_ALG_RSA, 1)); si.setEnvelopedReference(elem); Index: SignedElement.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/SignedElement.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** SignedElement.java 19 Mar 2004 22:21:51 -0000 1.12 --- SignedElement.java 12 Apr 2004 15:00:42 -0000 1.13 *************** *** 1,4 **** --- 1,8 ---- /* $Id$ * $Log$ + * Revision 1.13 2004/04/12 15:00:42 pelle + * Now have a slightly better way of handling the waiting for input using the WaitForInput class. + * This will later be put into a command queue for execution. + * * Revision 1.12 2004/03/19 22:21:51 pelle * Changes in the XMLSignature class, which is now Abstract there are currently 3 implementations for: *************** *** 157,160 **** --- 161,165 ---- import org.dom4j.QName; import org.neuclear.commons.crypto.passphraseagents.UserCancellationException; + import org.neuclear.commons.crypto.signers.BrowsableSigner; import org.neuclear.commons.crypto.signers.NonExistingSignerException; import org.neuclear.commons.crypto.signers.Signer; *************** *** 245,247 **** --- 250,258 ---- } + public final void sign(final BrowsableSigner signer) throws XMLSecurityException, UserCancellationException { + preSign(); + sig = new EnvelopedSignature(signer, getElement()); + postSign(); + } + } Index: SignedInfo.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/SignedInfo.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SignedInfo.java 7 Apr 2004 17:22:22 -0000 1.8 --- SignedInfo.java 12 Apr 2004 15:00:42 -0000 1.9 *************** *** 1,4 **** --- 1,8 ---- /* $Id$ * $Log$ + * Revision 1.9 2004/04/12 15:00:42 pelle + * Now have a slightly better way of handling the waiting for input using the WaitForInput class. + * This will later be put into a command queue for execution. + * * Revision 1.8 2004/04/07 17:22:22 pelle * Added support for the new improved interactive signing model. A new Agent is also available with SwingAgent. *************** *** 307,311 **** } ! public final byte[] sign(BrowsableSigner signer, KeyInfo.CreateKeyInfoCallBack cb) throws XMLSecurityException, NonExistingSignerException, UserCancellationException { return signer.sign(canonicalize(), cb); } --- 311,315 ---- } ! public final byte[] sign(BrowsableSigner signer, KeyInfo.CreateKeyInfoCallBack cb) throws XMLSecurityException, UserCancellationException { return signer.sign(canonicalize(), cb); } Index: XMLSignature.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSignature.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** XMLSignature.java 7 Apr 2004 17:22:22 -0000 1.20 --- XMLSignature.java 12 Apr 2004 15:00:42 -0000 1.21 *************** *** 1,4 **** --- 1,8 ---- /* $Id$ * $Log$ + * Revision 1.21 2004/04/12 15:00:42 pelle + * Now have a slightly better way of handling the waiting for input using the WaitForInput class. + * This will later be put into a command queue for execution. + * * Revision 1.20 2004/04/07 17:22:22 pelle * Added support for the new improved interactive signing model. A new Agent is also available with SwingAgent. *************** *** 368,372 **** * * @param alias ! * @param signer * @throws XMLSecurityException * @throws NonExistingSignerException --- 372,376 ---- * * @param alias ! * @param signer * @throws XMLSecurityException * @throws NonExistingSignerException *************** *** 377,381 **** } ! protected void sign(BrowsableSigner signer) throws XMLSecurityException, NonExistingSignerException, UserCancellationException { KeyInfo.CreateKeyInfoCallBack cb = new KeyInfo.CreateKeyInfoCallBack(); sigval.setText(Base64.encode(si.sign(signer, cb))); --- 381,385 ---- } ! protected void sign(BrowsableSigner signer) throws XMLSecurityException, UserCancellationException { KeyInfo.CreateKeyInfoCallBack cb = new KeyInfo.CreateKeyInfoCallBack(); sigval.setText(Base64.encode(si.sign(signer, cb))); |
