From 13970a92a67826bfd12464079b9ccc173f9ab5a6 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Mon, 11 May 2009 14:08:03 -0700 Subject: Squashed commit of the following: commit 2e4a7b3a3accb25865fb4c5535168b0d6bcebae4 Merge: 81ff13e 6c7f7e7 Author: Jesse Wilson Date: Mon May 11 13:47:02 2009 -0700 Update our auth/ package to Harmony r772995. This change is just whitespace, plus dropping the newly added GSS tests and sample data (Generic Security services, org.ietf.jgss). Merge branch 'auth_772995' into auth_dalvik Conflicts: libcore/auth/.classpath libcore/auth/META-INF/MANIFEST.MF libcore/auth/build.xml libcore/auth/make/exclude.common libcore/auth/src/main/java/javax/security/auth/AuthPermission.java libcore/auth/src/main/java/javax/security/auth/DestroyFailedException.java libcore/auth/src/main/java/javax/security/auth/Destroyable.java libcore/auth/src/main/java/javax/security/auth/PrivateCredentialPermission.java libcore/auth/src/main/java/javax/security/auth/Subject.java libcore/auth/src/main/java/javax/security/auth/SubjectDomainCombiner.java libcore/auth/src/main/java/javax/security/auth/callback/CallbackHandler.java libcore/auth/src/main/java/javax/security/auth/callback/PasswordCallback.java libcore/auth/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java libcore/auth/src/main/java/javax/security/auth/kerberos/KerberosKey.java libcore/auth/src/main/java/javax/security/auth/login/LoginException.java libcore/auth/src/main/java/javax/security/auth/x500/X500Principal.java libcore/auth/src/main/java/org/apache/harmony/auth/login/DefaultConfiguration.java libcore/auth/src/main/native/auth/unix/exports.txt libcore/auth/src/main/native/auth/unix/makefile libcore/auth/src/main/native/auth/windows/makefile libcore/auth/src/test/java/common/org/ietf/jgss/OidTest.java commit 81ff13ec7ae480ac783f692f38c845f502b49809 Author: Jesse Wilson Date: Fri May 8 17:53:27 2009 -0700 Stripped @since tags commit 8b4d0e9b66d8d674a56a26f0d1bc111f9d2faa8d Author: Jesse Wilson Date: Fri May 8 17:40:36 2009 -0700 Auth dalvik. commit 6c7f7e7d41393869e3900ad224bf32a26378d723 Author: Jesse Wilson Date: Fri May 8 17:39:48 2009 -0700 Auth 772995 commit ed7f6150f8235006c59afab862d30d6033b02460 Author: Jesse Wilson Date: Fri May 8 17:38:12 2009 -0700 Auth 527399 --- .../java/javax/security/auth/AuthPermission.java | 16 ++++----- .../security/auth/DestroyFailedException.java | 4 +-- .../main/java/javax/security/auth/Destroyable.java | 6 ++-- .../security/auth/PrivateCredentialPermission.java | 19 +++++----- .../src/main/java/javax/security/auth/Subject.java | 40 ++++++++++------------ .../javax/security/auth/SubjectDomainCombiner.java | 8 ++--- .../javax/security/auth/callback/Callback.java | 2 -- .../security/auth/callback/CallbackHandler.java | 4 +-- .../security/auth/callback/PasswordCallback.java | 12 +++---- .../callback/UnsupportedCallbackException.java | 8 ++--- .../javax/security/auth/login/LoginException.java | 4 +-- .../javax/security/auth/x500/X500Principal.java | 32 ++++++++--------- 12 files changed, 66 insertions(+), 89 deletions(-) (limited to 'auth/src/main/java/javax/security') diff --git a/auth/src/main/java/javax/security/auth/AuthPermission.java b/auth/src/main/java/javax/security/auth/AuthPermission.java index 06ea3fb..697d5c7 100644 --- a/auth/src/main/java/javax/security/auth/AuthPermission.java +++ b/auth/src/main/java/javax/security/auth/AuthPermission.java @@ -26,33 +26,31 @@ import org.apache.harmony.auth.internal.nls.Messages; * target name of the permission specifies which methods are allowed * without specifying the concrete action lists. Possible target names and * associated authentication permissions are: - * + * * 
  *    doAs                      invoke Subject.doAs methods.
  *    doAsPrivileged            invoke the Subject.doAsPrivileged methods.
  *    getSubject                invoke Subject.getSubject().
  *    getSubjectFromDomainCombiner    invoke SubjectDomainCombiner.getSubject().
  *    setReadOnly               invoke Subject.setReadonly().
