src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java

rev 1461 : 6987827: security/util/Resources.java needs improvement
Reviewed-by: valeriep

*** 1,7 ****
  /*
!  * Copyright (c) 2000, 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) 2000, 2010, 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
*** 141,151 ****
      private static final String P11KEYSTORE = "PKCS11";
  
      private static final TextOutputCallback bannerCallback =
                  new TextOutputCallback
                          (TextOutputCallback.INFORMATION,
!                         rb.getString("Please enter keystore information"));
      private final ConfirmationCallback confirmationCallback =
                  new ConfirmationCallback
                          (ConfirmationCallback.INFORMATION,
                          ConfirmationCallback.OK_CANCEL_OPTION,
                          ConfirmationCallback.OK);
--- 141,151 ----
      private static final String P11KEYSTORE = "PKCS11";
  
      private static final TextOutputCallback bannerCallback =
                  new TextOutputCallback
                          (TextOutputCallback.INFORMATION,
!                         rb.getString("Please.enter.keystore.information"));
      private final ConfirmationCallback confirmationCallback =
                  new ConfirmationCallback
                          (ConfirmationCallback.INFORMATION,
                          ConfirmationCallback.OK_CANCEL_OPTION,
                          ConfirmationCallback.OK);
*** 358,371 ****
              // Callback handler available - prompt for alias and passwords
  
              NameCallback aliasCallback;
              if (keyStoreAlias == null || keyStoreAlias.length() == 0) {
                  aliasCallback = new NameCallback(
!                                         rb.getString("Keystore alias: "));
              } else {
                  aliasCallback =
!                     new NameCallback(rb.getString("Keystore alias: "),
                                       keyStoreAlias);
              }
  
              PasswordCallback storePassCallback = null;
              PasswordCallback keyPassCallback = null;
--- 358,371 ----
              // Callback handler available - prompt for alias and passwords
  
              NameCallback aliasCallback;
              if (keyStoreAlias == null || keyStoreAlias.length() == 0) {
                  aliasCallback = new NameCallback(
!                                         rb.getString("Keystore.alias."));
              } else {
                  aliasCallback =
!                     new NameCallback(rb.getString("Keystore.alias."),
                                       keyStoreAlias);
              }
  
              PasswordCallback storePassCallback = null;
              PasswordCallback keyPassCallback = null;
*** 373,387 ****
              switch (env) {
              case PROTECTED_PATH:
                  break;
              case NORMAL:
                  keyPassCallback = new PasswordCallback
!                     (rb.getString("Private key password (optional): "), false);
                  // fall thru
              case TOKEN:
                  storePassCallback = new PasswordCallback
!                     (rb.getString("Keystore password: "), false);
                  break;
              }
              prompt(aliasCallback, storePassCallback, keyPassCallback);
          }
  
--- 373,387 ----
              switch (env) {
              case PROTECTED_PATH:
                  break;
              case NORMAL:
                  keyPassCallback = new PasswordCallback
!                     (rb.getString("Private.key.password.optional."), false);
                  // fall thru
              case TOKEN:
                  storePassCallback = new PasswordCallback
!                     (rb.getString("Keystore.password."), false);
                  break;
              }
              prompt(aliasCallback, storePassCallback, keyPassCallback);
          }