1 files changed, 8 insertions, 8 deletions
diff --git a/bcpkix/src/main/java/org/bouncycastle/voms/VOMSAttribute.java b/bcpkix/src/main/java/org/bouncycastle/voms/VOMSAttribute.java
index 9c062f34..390f8261 100644
--- a/bcpkix/src/main/java/org/bouncycastle/voms/VOMSAttribute.java
+++ b/bcpkix/src/main/java/org/bouncycastle/voms/VOMSAttribute.java
@@ -3,12 +3,12 @@ package org.bouncycastle.voms;
 import java.util.List;
 import java.util.ArrayList;
 
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1OctetString;
 import org.bouncycastle.asn1.DERIA5String;
+import org.bouncycastle.asn1.x509.Attribute;
 import org.bouncycastle.asn1.x509.IetfAttrSyntax;
-import org.bouncycastle.x509.X509Attribute;
-import org.bouncycastle.x509.X509AttributeCertificate;
-
+import org.bouncycastle.cert.X509AttributeCertificateHolder;
 
 /**
  * Representation of the authorization information (VO, server address
@@ -22,7 +22,7 @@ public class VOMSAttribute
      * The ASN.1 object identifier for VOMS attributes
      */
     public static final String VOMS_ATTR_OID = "1.3.6.1.4.1.8005.100.100.4";
-    private X509AttributeCertificate myAC;
+    private X509AttributeCertificateHolder myAC;
     private String myHostPort;
     private String myVo;
     private List myStringList = new ArrayList();
@@ -34,7 +34,7 @@ public class VOMSAttribute
      *
      * @param ac the attribute certificate to parse for VOMS attributes
      */
-    public VOMSAttribute(X509AttributeCertificate ac) 
+    public VOMSAttribute(X509AttributeCertificateHolder ac)
     {
         if (ac == null) 
         {
@@ -43,7 +43,7 @@ public class VOMSAttribute
 
         myAC = ac;
 
-        X509Attribute[] l = ac.getAttributes(VOMS_ATTR_OID);
+        Attribute[] l = ac.getAttributes(new ASN1ObjectIdentifier(VOMS_ATTR_OID));
 
         if (l == null) 
         {
@@ -54,7 +54,7 @@ public class VOMSAttribute
         {
             for (int i = 0; i != l.length; i++) 
             {
-                IetfAttrSyntax attr = IetfAttrSyntax.getInstance(l[i].getValues()[0]);
+                IetfAttrSyntax attr = IetfAttrSyntax.getInstance(l[i].getAttributeValues()[0]);
 
                 // policyAuthority is on the format <vo>/<host>:<port>
                 String url = ((DERIA5String)attr.getPolicyAuthority().getNames()[0].getName()).getString();
@@ -102,7 +102,7 @@ public class VOMSAttribute
     /**
      * @return The AttributeCertificate containing the VOMS information
      */
-    public X509AttributeCertificate getAC()
+    public X509AttributeCertificateHolder getAC()
     {
         return myAC;
     }