src/share/classes/java/security/Key.java

*** 1,7 ****
  /*
!  * Copyright (c) 1996, 2006, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1996, 2013, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 45,57 ****
   *
   * <P>This is an external encoded form for the key used when a standard
   * representation of the key is needed outside the Java Virtual Machine,
   * as when transmitting the key to some other party. The key
   * is encoded according to a standard format (such as
!  * X.509 <code>SubjectPublicKeyInfo</code> or PKCS#8), and
   * is returned using the {@link #getEncoded() getEncoded} method.
!  * Note: The syntax of the ASN.1 type <code>SubjectPublicKeyInfo</code>
   * is defined as follows:
   *
   * <pre>
   * SubjectPublicKeyInfo ::= SEQUENCE {
   *   algorithm AlgorithmIdentifier,
--- 45,57 ----
   *
   * <P>This is an external encoded form for the key used when a standard
   * representation of the key is needed outside the Java Virtual Machine,
   * as when transmitting the key to some other party. The key
   * is encoded according to a standard format (such as
!  * X.509 {@code SubjectPublicKeyInfo} or PKCS#8), and
   * is returned using the {@link #getEncoded() getEncoded} method.
!  * Note: The syntax of the ASN.1 type {@code SubjectPublicKeyInfo}
   * is defined as follows:
   *
   * <pre>
   * SubjectPublicKeyInfo ::= SEQUENCE {
   *   algorithm AlgorithmIdentifier,
*** 130,144 ****
       * named in terms of the appropriate ASN.1 data format, if an
       * ASN.1 specification for this key exists.
       * For example, the name of the ASN.1 data format for public
       * keys is <I>SubjectPublicKeyInfo</I>, as
       * defined by the X.509 standard; in this case, the returned format is
!      * <code>"X.509"</code>. Similarly,
       * the name of the ASN.1 data format for private keys is
       * <I>PrivateKeyInfo</I>,
       * as defined by the PKCS #8 standard; in this case, the returned format is
!      * <code>"PKCS#8"</code>.
       *
       * @return the primary encoding format of the key.
       */
      public String getFormat();
  
--- 130,144 ----
       * named in terms of the appropriate ASN.1 data format, if an
       * ASN.1 specification for this key exists.
       * For example, the name of the ASN.1 data format for public
       * keys is <I>SubjectPublicKeyInfo</I>, as
       * defined by the X.509 standard; in this case, the returned format is
!      * {@code "X.509"}. Similarly,
       * the name of the ASN.1 data format for private keys is
       * <I>PrivateKeyInfo</I>,
       * as defined by the PKCS #8 standard; in this case, the returned format is
!      * {@code "PKCS#8"}.
       *
       * @return the primary encoding format of the key.
       */
      public String getFormat();