src/share/classes/sun/security/krb5/EncryptionKey.java

rev 7199 : 8014310: JAAS/Krb5LoginModule using des encytypes failure with NPE after JDK-8012679

*** 96,135 ****
      public synchronized Object clone() {
          return new EncryptionKey(keyValue, keyType, kvno);
      }
  
      /**
-      * Obtains the latest version of the secret key of
-      * the principal from a keytab.
-      *
-      * @param princ the principal whose secret key is desired
-      * @param keytab the path to the keytab file. A value of null
-      * will be accepted to indicate that the default path should be
-      * searched.
-      * @returns the secret key or null if none was found.
-      */
-     /*
-     // Replaced by acquireSecretKeys
-     public static EncryptionKey acquireSecretKey(PrincipalName princ,
-                                                  String keytab)
-         throws KrbException, IOException {
- 
-         if (princ == null) {
-             throw new IllegalArgumentException(
-                 "Cannot have null pricipal name to look in keytab.");
-         }
- 
-         KeyTab ktab = KeyTab.getInstance(keytab);
- 
-         if (ktab == null)
-             return null;
- 
-         return ktab.readServiceKey(princ);
-     }
-     */
- 
-     /**
       * Obtains all versions of the secret key of the principal from a
       * keytab.
       *
       * @Param princ the principal whose secret key is desired
       * @param keytab the path to the keytab file. A value of null
--- 96,105 ----
*** 206,218 ****
       */
      public static EncryptionKey[] acquireSecretKeys(char[] password,
              String salt) throws KrbException {
  
          int[] etypes = EType.getDefaults("default_tkt_enctypes");
-         if (etypes == null) {
-             etypes = EType.getBuiltInDefaults();
-         }
  
          EncryptionKey[] encKeys = new EncryptionKey[etypes.length];
          for (int i = 0; i < etypes.length; i++) {
              if (EType.isSupported(etypes[i])) {
                  encKeys[i] = new EncryptionKey(
--- 176,185 ----