changeset 3846:62b0337d1369

Merge
author mullan
date Mon, 07 Mar 2011 13:44:47 -0500
parents 339342f311cc bc0c58d65e97
children 6d5a992dbac2
files
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/javax/crypto/SecretKeyFactory.java	Mon Mar 07 14:43:11 2011 +0000
+++ b/src/share/classes/javax/crypto/SecretKeyFactory.java	Mon Mar 07 13:44:47 2011 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,6 @@
  * <p> Every implementation of the Java platform is required to support the
  * following standard <code>SecretKeyFactory</code> algorithms:
  * <ul>
- * <li><tt>AES</tt></li>
  * <li><tt>DES</tt></li>
  * <li><tt>DESede</tt></li>
  * </ul>