- *    modifyPrincipals          modify the set of principals 
+ *    modifyPrincipals          modify the set of principals
  *                              associated with a Subject.
  *    modifyPublicCredentials   modify the set of public credentials
  *                              associated with a Subject.
  *    modifyPrivateCredentials  modify the set of private credentials
  *                              associated with a Subject.
- *    refreshCredential         invoke the refresh method on a credential of a 
+ *    refreshCredential         invoke the refresh method on a credential of a
  *                              refreshable credential class.
  *    destroyCredential         invoke the destroy method on a credential of a
  *                              destroyable credential class.
  *    createLoginContext.name   instantiate a LoginContext with the
  *                              specified name. The wildcard name ('*')
  *                              allows to a LoginContext of any name.
- *    getLoginConfiguration     invoke the getConfiguration method of 
+ *    getLoginConfiguration     invoke the getConfiguration method of
  *                              javax.security.auth.login.Configuration.
- *    refreshLoginConfiguration Invoke the refresh method of 
+ *    refreshLoginConfiguration Invoke the refresh method of
  *                              javax.security.auth.login.Configuration.
  *
- * - * @since Android 1.0 */ public final class AuthPermission extends BasicPermission { @@ -77,7 +75,7 @@ public final class AuthPermission extends BasicPermission { /** * Creates an authentication permission with the specified target name. - * + * * @param name * the target name of this authentication permission. */ @@ -87,7 +85,7 @@ public final class AuthPermission extends BasicPermission { /** * Creates an authentication permission with the specified target name. - * + * * @param name * the target name of this authentication permission. * @param actions diff --git a/auth/src/main/java/javax/security/auth/DestroyFailedException.java b/auth/src/main/java/javax/security/auth/DestroyFailedException.java index a5438a6..27d4dfd 100644 --- a/auth/src/main/java/javax/security/auth/DestroyFailedException.java +++ b/auth/src/main/java/javax/security/auth/DestroyFailedException.java @@ -19,8 +19,6 @@ package javax.security.auth; /** * Signals that the {@link Destroyable#destroy()} method failed. - * - * @since Android 1.0 */ public class DestroyFailedException extends Exception { @@ -35,7 +33,7 @@ public class DestroyFailedException extends Exception { /** * Creates an exception of type {@code DestroyFailedException}. - * + * * @param message * A detail message that describes the reason for this exception. */ diff --git a/auth/src/main/java/javax/security/auth/Destroyable.java b/auth/src/main/java/javax/security/auth/Destroyable.java index 6194db6..b4d0fa2 100644 --- a/auth/src/main/java/javax/security/auth/Destroyable.java +++ b/auth/src/main/java/javax/security/auth/Destroyable.java @@ -20,8 +20,6 @@ package javax.security.auth; /** * Allows for special treatment of sensitive information, when it comes to * destroying or clearing of the data. - * - * @since Android 1.0 */ public interface Destroyable { @@ -29,7 +27,7 @@ public interface Destroyable { * Erases the sensitive information. Once an object is destroyed any calls * to its methods will throw an {@code IllegalStateException}. If it does * not succeed a DestroyFailedException is thrown. - * + * * @throws DestroyFailedException * if the information cannot be erased. */ @@ -37,7 +35,7 @@ public interface Destroyable { /** * Returns {@code true} once an object has been safely destroyed. - * + * * @return whether the object has been safely destroyed. */ boolean isDestroyed(); diff --git a/auth/src/main/java/javax/security/auth/PrivateCredentialPermission.java b/auth/src/main/java/javax/security/auth/PrivateCredentialPermission.java index d92ede5..35072b8 100644 --- a/auth/src/main/java/javax/security/auth/PrivateCredentialPermission.java +++ b/auth/src/main/java/javax/security/auth/PrivateCredentialPermission.java @@ -31,11 +31,11 @@ import org.apache.harmony.auth.internal.nls.Messages; * Protects private credential objects belonging to a {@code Subject}. It has * only one action which is "read". The target name of this permission has a * special syntax: - * + * * 
  * targetName = CredentialClass {PrincipalClass "PrincipalName"}*
  *
- * + * * First it states a credential class and is followed then by a list of one or * more principals identifying the subject. *

@@ -43,12 +43,11 @@ import org.apache.harmony.auth.internal.nls.Messages; * Principal} class followed by the principal name in quotes. For example, the * following file may define permission to read the private credentials of a * principal named "Bob": "com.sun.PrivateCredential com.sun.Principal \"Bob\"" - *

+ *

* The syntax also allows the use of the wildcard "*" in place of {@code * CredentialClass} or {@code PrincipalClass} and/or {@code PrincipalName}. - * + * * @see Principal - * @since Android 1.0 */ public final class PrivateCredentialPermission extends Permission { @@ -69,7 +68,7 @@ public final class PrivateCredentialPermission extends Permission { * Creates a new permission for private credentials specified by the target * name {@code name} and an {@code action}. The action is always * {@code "read"}. - * + * * @param name * the target name of the permission. * @param action @@ -197,13 +196,13 @@ public final class PrivateCredentialPermission extends Permission { * dimension of the array corresponds to the number of principals. The * second dimension defines either the name of the {@code PrincipalClass} * [x][0] or the value of {@code PrincipalName} [x][1]. - * + *

* This corresponds to the the target name's syntax: - * + * * 

      * targetName = CredentialClass {PrincipalClass "PrincipalName"}*
      *
- * + * * @return the principal classes and names associated with this {@code * PrivateCredentialPermission}. */ @@ -225,7 +224,7 @@ public final class PrivateCredentialPermission extends Permission { /** * Returns the class name of the credential associated with this permission. - * + * * @return the class name of the credential associated with this permission. */ public String getCredentialClass() { diff --git a/auth/src/main/java/javax/security/auth/Subject.java b/auth/src/main/java/javax/security/auth/Subject.java index 5a4cceb..5bf6bba 100644 --- a/auth/src/main/java/javax/security/auth/Subject.java +++ b/auth/src/main/java/javax/security/auth/Subject.java @@ -51,8 +51,6 @@ import org.apache.harmony.auth.internal.nls.Messages; *
  • Credentials (public and private) such as certificates, keys, or * authentication proofs such as tickets
    • * - *

    - * @since Android 1.0 */ public final class Subject implements Serializable { @@ -104,7 +102,7 @@ public final class Subject implements Serializable { /** * The constructor for the subject, setting its public and private * credentials and principals according to the arguments. - * + * * @param readOnly * {@code true} if this {@code Subject} is read-only, thus * preventing any modifications to be done. @@ -135,7 +133,7 @@ public final class Subject implements Serializable { /** * Runs the code defined by {@code action} using the permissions granted to * the {@code Subject} itself and to the code as well. - * + * * @param subject * the distinguished {@code Subject}. * @param action @@ -154,7 +152,7 @@ public final class Subject implements Serializable { * Run the code defined by {@code action} using the permissions granted to * the {@code Subject} and to the code itself, additionally providing a more * specific context. - * + * * @param subject * the distinguished {@code Subject}. * @param action @@ -209,7 +207,7 @@ public final class Subject implements Serializable { /** * Runs the code defined by {@code action} using the permissions granted to * the subject and to the code itself. - * + * * @param subject * the distinguished {@code Subject}. * @param action @@ -231,7 +229,7 @@ public final class Subject implements Serializable { * Runs the code defined by {@code action} using the permissions granted to * the subject and to the code itself, additionally providing a more * specific context. - * + * * @param subject * the distinguished {@code Subject}. * @param action @@ -290,7 +288,7 @@ public final class Subject implements Serializable { * Checks two Subjects for equality. More specifically if the principals, * public and private credentials are equal, equality for two {@code * Subjects} is implied. - * + * * @param obj * the {@code Object} checked for equality with this {@code * Subject}. @@ -320,18 +318,18 @@ public final class Subject implements Serializable { /** * Returns this {@code Subject}'s {@link Principal}. - * + * * @return this {@code Subject}'s {@link Principal}. */ public Set getPrincipals() { return principals; } - + /** * Returns this {@code Subject}'s {@link Principal} which is a subclass of * the {@code Class} provided. - * + * * @param c * the {@code Class} as a criteria which the {@code Principal} * returned must satisfy. @@ -345,7 +343,7 @@ public final class Subject implements Serializable { /** * Returns the private credentials associated with this {@code Subject}. - * + * * @return the private credentials associated with this {@code Subject}. */ public Set getPrivateCredentials() { @@ -355,7 +353,7 @@ public final class Subject implements Serializable { /** * Returns this {@code Subject}'s private credentials which are a subclass * of the {@code Class} provided. - * + * * @param c * the {@code Class} as a criteria which the private credentials * returned must satisfy. @@ -369,18 +367,18 @@ public final class Subject implements Serializable { /** * Returns the public credentials associated with this {@code Subject}. - * + * * @return the public credentials associated with this {@code Subject}. */ public Set getPublicCredentials() { return publicCredentials; } - + /** * Returns this {@code Subject}'s public credentials which are a subclass of * the {@code Class} provided. - * + * * @param c * the {@code Class} as a criteria which the public credentials * returned must satisfy. @@ -394,7 +392,7 @@ public final class Subject implements Serializable { /** * Returns a hash code of this {@code Subject}. - * + * * @return a hash code of this {@code Subject}. */ @Override @@ -417,7 +415,7 @@ public final class Subject implements Serializable { /** * Returns whether this {@code Subject} is read-only or not. - * + * * @return whether this {@code Subject} is read-only or not. */ public boolean isReadOnly() { @@ -426,7 +424,7 @@ public final class Subject implements Serializable { /** * Returns a {@code String} representation of this {@code Subject}. - * + * * @return a {@code String} representation of this {@code Subject}. */ @Override @@ -479,7 +477,7 @@ public final class Subject implements Serializable { /** * Returns the {@code Subject} that was last associated with the {@code * context} provided as argument. - * + * * @param context * the {@code context} that was associated with the * {@code Subject}. @@ -781,4 +779,4 @@ public final class Subject implements Serializable { } } } -} +} \ No newline at end of file diff --git a/auth/src/main/java/javax/security/auth/SubjectDomainCombiner.java b/auth/src/main/java/javax/security/auth/SubjectDomainCombiner.java index 6a8f00b..4b91084 100644 --- a/auth/src/main/java/javax/security/auth/SubjectDomainCombiner.java +++ b/auth/src/main/java/javax/security/auth/SubjectDomainCombiner.java @@ -25,8 +25,6 @@ import java.util.Set; /** * Merges permissions based on code source and code signers with permissions * granted to the specified {@link Subject}. - * - * @since Android 1.0 */ public class SubjectDomainCombiner implements DomainCombiner { @@ -39,7 +37,7 @@ public class SubjectDomainCombiner implements DomainCombiner { /** * Creates a domain combiner for the entity provided in {@code subject}. - * + * * @param subject * the entity to which this domain combiner is associated. */ @@ -53,7 +51,7 @@ public class SubjectDomainCombiner implements DomainCombiner { /** * Returns the entity to which this domain combiner is associated. - * + * * @return the entity to which this domain combiner is associated. */ public Subject getSubject() { @@ -68,7 +66,7 @@ public class SubjectDomainCombiner implements DomainCombiner { /** * Merges the {@code ProtectionDomain} with the {@code Principal}s * associated with the subject of this {@code SubjectDomainCombiner}. - * + * * @param currentDomains * the {@code ProtectionDomain}s associated with the context of * the current thread. The domains must be sorted according to diff --git a/auth/src/main/java/javax/security/auth/callback/Callback.java b/auth/src/main/java/javax/security/auth/callback/Callback.java index 6cf46b8..4854d3f 100644 --- a/auth/src/main/java/javax/security/auth/callback/Callback.java +++ b/auth/src/main/java/javax/security/auth/callback/Callback.java @@ -20,8 +20,6 @@ package javax.security.auth.callback; /** * Defines an empty base interface for all {@code Callback}s used during * authentication. - * - * @since Android 1.0 */ public interface Callback { } \ No newline at end of file diff --git a/auth/src/main/java/javax/security/auth/callback/CallbackHandler.java b/auth/src/main/java/javax/security/auth/callback/CallbackHandler.java index 952b81a..21bf30b 100644 --- a/auth/src/main/java/javax/security/auth/callback/CallbackHandler.java +++ b/auth/src/main/java/javax/security/auth/callback/CallbackHandler.java @@ -27,8 +27,6 @@ import java.io.IOException; * also possible to configure a system-default {@code CallbackHandler} by * setting the {@code auth.login.defaultCallbackHandler} property in the * standard {@code security.properties} file. - * - * @since Android 1.0 */ public interface CallbackHandler { @@ -42,7 +40,7 @@ public interface CallbackHandler { * values. If a {@code CallbackHandler} is not able to handle a specific * {@code Callback}, it needs to throw an * {@link UnsupportedCallbackException}. - * + * * @param callbacks * the array of {@code Callback}s that need handling * @throws IOException diff --git a/auth/src/main/java/javax/security/auth/callback/PasswordCallback.java b/auth/src/main/java/javax/security/auth/callback/PasswordCallback.java index 00020fe..3617b75 100644 --- a/auth/src/main/java/javax/security/auth/callback/PasswordCallback.java +++ b/auth/src/main/java/javax/security/auth/callback/PasswordCallback.java @@ -25,8 +25,6 @@ import org.apache.harmony.auth.internal.nls.Messages; /** * Is used in conjunction with a {@link CallbackHandler} to retrieve a password * when needed. - * - * @since Android 1.0 */ public class PasswordCallback implements Callback, Serializable { @@ -47,7 +45,7 @@ public class PasswordCallback implements Callback, Serializable { /** * Creates a new {@code PasswordCallback} instance. - * + * * @param prompt * the message that should be displayed to the user * @param echoOn @@ -62,7 +60,7 @@ public class PasswordCallback implements Callback, Serializable { /** * Returns the prompt that was specified when creating this {@code * PasswordCallback} - * + * * @return the prompt */ public String getPrompt() { @@ -72,7 +70,7 @@ public class PasswordCallback implements Callback, Serializable { /** * Queries whether this {@code PasswordCallback} expects user input to be * echoed, which is specified during the creation of the object. - * + * * @return {@code true} if (and only if) user input should be echoed */ public boolean isEchoOn() { @@ -83,7 +81,7 @@ public class PasswordCallback implements Callback, Serializable { * Sets the password. The {@link CallbackHandler} that performs the actual * provisioning or input of the password needs to call this method to hand * back the password to the security service that requested it. - * + * * @param password * the password. A copy of this is stored, so subsequent changes * to the input array do not affect the {@code PasswordCallback}. @@ -101,7 +99,7 @@ public class PasswordCallback implements Callback, Serializable { * Returns the password. The security service that needs the password * usually calls this method once the {@link CallbackHandler} has finished * its work. - * + * * @return the password. A copy of the internal password is created and * returned, so subsequent changes to the internal password do not * affect the result. diff --git a/auth/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java b/auth/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java index d40ff45..bee7bd3 100644 --- a/auth/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java +++ b/auth/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java @@ -20,8 +20,6 @@ package javax.security.auth.callback; /** * Thrown when a {@link CallbackHandler} does not support a particular {@link * Callback}. - * - * @since Android 1.0 */ public class UnsupportedCallbackException extends Exception { @@ -32,7 +30,7 @@ public class UnsupportedCallbackException extends Exception { /** * Creates a new exception instance and initializes it with just the * unsupported {@code Callback}, but no error message. - * + * * @param callback * the {@code Callback} */ @@ -44,7 +42,7 @@ public class UnsupportedCallbackException extends Exception { /** * Creates a new exception instance and initializes it with both the * unsupported {@code Callback} and an error message. - * + * * @param callback * the {@code Callback} * @param message @@ -57,7 +55,7 @@ public class UnsupportedCallbackException extends Exception { /** * Returns the unsupported {@code Callback} that triggered this exception. - * + * * @return the {@code Callback} */ public Callback getCallback() { diff --git a/auth/src/main/java/javax/security/auth/login/LoginException.java b/auth/src/main/java/javax/security/auth/login/LoginException.java index a1d6ec0..9433c43 100644 --- a/auth/src/main/java/javax/security/auth/login/LoginException.java +++ b/auth/src/main/java/javax/security/auth/login/LoginException.java @@ -21,8 +21,6 @@ import java.security.GeneralSecurityException; /** * Base class for exceptions that are thrown when a login error occurs. - * - * @since Android 1.0 */ public class LoginException extends GeneralSecurityException { @@ -37,7 +35,7 @@ public class LoginException extends GeneralSecurityException { /** * Creates a new exception instance and initializes it with a given message. - * + * * @param message the error message */ public LoginException(String message) { diff --git a/auth/src/main/java/javax/security/auth/x500/X500Principal.java b/auth/src/main/java/javax/security/auth/x500/X500Principal.java index fa9dfe8..41f3a6d 100644 --- a/auth/src/main/java/javax/security/auth/x500/X500Principal.java +++ b/auth/src/main/java/javax/security/auth/x500/X500Principal.java @@ -29,13 +29,11 @@ import org.apache.harmony.security.x501.Name; /** * Represents an X.500 principal, which holds the distinguished name of some - * network entity. An example of a distinguished name is {@code "O=Google, - * OU=Android, C=US"}. The class can be instantiated from a byte representation + * network entity. An example of a distinguished name is {@code "O=SomeOrg, + * OU=SomeOrgUnit, C=US"}. The class can be instantiated from a byte representation * of an object identifier (OID), an ASN.1 DER-encoded version, or a simple * string holding the distinguished name. The representations must follow either * RFC 2253, RFC 1779, or RFC2459. - * - * @since Android 1.0 */ public final class X500Principal implements Serializable, Principal { @@ -65,10 +63,10 @@ public final class X500Principal implements Serializable, Principal { /** * Creates a new X500Principal from a given ASN.1 DER encoding of a * distinguished name. - * + * * @param name * the ASN.1 DER-encoded distinguished name - * + * * @throws IllegalArgumentException * if the ASN.1 DER-encoded distinguished name is incorrect */ @@ -91,11 +89,11 @@ public final class X500Principal implements Serializable, Principal { /** * Creates a new X500Principal from a given ASN.1 DER encoding of a * distinguished name. - * + * * @param in * an {@code InputStream} holding the ASN.1 DER-encoded * distinguished name - * + * * @throws IllegalArgumentException * if the ASN.1 DER-encoded distinguished name is incorrect */ @@ -118,10 +116,10 @@ public final class X500Principal implements Serializable, Principal { /** * Creates a new X500Principal from a string representation of a * distinguished name. - * + * * @param name * the string representation of the distinguished name - * + * * @throws IllegalArgumentException * if the string representation of the distinguished name is * incorrect @@ -155,8 +153,8 @@ public final class X500Principal implements Serializable, Principal { /** * Returns an ASN.1 DER-encoded representation of the distinguished name - * contained in this X.500 principal. - * + * contained in this X.500 principal. + * * @return the ASN.1 DER-encoded representation */ public byte[] getEncoded() { @@ -167,9 +165,9 @@ public final class X500Principal implements Serializable, Principal { } /** - * Returns a human-readable string representation of the distinguished name + * Returns a human-readable string representation of the distinguished name * contained in this X.500 principal. - * + * * @return the string representation */ public String getName() { @@ -185,12 +183,12 @@ public final class X500Principal implements Serializable, Principal { * some canonicalizing operations like removing leading and trailing * whitespace, lower-casing the whole name, and bringing it into a * normalized Unicode representation. - * + * * @param format * the name of the format to use for the representation - * + * * @return the string representation - * + * * @throws IllegalArgumentException * if the {@code format} argument is not one of the three * mentioned above -- cgit v1.1