diff options
Diffstat (limited to 'javax/security/auth/kerberos')
5 files changed, 30 insertions, 19 deletions
diff --git a/javax/security/auth/kerberos/DelegationPermission.java b/javax/security/auth/kerberos/DelegationPermission.java index 42bb9c73c..c2aa969fc 100644 --- a/javax/security/auth/kerberos/DelegationPermission.java +++ b/javax/security/auth/kerberos/DelegationPermission.java @@ -1,5 +1,5 @@ /* DelegationPermission.java -- kerberos delegation permission - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2014 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,8 +50,7 @@ import java.util.Vector; public final class DelegationPermission extends BasicPermission { - // FIXME: Enable this when serialization works. - // private static final long serialVersionUID = 883133252142523922L; + private static final long serialVersionUID = 883133252142523922L; /** * Create a new instance with the given name. @@ -91,19 +90,22 @@ public final class DelegationPermission throw new IllegalArgumentException("invalid syntax for principals"); } + @Override public boolean implies(Permission perm) { return equals(perm); } + @Override public PermissionCollection newPermissionCollection() { // FIXME: don't know how to serialize here. I suspect this // class has to have a particular name, etc ... return new PermissionCollection() { - private Vector permissions = new Vector(); + private Vector<Permission> permissions = new Vector<Permission>(); + @Override public void add(Permission perm) { if (isReadOnly()) @@ -113,21 +115,23 @@ public final class DelegationPermission permissions.add(perm); } + @Override public boolean implies(Permission perm) { if (! (perm instanceof DelegationPermission)) return false; - Enumeration e = elements(); + Enumeration<Permission> e = elements(); while (e.hasMoreElements()) { - DelegationPermission dp = (DelegationPermission) e.nextElement(); + Permission dp = e.nextElement(); if (dp.implies(perm)) return true; } return false; } - public Enumeration elements() + @Override + public Enumeration<Permission> elements() { return permissions.elements(); } diff --git a/javax/security/auth/kerberos/KerberosPrincipal.java b/javax/security/auth/kerberos/KerberosPrincipal.java index 4ba767226..46da0fa1c 100644 --- a/javax/security/auth/kerberos/KerberosPrincipal.java +++ b/javax/security/auth/kerberos/KerberosPrincipal.java @@ -1,5 +1,5 @@ /* KerberosPrincipal.java -- a kerberos principal - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2014 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,7 +55,7 @@ public final class KerberosPrincipal implements Serializable, Principal { // Uncomment when serialization is correct. - // private static final long serialVersionUID = -7374788026156829911L; + private static final long serialVersionUID = -7374788026156829911L; /** * Constant from the RFC: "Just the name of the principal as in DCE, or diff --git a/javax/security/auth/kerberos/KerberosTicket.java b/javax/security/auth/kerberos/KerberosTicket.java index ff70b9f4e..66227fd20 100644 --- a/javax/security/auth/kerberos/KerberosTicket.java +++ b/javax/security/auth/kerberos/KerberosTicket.java @@ -1,5 +1,5 @@ /* KerberosTicket.java -- a kerberos ticket - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2014 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -73,7 +73,7 @@ public class KerberosTicket private static final int INITIAL = 9; private static final int NUM_FLAGS = 12; - private byte[] asn1Encoding; + @SuppressWarnings("unusedPrivate") private byte[] asn1Encoding; private KeyImpl sessionKey; private boolean[] flags; private Date authTime; diff --git a/javax/security/auth/kerberos/KeyImpl.java b/javax/security/auth/kerberos/KeyImpl.java index a7cf3d212..d8027c07e 100644 --- a/javax/security/auth/kerberos/KeyImpl.java +++ b/javax/security/auth/kerberos/KeyImpl.java @@ -49,7 +49,7 @@ import javax.crypto.SecretKey; final class KeyImpl implements Serializable, SecretKey { // Enable this when serialization works. - // private static final long serialVersionUID = -7889313790214321193L; + private static final long serialVersionUID = -7889313790214321193L; public String algorithm; public int type; diff --git a/javax/security/auth/kerberos/ServicePermission.java b/javax/security/auth/kerberos/ServicePermission.java index 4412ea459..ba015246e 100644 --- a/javax/security/auth/kerberos/ServicePermission.java +++ b/javax/security/auth/kerberos/ServicePermission.java @@ -1,5 +1,5 @@ /* ServicePermission.java -- kerberos service permission - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2014 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -54,8 +54,7 @@ import java.util.Vector; public final class ServicePermission extends Permission { - // FIXME: Enable this when serialization works. - // private static final long serialVersionUID = -1227585031618624935L; + private static final long serialVersionUID = -1227585031618624935L; private static final int INITIATE = 1; private static final int ACCEPT = 2; @@ -82,6 +81,7 @@ public final class ServicePermission parseActions(action); } + @Override public boolean implies(Permission perm) { if (! (perm instanceof ServicePermission)) @@ -92,6 +92,7 @@ public final class ServicePermission return getName().equals(sp.getName()); } + @Override public boolean equals(Object obj) { if (! (obj instanceof ServicePermission)) @@ -100,6 +101,7 @@ public final class ServicePermission return flags == sp.flags && getName().equals(sp.getName()); } + @Override public int hashCode() { return getName().hashCode() + flags; @@ -108,6 +110,7 @@ public final class ServicePermission /** * Return a string representing the actions. */ + @Override public String getActions() { if (flags == (INITIATE | ACCEPT)) @@ -119,12 +122,14 @@ public final class ServicePermission return ""; } + @Override public PermissionCollection newPermissionCollection() { return new PermissionCollection() { - private Vector permissions = new Vector(); + private Vector<Permission> permissions = new Vector<Permission>(); + @Override public void add(Permission perm) { if (isReadOnly()) @@ -134,21 +139,23 @@ public final class ServicePermission permissions.add(perm); } + @Override public boolean implies(Permission perm) { if (! (perm instanceof ServicePermission)) return false; - Enumeration e = elements(); + Enumeration<Permission> e = elements(); while (e.hasMoreElements()) { - ServicePermission sp = (ServicePermission) e.nextElement(); + Permission sp = e.nextElement(); if (sp.implies(perm)) return true; } return false; } - public Enumeration elements() + @Override + public Enumeration<Permission> elements() { return permissions.elements(); } |