[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/verifier NSVerifier.java,1.1.1.1,1.2

[<pe...@us...>]

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/verifier
In directory sc8-pr-cvs1:/tmp/cvs-serv4908/src/java/org/neuclear/id/verifier

Modified Files:
	NSVerifier.java 
Log Message:
More fixes throughout to problems caused by renaming.

Index: NSVerifier.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/verifier/NSVerifier.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** NSVerifier.java	19 Sep 2003 14:41:12 -0000	1.1.1.1
--- NSVerifier.java	22 Sep 2003 19:24:01 -0000	1.2
***************
*** 1,5 ****
  package org.neuclear.id.verifier;
  
- import org.neuclear.crypto.CryptoTools;
  import org.neuclear.id.InvalidNameSpaceException;
  import org.neuclear.id.NSTools;
--- 1,4 ----
***************
*** 7,12 ****
  import org.neuclear.id.NamedObject;
  import org.neuclear.id.resolver.NSResolver;
! import org.neuclear.utils.NeudistException;
! import org.neuclear.xml.xmlsec.XMLSecurityException;
  
  import java.security.PublicKey;
--- 6,12 ----
  import org.neuclear.id.NamedObject;
  import org.neuclear.id.resolver.NSResolver;
! import org.neudist.crypto.CryptoTools;
! import org.neudist.utils.NeudistException;
! import org.neudist.xml.xmlsec.XMLSecurityException;
  
  import java.security.PublicKey;
***************
*** 16,21 ****
   */
  public final class NSVerifier {
!     private static final String NSROOTPKMOD="AKbv1DrfQCj7fbcc/9U8mLHi9LzFGVw8ac9z26BN1+yeq9VG3wvW+OXjvUpQ9cD+dpwpFXeai9Hz DkFeJcT9Coi9A8Aj4nffWAlxJ/AVOIRCi1d4A/d9InhQ7UYYA5O7XBcwKneopYVa9zRDUoy0ZpVy t9Kj5i0Zw6oZsflAu4S4pIU+niYwwWrYmCuBEq9kecf7nSGiU0rHp1QNs7NYdhXCl2BMcSaz0AZt AF8YLlZYasviJkoxUFBB/Vjqa98xi7V7XIGsMbXWqUvJ8MW2N/CUdBz5aDlpBUwul8rqyq+03A0q 84AFJiUcudqVL7KhURXB8ZYy/hZb+YkEvE3IigU=";
!     private static final String NSROOTPKEXP="AQAB";
      private static PublicKey nsrootpk;
  
--- 16,21 ----
   */
  public final class NSVerifier {
!     private static final String NSROOTPKMOD = "AKbv1DrfQCj7fbcc/9U8mLHi9LzFGVw8ac9z26BN1+yeq9VG3wvW+OXjvUpQ9cD+dpwpFXeai9Hz DkFeJcT9Coi9A8Aj4nffWAlxJ/AVOIRCi1d4A/d9InhQ7UYYA5O7XBcwKneopYVa9zRDUoy0ZpVy t9Kj5i0Zw6oZsflAu4S4pIU+niYwwWrYmCuBEq9kecf7nSGiU0rHp1QNs7NYdhXCl2BMcSaz0AZt AF8YLlZYasviJkoxUFBB/Vjqa98xi7V7XIGsMbXWqUvJ8MW2N/CUdBz5aDlpBUwul8rqyq+03A0q 84AFJiUcudqVL7KhURXB8ZYy/hZb+YkEvE3IigU=";
!     private static final String NSROOTPKEXP = "AQAB";
      private static PublicKey nsrootpk;
  
***************
*** 27,38 ****
       * We check if this object is allowed within the parents namespace
       */
!     public final static boolean isNameValid(NamedObject obj) throws NeudistException  {
          if (!NSTools.isValidName(obj.getName()))
              return false;
  
!         String parentName=NSTools.getParentNSURI(obj.getName());
  
          if (parentName.equals("neu://")) {
!             boolean valid= obj.verifySignature(getRootPK());
  //            if (valid && obj instanceof NameSpace)
  //                NSResolver.NSCACHE.cache((NameSpace)obj);
--- 27,38 ----
       * We check if this object is allowed within the parents namespace
       */
!     public final static boolean isNameValid(NamedObject obj) throws NeudistException {
          if (!NSTools.isValidName(obj.getName()))
              return false;
  
!         String parentName = NSTools.getParentNSURI(obj.getName());
  
          if (parentName.equals("neu://")) {
!             boolean valid = obj.verifySignature(getRootPK());
  //            if (valid && obj instanceof NameSpace)
  //                NSResolver.NSCACHE.cache((NameSpace)obj);
***************
*** 41,45 ****
  
          // Allright we need to do this the hard way
!         NameSpace parent=null;
          try {
              parent = NSResolver.resolveNameSpace(parentName);
--- 41,45 ----
  
          // Allright we need to do this the hard way
!         NameSpace parent = null;
          try {
              parent = NSResolver.resolveNameSpace(parentName);
***************
*** 51,55 ****
          //if (parent==null&&getName().equals("neu://")) return true;
  
!         boolean valid= (parent!=null&&parent.postAllowed(obj));
  //        if (valid && obj instanceof NameSpace)
  //            NSResolver.NSCACHE.cache((NameSpace)obj);
--- 51,55 ----
          //if (parent==null&&getName().equals("neu://")) return true;
  
!         boolean valid = (parent != null && parent.postAllowed(obj));
  //        if (valid && obj instanceof NameSpace)
  //            NSResolver.NSCACHE.cache((NameSpace)obj);
***************
*** 61,66 ****
       */
      public final static PublicKey getRootPK() throws XMLSecurityException {
!         if (nsrootpk==null)
!             nsrootpk=CryptoTools.createPK(NSROOTPKMOD,NSROOTPKEXP);
          return nsrootpk;
      }
--- 61,66 ----
       */
      public final static PublicKey getRootPK() throws XMLSecurityException {
!         if (nsrootpk == null)
!             nsrootpk = CryptoTools.createPK(NSROOTPKMOD, NSROOTPKEXP);
          return nsrootpk;
      }