Changeset 4315c0e

Timestamp:

Apr 1, 2011 10:25:10 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

140fb80

Parents:

1294d29

Message:

Send the Identity cert with the credential!! (Also fix parameters)

File:

• axis/Create.java (modified) (2 diffs)

axis/Create.java

@@ -86 +86 @@
         byte[] nsContents = null;
         try {
-            nsContents = readNsFile(new File(args[1]));
-            AbacID = new Identity(new File("./emulab.pem"));
+            nsContents = readNsFile(new File(tclFile));
+            AbacID = new Identity(new File(certFile));
         }
         catch (GeneralSecurityException e) { 
@@ -133 +133 @@
         // our authority.  We could keep the certificate around for other
         // commands to use, but once we tell fedd about it, fedd remembers it.
+        //
+        // NB: We have to send both the identity used to sign the credential
+        // and the credential itself, so that fedd can validate it.
         try {
             Credential c = null;
-            byte[][] ca = new byte[1][];
+            byte[][] ca = new byte[2][];
 
+            ca[0] = AbacID.getCertificate().getEncoded(); // Identity
             c = delegate(AbacID, newLabels.getFedid());
-            ca[0] = c.cert().getEncoded();
+            ca[1] = c.cert().getEncoded(); // Credential
             createReq.setCredential(ca);
+            System.err.println(c);
         }
         catch (GeneralSecurityException e) {