Mercurial > hg > openjdk > jdk8u > jdk
changeset 12804:3b1bfef6f82b jdk8u161-b01
Merge
line wrap: on
line diff
--- a/.hgtags Fri Sep 29 14:28:55 2017 -0400 +++ b/.hgtags Sun Oct 01 11:49:32 2017 -0700 @@ -726,6 +726,52 @@ d2744852f3e64f7b0ba54f3a64ed5e2107e6ee68 jdk8u144-b01 55899d2b99b0725d74eebc510a116423329ad6f0 jdk8u141-b31 a3c4020f84aeb0dba467534239951f8818bdfb84 jdk8u141-b32 +b64b1dfdbe7cfe3859f1023c0f1fb0216bce4ae7 jdk8u144-b00 +d2744852f3e64f7b0ba54f3a64ed5e2107e6ee68 jdk8u144-b01 +a05113a4c91c59f44b9894e12aeda07a7534ff7e jdk8u144-b31 +c4f7f2878c4bc54dcc12eddbbcd90d4c7a5dddfe jdk8u144-b32 +785d45a4c0b715ff0131abda873e3c2f85874ac3 jdk8u144-b33 +71dee2264dddd5a2c90d8c6f3a3f4ffd8da02551 jdk8u144-b34 +072e084bceeedeb75467e40ca77786ac9ef5227a jdk8u151-b00 +5b0fa6e004312a5910a6a70e4fbc0f00a678e650 jdk8u151-b01 +bd40efd56b4544ff9048d2f7be4cf108b281a6f3 jdk8u151-b02 +58243fea3fe2669e93350bb4b77e188623b85503 jdk8u151-b03 +27273bbb711a402efe5fcd332003ba419102f662 jdk8u151-b04 +0efdf2c7a21464e5f3d89474ffdfe81db61031fd jdk8u151-b05 +c6c870e267de694bc85dc4af23a648824063f95b jdk8u151-b06 +84b0fbbfb8d664031a9f5283f79b13b98714cc7f jdk8u151-b07 +8fd79358682edc86abaac1c839486834410be74b jdk8u151-b08 +a487770409082a3d1c4be9264e8eb02b1a41fe41 jdk8u151-b09 +7653488b327598fecd823b9b095a1c107b0a1429 jdk8u151-b10 +431c125e1231749e16427c280f115f93d699c0e1 jdk8u151-b11 +31bc1a681b51d2ae8b176ddeaf821d73494acde4 jdk8u151-b12 +1442bc728814af451e2dd1a6719a64485d27e3a0 jdk8u122-b00 +f6030acfa5aec0e64d45adfac69b9e7e5c12bc74 jdk8u122-b01 +6b072c3a6db7ab06804c91aab77431799dfb5d47 jdk8u122-b02 +141beb4d854d213c1aefcc4406f09aa6b0809e43 jdk8u122-b03 +141beb4d854d213c1aefcc4406f09aa6b0809e43 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +d8c1eb38a23286991238eed87ab04c331700839b jdk8u122-b03 +774f11d707e0ff685c131cd625d96e1f58527990 jdk8u122-b04 +000711011f8ab7ab5ea88e02086c48181b42ab8f jdk8u132-b00 +f7be58eb30bc2cdea8a8e0fb254f52f176f5b57d jdk8u152-b00 +072df97b6e2af59f5e2433ae6b2dbecb16b03cd8 jdk8u152-b01 +dbf817e782805bffcb9a0d84f452349926329d62 jdk8u152-b02 +824988d089dde02e15f04c3b994115f78b9408c9 jdk8u152-b03 +4c95cacb8ec77cbda2ae1d4e070b39ec6b527769 jdk8u152-b04 +9c692f8574178a5505efe39cdff1ea92d4f95cbd jdk8u152-b05 +636043375508d667052c84691c55d4c633376dbe jdk8u152-b06 +83998ef9e0b96e1f5f9d4667575a81e8aa06b981 jdk8u152-b07 +e62e091df75fd92bf9d8c573f6224132c99b33ea jdk8u152-b08 +eb71140d49732a226340c0e0a2224c0215fc161a jdk8u152-b09 +db0d193ce92bb6bad9878a98b049afee46260513 jdk8u152-b10 +947709b7e632bc7e965ce1d2c76d9991a1877067 jdk8u152-b11 +3888ae357808b8a45d742d8c73d83de156cab84e jdk8u152-b12 +f5f32c0208a09a78185dad1baf7793bf84fb8356 jdk8u152-b13 +50047f057dc14fa5e08e2b449304a21889e4079a jdk8u152-b14 +bfd67d7c7d41b320225d5502cec55c6b38cdaa6d jdk8u152-b15 +1cb70967c4d78a45a60d0d6eb64cb7fbe89ad005 jdk8u152-b16 072e084bceeedeb75467e40ca77786ac9ef5227a jdk8u151-b00 5b0fa6e004312a5910a6a70e4fbc0f00a678e650 jdk8u151-b01 bd40efd56b4544ff9048d2f7be4cf108b281a6f3 jdk8u151-b02
--- a/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Fri Sep 29 14:28:55 2017 -0400 +++ b/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Sun Oct 01 11:49:32 2017 -0700 @@ -504,8 +504,10 @@ } private boolean isMaximized() { - return undecorated ? this.normalBounds != null - : isZoomed; + if (undecorated) { + return this.normalBounds != null; + } + return isZoomed; } private void maximize() {
--- a/src/share/classes/com/sun/crypto/provider/CipherBlockChaining.java Fri Sep 29 14:28:55 2017 -0400 +++ b/src/share/classes/com/sun/crypto/provider/CipherBlockChaining.java Sun Oct 01 11:49:32 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -140,6 +140,9 @@ int encrypt(byte[] plain, int plainOffset, int plainLen, byte[] cipher, int cipherOffset) { + if (plainLen <= 0) { + return plainLen; + } if ((plainLen % blockSize) != 0) { throw new ProviderException("Internal error in input buffering"); } @@ -181,6 +184,9 @@ int decrypt(byte[] cipher, int cipherOffset, int cipherLen, byte[] plain, int plainOffset) { + if (cipherLen <= 0) { + return cipherLen; + } if ((cipherLen % blockSize) != 0) { throw new ProviderException("Internal error in input buffering"); }
--- a/src/share/classes/com/sun/crypto/provider/CounterMode.java Fri Sep 29 14:28:55 2017 -0400 +++ b/src/share/classes/com/sun/crypto/provider/CounterMode.java Sun Oct 01 11:49:32 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2017, 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 @@ -170,6 +170,9 @@ * are encrypted on demand. */ private int crypt(byte[] in, int inOff, int len, byte[] out, int outOff) { + if (len == 0) { + return 0; + } int result = len; while (len-- > 0) { if (used >= blockSize) {
--- a/src/share/classes/sun/awt/resources/awt_ko.properties Fri Sep 29 14:28:55 2017 -0400 +++ b/src/share/classes/sun/awt/resources/awt_ko.properties Sun Oct 01 11:49:32 2017 -0700 @@ -14,7 +14,7 @@ AWT.enter=Enter AWT.backSpace=Backspace AWT.tab=Tab -AWT.cancel=Cancel +AWT.cancel=\uCDE8\uC18C AWT.clear=Clear AWT.pause=Pause AWT.capsLock=Caps Lock
--- a/src/share/classes/sun/nio/cs/ISO_8859_1.java Fri Sep 29 14:28:55 2017 -0400 +++ b/src/share/classes/sun/nio/cs/ISO_8859_1.java Sun Oct 01 11:49:32 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2017, 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 @@ -148,6 +148,7 @@ private final Surrogate.Parser sgp = new Surrogate.Parser(); // JVM may replace this method with intrinsic code. + // don't pass len value <= 0 private static int encodeISOArray(char[] sa, int sp, byte[] da, int dp, int len) { @@ -180,7 +181,7 @@ int slen = sl - sp; int len = (dlen < slen) ? dlen : slen; try { - int ret = encodeISOArray(sa, sp, da, dp, len); + int ret = (len <= 0) ? 0 : encodeISOArray(sa, sp, da, dp, len); sp = sp + ret; dp = dp + ret; if (ret != len) { @@ -240,7 +241,8 @@ int slen = Math.min(len, dst.length); int sl = sp + slen; while (sp < sl) { - int ret = encodeISOArray(src, sp, dst, dp, slen); + int ret = + (slen <= 0) ? 0 : encodeISOArray(src, sp, dst, dp, slen); sp = sp + ret; dp = dp + ret; if (ret != slen) {
--- a/src/share/classes/sun/security/tools/keytool/Resources_de.java Fri Sep 29 14:28:55 2017 -0400 +++ b/src/share/classes/sun/security/tools/keytool/Resources_de.java Sun Oct 01 11:49:32 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2017, 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 @@ -345,8 +345,6 @@ {"Enter.alias.name.", "Aliasnamen eingeben: "}, {".RETURN.if.same.as.for.otherAlias.", "\t(RETURN, wenn identisch mit <{0}>)"}, - {".PATTERN.printX509Cert", - "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikat-Fingerprints:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Signaturalgorithmusname: {8}\n\t Version: {9}"}, {"What.is.your.first.and.last.name.", "Wie lautet Ihr Vor- und Nachname?"}, {"What.is.the.name.of.your.organizational.unit.", @@ -409,15 +407,12 @@ {"Please.provide.keysize.for.secret.key.generation", "Geben Sie -keysize zum Erstellen eines Secret Keys an"}, - {"verified.by.s.in.s", "Gepr\u00FCft von %s in %s"}, {"warning.not.verified.make.sure.keystore.is.correct", "WARNUNG: Nicht gepr\u00FCft. Stellen Sie sicher, dass -keystore korrekt ist."}, {"Extensions.", "Erweiterungen: "}, {".Empty.value.", "(Leerer Wert)"}, {"Extension.Request.", "Erweiterungsanforderung:"}, - {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.", - "PKCS #10-Zertifikatanforderung (Version 1.0)\nSubjekt: %s\nPublic Key: %s Format %s Schl\u00FCssel\n"}, {"Unknown.keyUsage.type.", "Unbekannter keyUsage-Typ: "}, {"Unknown.extendedkeyUsage.type.", "Unbekannter extendedkeyUsage-Typ: "}, {"Unknown.AccessDescription.type.", "Unbekannter AccessDescription-Typ: "}, @@ -426,7 +421,37 @@ "Erweiterung kann nicht als \"Kritisch\" markiert werden. "}, {"Odd.number.of.hex.digits.found.", "Ungerade Anzahl hexadezimaler Ziffern gefunden: "}, {"Unknown.extension.type.", "Unbekannter Erweiterungstyp: "}, - {"command.{0}.is.ambiguous.", "Befehl {0} ist mehrdeutig:"} + {"command.{0}.is.ambiguous.", "Befehl {0} ist mehrdeutig:"}, + + // 8171319: keytool should print out warnings when reading or + // generating cert/cert req using weak algorithms + {"the.certificate.request", "Die Zertifikatsanforderung"}, + {"the.issuer", "Der Aussteller"}, + {"the.generated.certificate", "Das generierte Zertifikat"}, + {"the.generated.crl", "Die generierte CRL"}, + {"the.generated.certificate.request", "Die generierte Zertifikatsanforderung"}, + {"the.certificate", "Das Zertifikat"}, + {"the.crl", "Die CRL"}, + {"the.tsa.certificate", "Das TSA-Zertifikat"}, + {"the.input", "Die Eingabe"}, + {"reply", "Antwort"}, + {"one.in.many", "%s #%d von %d"}, + {"alias.in.cacerts", "Aussteller <%s> in cacerts"}, + {"alias.in.keystore", "Aussteller <%s>"}, + {"with.weak", "%s (schwach)"}, + {"key.bit", "%d-Bit-%s-Schl\u00FCssel"}, + {"key.bit.weak", "%d-Bit-%s-Schl\u00FCssel (schwach)"}, + {".PATTERN.printX509Cert.with.weak", + "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikatfingerprints:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\nSignaturalgorithmusname: {8}\nAlgorithmus des Public Key von Betreff: {9}\nVersion: {10}"}, + {"PKCS.10.with.weak", + "PKCS #10-Zertifikatsanforderung (Version 1.0)\nSubject: %s\nFormat: %s\nPublic Key: %s\nSignaturalgorithmus: %s\n"}, + {"verified.by.s.in.s.weak", "Von %s in %s mit %s verifiziert"}, + {"whose.sigalg.risk", "%s verwendet den Signaturalgorithmus %s. Dies gilt als Sicherheitsrisiko."}, + {"whose.key.risk", "%s verwendet %s. Dies gilt als Sicherheitsrisiko."}, + {"jks.storetype.warning", "Der %1$s-Keystore verwendet ein propriet\u00E4res Format. Es wird empfohlen, auf PKCS12 zu migrieren, das ein Industriestandardformat mit \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\" ist."}, + {"migrate.keystore.warning", "\"%1$s\" zu %4$s migriert. Der %2$s-Keystore wurde als \"%3$s\" gesichert."}, + {"backup.keystore.warning", "Der urspr\u00FCngliche Keystore \"%1$s\" wird als \"%3$s\" gesichert..."}, + {"importing.keystore.status", "Keystore %1$s wird in %2$s importiert..."}, };
--- a/src/share/classes/sun/security/tools/keytool/Resources_es.java Fri Sep 29 14:28:55 2017 -0400 +++ b/src/share/classes/sun/security/tools/keytool/Resources_es.java Sun Oct 01 11:49:32 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2017, 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 @@ -345,8 +345,6 @@ {"Enter.alias.name.", "Introduzca el nombre de alias: "}, {".RETURN.if.same.as.for.otherAlias.", "\t(INTRO si es el mismo que para <{0}>)"}, - {".PATTERN.printX509Cert", - "Propietario: {0}\nEmisor: {1}\nN\u00FAmero de serie: {2}\nV\u00E1lido desde: {3} hasta: {4}\nHuellas digitales del Certificado:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Nombre del Algoritmo de Firma: {8}\n\t Versi\u00F3n: {9}"}, {"What.is.your.first.and.last.name.", "\u00BFCu\u00E1les son su nombre y su apellido?"}, {"What.is.the.name.of.your.organizational.unit.", @@ -409,15 +407,12 @@ {"Please.provide.keysize.for.secret.key.generation", "Proporcione el valor de -keysize para la generaci\u00F3n de claves secretas"}, - {"verified.by.s.in.s", "Verificado por %s en %s"}, {"warning.not.verified.make.sure.keystore.is.correct", "ADVERTENCIA: no se ha verificado. Aseg\u00FArese de que el valor de -keystore es correcto."}, {"Extensions.", "Extensiones: "}, {".Empty.value.", "(Valor vac\u00EDo)"}, {"Extension.Request.", "Solicitud de Extensi\u00F3n:"}, - {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.", - "Solicitud de Certificado PKCS #10 (Versi\u00F3n 1.0)\nAsunto: %s\nClave P\u00FAblica: %s formato %s clave\n"}, {"Unknown.keyUsage.type.", "Tipo de uso de clave desconocido: "}, {"Unknown.extendedkeyUsage.type.", "Tipo de uso de clave extendida desconocido: "}, {"Unknown.AccessDescription.type.", "Tipo de descripci\u00F3n de acceso desconocido: "}, @@ -426,7 +421,37 @@ "Esta extensi\u00F3n no se puede marcar como cr\u00EDtica. "}, {"Odd.number.of.hex.digits.found.", "Se ha encontrado un n\u00FAmero impar de d\u00EDgitos hexadecimales: "}, {"Unknown.extension.type.", "Tipo de extensi\u00F3n desconocida: "}, - {"command.{0}.is.ambiguous.", "El comando {0} es ambiguo:"} + {"command.{0}.is.ambiguous.", "El comando {0} es ambiguo:"}, + + // 8171319: keytool should print out warnings when reading or + // generating cert/cert req using weak algorithms + {"the.certificate.request", "La solicitud de certificado"}, + {"the.issuer", "El emisor"}, + {"the.generated.certificate", "El certificado generado"}, + {"the.generated.crl", "La CRL generada"}, + {"the.generated.certificate.request", "La solicitud de certificado generada"}, + {"the.certificate", "El certificado"}, + {"the.crl", "La CRL"}, + {"the.tsa.certificate", "El certificado de TSA"}, + {"the.input", "La entrada"}, + {"reply", "Responder"}, + {"one.in.many", "%s #%d de %d"}, + {"alias.in.cacerts", "Emisor <%s> en cacerts"}, + {"alias.in.keystore", "Emisor <%s>"}, + {"with.weak", "%s (d\u00E9bil)"}, + {"key.bit", "Clave %s de %d bits"}, + {"key.bit.weak", "Clave %s de %d bits (d\u00E9bil)"}, + {".PATTERN.printX509Cert.with.weak", + "Propietario: {0}\nEmisor: {1}\nN\u00FAmero de serie: {2}\nV\u00E1lido desde: {3} hasta: {4}\nHuellas digitales del certificado:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\nNombre del algoritmo de firma: {8}\nAlgoritmo de clave p\u00FAblica de asunto: {9}\nVersi\u00F3n: {10}"}, + {"PKCS.10.with.weak", + "Solicitud de certificado PKCS #10 (Versi\u00F3n 1.0)\nAsunto: %s\nFormato: %s\nClave p\u00FAblica:%s\nAlgoritmo de firma: %s\n"}, + {"verified.by.s.in.s.weak", "Verificado por %s en %s con %s"}, + {"whose.sigalg.risk", "%s usa el algoritmo de firma %s, lo que se considera un riesgo de seguridad."}, + {"whose.key.risk", "%s usa %s, lo que se considera un riesgo de seguridad."}, + {"jks.storetype.warning", "El almac\u00E9n de claves %1$s utiliza un formato propietario. Se recomienda migrar a PKCS12, que es un formato est\u00E1ndar del sector que utiliza \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"."}, + {"migrate.keystore.warning", "Se ha migrado \"%1$s\" a %4$s. Se ha realizado la copia de seguridad del almac\u00E9n de claves %2$s como \"%3$s\"."}, + {"backup.keystore.warning", "La copia de seguridad del almac\u00E9n de claves \"%1$s\" se ha realizado como \"%3$s\"..."}, + {"importing.keystore.status", "Importando el almac\u00E9n de claves de %1$s a %2$s..."}, };
--- a/src/share/classes/sun/security/tools/keytool/Resources_fr.java Fri Sep 29 14:28:55 2017 -0400 +++ b/src/share/classes/sun/security/tools/keytool/Resources_fr.java Sun Oct 01 11:49:32 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2017, 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 @@ -345,8 +345,6 @@ {"Enter.alias.name.", "Indiquez le nom d'alias : "}, {".RETURN.if.same.as.for.otherAlias.", "\t(appuyez sur Entr\u00E9e si le r\u00E9sultat est identique \u00E0 <{0}>)"}, - {".PATTERN.printX509Cert", - "Propri\u00E9taire : {0}\nEmetteur : {1}\nNum\u00E9ro de s\u00E9rie : {2}\nValide du : {3} au : {4}\nEmpreintes du certificat :\n\t MD5: {5}\n\t SHA1 : {6}\n\t SHA256 : {7}\n\t Nom de l''algorithme de signature : {8}\n\t Version : {9}"}, {"What.is.your.first.and.last.name.", "Quels sont vos nom et pr\u00E9nom ?"}, {"What.is.the.name.of.your.organizational.unit.", @@ -409,15 +407,12 @@ {"Please.provide.keysize.for.secret.key.generation", "Indiquez -keysize pour la g\u00E9n\u00E9ration de la cl\u00E9 secr\u00E8te"}, - {"verified.by.s.in.s", "V\u00E9rifi\u00E9 par %s dans %s"}, {"warning.not.verified.make.sure.keystore.is.correct", "AVERTISSEMENT : non v\u00E9rifi\u00E9. Assurez-vous que -keystore est correct."}, {"Extensions.", "Extensions\u00A0: "}, {".Empty.value.", "(Valeur vide)"}, {"Extension.Request.", "Demande d'extension :"}, - {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.", - "Demande de certificat PKCS #10 (version 1.0)\nSujet : %s\nCl\u00E9 publique : format %s pour la cl\u00E9 %s\n"}, {"Unknown.keyUsage.type.", "Type keyUsage inconnu : "}, {"Unknown.extendedkeyUsage.type.", "Type extendedkeyUsage inconnu : "}, {"Unknown.AccessDescription.type.", "Type AccessDescription inconnu : "}, @@ -426,7 +421,37 @@ "Cette extension ne peut pas \u00EAtre marqu\u00E9e comme critique. "}, {"Odd.number.of.hex.digits.found.", "Nombre impair de chiffres hexad\u00E9cimaux trouv\u00E9 : "}, {"Unknown.extension.type.", "Type d'extension inconnu : "}, - {"command.{0}.is.ambiguous.", "commande {0} ambigu\u00EB :"} + {"command.{0}.is.ambiguous.", "commande {0} ambigu\u00EB :"}, + + // 8171319: keytool should print out warnings when reading or + // generating cert/cert req using weak algorithms + {"the.certificate.request", "Demande de certificat"}, + {"the.issuer", "Emetteur"}, + {"the.generated.certificate", "Certificat g\u00E9n\u00E9r\u00E9"}, + {"the.generated.crl", "Liste des certificats r\u00E9voqu\u00E9s g\u00E9n\u00E9r\u00E9e"}, + {"the.generated.certificate.request", "Demande de certificat g\u00E9n\u00E9r\u00E9"}, + {"the.certificate", "Certificat"}, + {"the.crl", "Liste de certificats r\u00E9voqu\u00E9s"}, + {"the.tsa.certificate", "Certificat TSA"}, + {"the.input", "Entr\u00E9e"}, + {"reply", "R\u00E9pondre"}, + {"one.in.many", "%s #%d sur %d"}, + {"alias.in.cacerts", "Emetteur <%s> dans les certificats CA"}, + {"alias.in.keystore", "Emetteur <%s>"}, + {"with.weak", "%s (faible)"}, + {"key.bit", "Cl\u00E9 %s %d bits"}, + {"key.bit.weak", "Cl\u00E9 %s %d bits (faible)"}, + {".PATTERN.printX509Cert.with.weak", + "Propri\u00E9taire : {0}\nEmetteur : {1}\nNum\u00E9ro de s\u00E9rie : {2}\nValide du : {3} au : {4}\nEmpreintes du certificat :\n\t MD5 : {5}\n\t SHA1 : {6}\n\t SHA256 : {7}\nNom de l''algorithme de signature : {8}\nAlgorithme de cl\u00E9 publique du sujet : {9}\nVersion : {10}"}, + {"PKCS.10.with.weak", + "Demande de certificat PKCS #10 (version 1.0)\nSujet : %s\nFormat : %s\nCl\u00E9 publique : %s\nAlgorithme de signature : %s\n"}, + {"verified.by.s.in.s.weak", "V\u00E9rifi\u00E9 par %s dans %s avec un \u00E9l\u00E9ment %s"}, + {"whose.sigalg.risk", "%s utilise l'algorithme de signature %s, qui repr\u00E9sente un risque pour la s\u00E9curit\u00E9."}, + {"whose.key.risk", "%s utilise un \u00E9l\u00E9ment %s, qui repr\u00E9sente un risque pour la s\u00E9curit\u00E9."}, + {"jks.storetype.warning", "Le fichier de cl\u00E9s %1$s utilise un format propri\u00E9taire. Il est recommand\u00E9 de migrer vers PKCS12, qui est un format standard de l'industrie en utilisant \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"."}, + {"migrate.keystore.warning", "El\u00E9ment \"%1$s\" migr\u00E9 vers %4$s. Le fichier de cl\u00E9s %2$s est sauvegard\u00E9 en tant que \"%3$s\"."}, + {"backup.keystore.warning", "Le fichier de cl\u00E9s d'origine \"%1$s\" est sauvegard\u00E9 en tant que \"%3$s\"..."}, + {"importing.keystore.status", "Import du fichier de cl\u00E9s %1$s vers %2$s..."}, };
--- a/src/share/classes/sun/security/tools/keytool/Resources_it.java Fri Sep 29 14:28:55 2017 -0400 +++ b/src/share/classes/sun/security/tools/keytool/Resources_it.java Sun Oct 01 11:49:32 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2017, 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 @@ -345,8 +345,6 @@ {"Enter.alias.name.", "Immettere nome alias: "}, {".RETURN.if.same.as.for.otherAlias.", "\t(INVIO se corrisponde al nome di <{0}>)"}, - {".PATTERN.printX509Cert", - "Proprietario: {0}\nAutorit\u00E0 emittente: {1}\nNumero di serie: {2}\nValido da: {3} a: {4}\nImpronte digitali certificato:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Nome algoritmo firma: {8}\n\t Versione: {9}"}, {"What.is.your.first.and.last.name.", "Specificare nome e cognome"}, {"What.is.the.name.of.your.organizational.unit.", @@ -409,15 +407,12 @@ {"Please.provide.keysize.for.secret.key.generation", "Specificare il valore -keysize per la generazione della chiave segreta"}, - {"verified.by.s.in.s", "Verificato da %s in %s"}, {"warning.not.verified.make.sure.keystore.is.correct", "AVVERTENZA: non verificato. Assicurarsi che -keystore sia corretto."}, {"Extensions.", "Estensioni: "}, {".Empty.value.", "(valore vuoto)"}, {"Extension.Request.", "Richiesta di estensione:"}, - {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.", - "Richiesta di certificato PKCS #10 (versione 1.0)\nOggetto: %s\nChiave pubblica: %s formato %s chiave\n"}, {"Unknown.keyUsage.type.", "Tipo keyUsage sconosciuto: "}, {"Unknown.extendedkeyUsage.type.", "Tipo extendedkeyUsage sconosciuto: "}, {"Unknown.AccessDescription.type.", "Tipo AccessDescription sconosciuto: "}, @@ -426,7 +421,37 @@ "Impossibile contrassegnare questa estensione come critica. "}, {"Odd.number.of.hex.digits.found.", "\u00C8 stato trovato un numero dispari di cifre esadecimali: "}, {"Unknown.extension.type.", "Tipo di estensione sconosciuto: "}, - {"command.{0}.is.ambiguous.", "il comando {0} \u00E8 ambiguo:"} + {"command.{0}.is.ambiguous.", "il comando {0} \u00E8 ambiguo:"}, + + // 8171319: keytool should print out warnings when reading or + // generating cert/cert req using weak algorithms + {"the.certificate.request", "La richiesta di certificato"}, + {"the.issuer", "L'emittente"}, + {"the.generated.certificate", "Il certificato generato"}, + {"the.generated.crl", "La CRL generata"}, + {"the.generated.certificate.request", "La richiesta di certificato generata"}, + {"the.certificate", "Il certificato"}, + {"the.crl", "La CRL"}, + {"the.tsa.certificate", "Il certificato TSA"}, + {"the.input", "L'input"}, + {"reply", "Rispondi"}, + {"one.in.many", "%s #%d di %d"}, + {"alias.in.cacerts", "Emittente <%s> in cacerts"}, + {"alias.in.keystore", "Emittente <%s>"}, + {"with.weak", "%s (debole)"}, + {"key.bit", "Chiave %s a %d bit"}, + {"key.bit.weak", "Chiave %s a %d bit (debole)"}, + {".PATTERN.printX509Cert.with.weak", + "Proprietario: {0}\nEmittente: {1}\nNumero di serie: {2}\nValido da: {3} a: {4}\nImpronte certificato:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\nNome algoritmo firma: {8}\nAlgoritmo di chiave pubblica oggetto: {9}\nVersione: {10}"}, + {"PKCS.10.with.weak", + "Richiesta di certificato PKCS #10 (versione 1.0)\nOggetto: %s\nFormato: %s\nChiave pubblica: %s\nAlgoritmo firma: %s\n"}, + {"verified.by.s.in.s.weak", "Verificato da %s in %s con un %s"}, + {"whose.sigalg.risk", "%s utilizza l'algoritmo firma %s che \u00E8 considerato un rischio per la sicurezza."}, + {"whose.key.risk", "%s utilizza un %s che \u00E8 considerato un rischio per la sicurezza."}, + {"jks.storetype.warning", "Il keystore %1$s utilizza un formato proprietario. Si consiglia di eseguire la migrazione a PKCS12, un formato standard di settore, utilizzando il comando \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"."}, + {"migrate.keystore.warning", "Migrazione di \"%1$s\" in %4$s eseguita. Backup del keystore %2$s eseguito con il nome \"%3$s\"."}, + {"backup.keystore.warning", "Backup del keystore originale \"%1$s\" eseguito con il nome \"%3$s\"..."}, + {"importing.keystore.status", "Importazione del keystore %1$s in %2$s in corso..."}, };
--- a/src/share/classes/sun/security/tools/keytool/Resources_ja.java Fri Sep 29 14:28:55 2017 -0400 +++ b/src/share/classes/sun/security/tools/keytool/Resources_ja.java Sun Oct 01 11:49:32 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2017, 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 @@ -345,8 +345,6 @@ {"Enter.alias.name.", "\u5225\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "}, {".RETURN.if.same.as.for.otherAlias.", "\t(<{0}>\u3068\u540C\u3058\u5834\u5408\u306FRETURN\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044)"}, - {".PATTERN.printX509Cert", - "\u6240\u6709\u8005: {0}\n\u767A\u884C\u8005: {1}\n\u30B7\u30EA\u30A2\u30EB\u756A\u53F7: {2}\n\u6709\u52B9\u671F\u9593\u306E\u958B\u59CB\u65E5: {3}\u7D42\u4E86\u65E5: {4}\n\u8A3C\u660E\u66F8\u306E\u30D5\u30A3\u30F3\u30AC\u30D7\u30EA\u30F3\u30C8:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t \u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u540D: {8}\n\t \u30D0\u30FC\u30B8\u30E7\u30F3: {9}"}, {"What.is.your.first.and.last.name.", "\u59D3\u540D\u306F\u4F55\u3067\u3059\u304B\u3002"}, {"What.is.the.name.of.your.organizational.unit.", @@ -409,15 +407,12 @@ {"Please.provide.keysize.for.secret.key.generation", "\u79D8\u5BC6\u9375\u306E\u751F\u6210\u6642\u306B\u306F -keysize\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044"}, - {"verified.by.s.in.s", "%s(%s\u5185)\u306B\u3088\u308A\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F"}, {"warning.not.verified.make.sure.keystore.is.correct", "\u8B66\u544A: \u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002-keystore\u304C\u6B63\u3057\u3044\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002"}, {"Extensions.", "\u62E1\u5F35: "}, {".Empty.value.", "(\u7A7A\u306E\u5024)"}, {"Extension.Request.", "\u62E1\u5F35\u30EA\u30AF\u30A8\u30B9\u30C8:"}, - {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.", - "PKCS #10\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8(\u30D0\u30FC\u30B8\u30E7\u30F31.0)\n\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8: %s\n\u516C\u958B\u9375: %s \u30D5\u30A9\u30FC\u30DE\u30C3\u30C8 %s \u30AD\u30FC\n"}, {"Unknown.keyUsage.type.", "\u4E0D\u660E\u306AkeyUsage\u30BF\u30A4\u30D7: "}, {"Unknown.extendedkeyUsage.type.", "\u4E0D\u660E\u306AextendedkeyUsage\u30BF\u30A4\u30D7: "}, {"Unknown.AccessDescription.type.", "\u4E0D\u660E\u306AAccessDescription\u30BF\u30A4\u30D7: "}, @@ -426,7 +421,37 @@ "\u3053\u306E\u62E1\u5F35\u306F\u30AF\u30EA\u30C6\u30A3\u30AB\u30EB\u3068\u3057\u3066\u30DE\u30FC\u30AF\u4ED8\u3051\u3067\u304D\u307E\u305B\u3093\u3002 "}, {"Odd.number.of.hex.digits.found.", "\u5947\u6570\u306E16\u9032\u6570\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: "}, {"Unknown.extension.type.", "\u4E0D\u660E\u306A\u62E1\u5F35\u30BF\u30A4\u30D7: "}, - {"command.{0}.is.ambiguous.", "\u30B3\u30DE\u30F3\u30C9{0}\u306F\u3042\u3044\u307E\u3044\u3067\u3059:"} + {"command.{0}.is.ambiguous.", "\u30B3\u30DE\u30F3\u30C9{0}\u306F\u3042\u3044\u307E\u3044\u3067\u3059:"}, + + // 8171319: keytool should print out warnings when reading or + // generating cert/cert req using weak algorithms + {"the.certificate.request", "\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8"}, + {"the.issuer", "\u767A\u884C\u8005"}, + {"the.generated.certificate", "\u751F\u6210\u3055\u308C\u305F\u8A3C\u660E\u66F8"}, + {"the.generated.crl", "\u751F\u6210\u3055\u308C\u305FCRL"}, + {"the.generated.certificate.request", "\u751F\u6210\u3055\u308C\u305F\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8"}, + {"the.certificate", "\u8A3C\u660E\u66F8"}, + {"the.crl", "CRL"}, + {"the.tsa.certificate", "TSA\u8A3C\u660E\u66F8"}, + {"the.input", "\u5165\u529B"}, + {"reply", "\u5FDC\u7B54"}, + {"one.in.many", "%s #%d / %d"}, + {"alias.in.cacerts", "cacerts\u5185\u306E\u767A\u884C\u8005<%s>"}, + {"alias.in.keystore", "\u767A\u884C\u8005<%s>"}, + {"with.weak", "%s (\u5F31)"}, + {"key.bit", "%d\u30D3\u30C3\u30C8%s\u9375"}, + {"key.bit.weak", "%d\u30D3\u30C3\u30C8%s\u9375(\u5F31)"}, + {".PATTERN.printX509Cert.with.weak", + "\u6240\u6709\u8005: {0}\n\u767A\u884C\u8005: {1}\n\u30B7\u30EA\u30A2\u30EB\u756A\u53F7: {2}\n\u6709\u52B9\u671F\u9593\u306E\u958B\u59CB\u65E5: {3} \u7D42\u4E86\u65E5: {4}\n\u8A3C\u660E\u66F8\u306E\u30D5\u30A3\u30F3\u30AC\u30D7\u30EA\u30F3\u30C8:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u540D: {8}\n\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u516C\u958B\u9375\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0: {9}\n\u30D0\u30FC\u30B8\u30E7\u30F3: {10}"}, + {"PKCS.10.with.weak", + "PKCS #10\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8(\u30D0\u30FC\u30B8\u30E7\u30F31.0)\n\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8: %s\n\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8 %s\n\u516C\u958B\u9375: %s\n\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0: %s\n"}, + {"verified.by.s.in.s.weak", "%s(%s\u5185)\u306B\u3088\u308A%s\u3067\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F"}, + {"whose.sigalg.risk", "%s\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u308B%s\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002"}, + {"whose.key.risk", "%s\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u308B%s\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002"}, + {"jks.storetype.warning", "%1$s\u30AD\u30FC\u30B9\u30C8\u30A2\u306F\u72EC\u81EA\u306E\u5F62\u5F0F\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002\"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"\u3092\u4F7F\u7528\u3059\u308B\u696D\u754C\u6A19\u6E96\u306E\u5F62\u5F0F\u3067\u3042\u308BPKCS12\u306B\u79FB\u884C\u3059\u308B\u3053\u3068\u3092\u304A\u85A6\u3081\u3057\u307E\u3059\u3002"}, + {"migrate.keystore.warning", "\"%1$s\"\u304C%4$s\u306B\u79FB\u884C\u3055\u308C\u307E\u3057\u305F\u3002%2$s\u30AD\u30FC\u30B9\u30C8\u30A2\u306F\"%3$s\"\u3068\u3057\u3066\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3055\u308C\u307E\u3059\u3002"}, + {"backup.keystore.warning", "\u5143\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\"%1$s\"\u306F\"%3$s\"\u3068\u3057\u3066\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3055\u308C\u307E\u3059..."}, + {"importing.keystore.status", "\u30AD\u30FC\u30B9\u30C8\u30A2%1$s\u3092%2$s\u306B\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u3059..."}, };
--- a/src/share/classes/sun/security/tools/keytool/Resources_ko.java Fri Sep 29 14:28:55 2017 -0400 +++ b/src/share/classes/sun/security/tools/keytool/Resources_ko.java Sun Oct 01 11:49:32 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2017, 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 @@ -345,8 +345,6 @@ {"Enter.alias.name.", "\uBCC4\uCE6D \uC774\uB984 \uC785\uB825: "}, {".RETURN.if.same.as.for.otherAlias.", "\t(<{0}>\uACFC(\uC640) \uB3D9\uC77C\uD55C \uACBD\uC6B0 Enter \uD0A4\uB97C \uB204\uB984)"}, - {".PATTERN.printX509Cert", - "\uC18C\uC720\uC790: {0}\n\uBC1C\uD589\uC790: {1}\n\uC77C\uB828 \uBC88\uD638: {2}\n\uC801\uD569\uD55C \uC2DC\uC791 \uB0A0\uC9DC: {3}, \uC885\uB8CC \uB0A0\uC9DC: {4}\n\uC778\uC99D\uC11C \uC9C0\uBB38:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t \uC11C\uBA85 \uC54C\uACE0\uB9AC\uC998 \uC774\uB984: {8}\n\t \uBC84\uC804: {9}"}, {"What.is.your.first.and.last.name.", "\uC774\uB984\uACFC \uC131\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624."}, {"What.is.the.name.of.your.organizational.unit.", @@ -409,15 +407,12 @@ {"Please.provide.keysize.for.secret.key.generation", "\uBCF4\uC548 \uD0A4\uB97C \uC0DD\uC131\uD558\uB824\uBA74 -keysize\uB97C \uC81C\uACF5\uD558\uC2ED\uC2DC\uC624."}, - {"verified.by.s.in.s", "%s(%s)\uC5D0 \uC758\uD574 \uD655\uC778\uB428"}, {"warning.not.verified.make.sure.keystore.is.correct", "\uACBD\uACE0: \uD655\uC778\uB418\uC9C0 \uC54A\uC74C. -keystore\uAC00 \uC62C\uBC14\uB978\uC9C0 \uD655\uC778\uD558\uC2ED\uC2DC\uC624."}, {"Extensions.", "\uD655\uC7A5: "}, {".Empty.value.", "(\uBE44\uC5B4 \uC788\uB294 \uAC12)"}, {"Extension.Request.", "\uD655\uC7A5 \uC694\uCCAD:"}, - {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.", - "PKCS #10 \uC778\uC99D\uC11C \uC694\uCCAD(1.0 \uBC84\uC804)\n\uC81C\uBAA9: %s\n\uACF5\uC6A9 \uD0A4: %s \uD615\uC2DD %s \uD0A4\n"}, {"Unknown.keyUsage.type.", "\uC54C \uC218 \uC5C6\uB294 keyUsage \uC720\uD615: "}, {"Unknown.extendedkeyUsage.type.", "\uC54C \uC218 \uC5C6\uB294 extendedkeyUsage \uC720\uD615: "}, {"Unknown.AccessDescription.type.", "\uC54C \uC218 \uC5C6\uB294 AccessDescription \uC720\uD615: "}, @@ -426,7 +421,37 @@ "\uC774 \uD655\uC7A5\uC740 \uC911\uC694\uD55C \uAC83\uC73C\uB85C \uD45C\uC2DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. "}, {"Odd.number.of.hex.digits.found.", "\uD640\uC218 \uAC1C\uC758 16\uC9C4\uC218\uAC00 \uBC1C\uACAC\uB428: "}, {"Unknown.extension.type.", "\uC54C \uC218 \uC5C6\uB294 \uD655\uC7A5 \uC720\uD615: "}, - {"command.{0}.is.ambiguous.", "{0} \uBA85\uB839\uC774 \uBAA8\uD638\uD568:"} + {"command.{0}.is.ambiguous.", "{0} \uBA85\uB839\uC774 \uBAA8\uD638\uD568:"}, + + // 8171319: keytool should print out warnings when reading or + // generating cert/cert req using weak algorithms + {"the.certificate.request", "\uC778\uC99D\uC11C \uC694\uCCAD"}, + {"the.issuer", "\uBC1C\uD589\uC790"}, + {"the.generated.certificate", "\uC0DD\uC131\uB41C \uC778\uC99D\uC11C"}, + {"the.generated.crl", "\uC0DD\uC131\uB41C CRL"}, + {"the.generated.certificate.request", "\uC0DD\uC131\uB41C \uC778\uC99D\uC11C \uC694\uCCAD"}, + {"the.certificate", "\uC778\uC99D\uC11C"}, + {"the.crl", "CRL"}, + {"the.tsa.certificate", "TSA \uC778\uC99D\uC11C"}, + {"the.input", "\uC785\uB825"}, + {"reply", "\uD68C\uC2E0"}, + {"one.in.many", "%s #%d/%d"}, + {"alias.in.cacerts", "cacerts\uC758 <%s> \uBC1C\uD589\uC790"}, + {"alias.in.keystore", "<%s> \uBC1C\uD589\uC790"}, + {"with.weak", "%s(\uC57D\uD568)"}, + {"key.bit", "%d\uBE44\uD2B8 %s \uD0A4"}, + {"key.bit.weak", "%d\uBE44\uD2B8 %s \uD0A4(\uC57D\uD568)"}, + {".PATTERN.printX509Cert.with.weak", + "\uC18C\uC720\uC790: {0}\n\uBC1C\uD589\uC790: {1}\n\uC77C\uB828 \uBC88\uD638: {2}\n\uC801\uD569\uD55C \uC2DC\uC791 \uB0A0\uC9DC: {3} \uC885\uB8CC \uB0A0\uC9DC: {4}\n\uC778\uC99D\uC11C \uC9C0\uBB38:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\uC11C\uBA85 \uC54C\uACE0\uB9AC\uC998 \uC774\uB984: {8}\n\uC8FC\uCCB4 \uACF5\uC6A9 \uD0A4 \uC54C\uACE0\uB9AC\uC998: {9}\n\uBC84\uC804: {10}"}, + {"PKCS.10.with.weak", + "PKCS #10 \uC778\uC99D\uC11C \uC694\uCCAD(1.0 \uBC84\uC804)\n\uC81C\uBAA9: %s\n\uD615\uC2DD: %s\n\uACF5\uC6A9 \uD0A4: %s\n\uC11C\uBA85 \uC54C\uACE0\uB9AC\uC998: %s\n"}, + {"verified.by.s.in.s.weak", "%s\uC774(\uAC00) %s\uC5D0\uC11C %s\uC744(\uB97C) \uC0AC\uC6A9\uD558\uC5EC \uD655\uC778"}, + {"whose.sigalg.risk", "%s\uC774(\uAC00) \uBCF4\uC548 \uC704\uD5D8\uC73C\uB85C \uAC04\uC8FC\uB418\uB294 %s \uC11C\uBA85 \uC54C\uACE0\uB9AC\uC998\uC744 \uC0AC\uC6A9\uD569\uB2C8\uB2E4."}, + {"whose.key.risk", "%s\uC774(\uAC00) \uBCF4\uC548 \uC704\uD5D8\uC73C\uB85C \uAC04\uC8FC\uB418\uB294 %s\uC744(\uB97C) \uC0AC\uC6A9\uD569\uB2C8\uB2E4."}, + {"jks.storetype.warning", "%1$s \uD0A4 \uC800\uC7A5\uC18C\uB294 \uACE0\uC720 \uD615\uC2DD\uC744 \uC0AC\uC6A9\uD569\uB2C8\uB2E4. \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"\uB97C \uC0AC\uC6A9\uD558\uB294 \uC0B0\uC5C5 \uD45C\uC900 \uD615\uC2DD\uC778 PKCS12\uB85C \uC774\uC804\uD558\uB294 \uAC83\uC774 \uC88B\uC2B5\uB2C8\uB2E4."}, + {"migrate.keystore.warning", "\"%1$s\"\uC744(\uB97C) %4$s(\uC73C)\uB85C \uC774\uC804\uD588\uC2B5\uB2C8\uB2E4. %2$s \uD0A4 \uC800\uC7A5\uC18C\uAC00 \"%3$s\"(\uC73C)\uB85C \uBC31\uC5C5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."}, + {"backup.keystore.warning", "\uC6D0\uBCF8 \uD0A4 \uC800\uC7A5\uC18C \"%1$s\"\uC774(\uAC00) \"%3$s\"(\uC73C)\uB85C \uBC31\uC5C5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."}, + {"importing.keystore.status", "\uD0A4 \uC800\uC7A5\uC18C %1$s\uC744(\uB97C) %2$s(\uC73C)\uB85C \uC784\uD3EC\uD2B8\uD558\uB294 \uC911..."}, };
--- a/src/share/classes/sun/security/tools/keytool/Resources_pt_BR.java Fri Sep 29 14:28:55 2017 -0400 +++ b/src/share/classes/sun/security/tools/keytool/Resources_pt_BR.java Sun Oct 01 11:49:32 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2017, 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 @@ -345,8 +345,6 @@ {"Enter.alias.name.", "Informe o nome do alias: "}, {".RETURN.if.same.as.for.otherAlias.", "\t(RETURN se for igual ao de <{0}>)"}, - {".PATTERN.printX509Cert", - "Propriet\u00E1rio: {0}\nEmissor: {1}\nN\u00FAmero de s\u00E9rie: {2}\nV\u00E1lido de: {3} a: {4}\nFingerprints do certificado:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Nome do algoritmo de assinatura: {8}\n\t Vers\u00E3o: {9}"}, {"What.is.your.first.and.last.name.", "Qual \u00E9 o seu nome e o seu sobrenome?"}, {"What.is.the.name.of.your.organizational.unit.", @@ -409,15 +407,12 @@ {"Please.provide.keysize.for.secret.key.generation", "Forne\u00E7a o -keysize para a gera\u00E7\u00E3o da chave secreta"}, - {"verified.by.s.in.s", "Verificado por %s em %s"}, {"warning.not.verified.make.sure.keystore.is.correct", "ADVERT\u00CANCIA: n\u00E3o verificado. Certifique-se que -keystore esteja correto."}, {"Extensions.", "Extens\u00F5es: "}, {".Empty.value.", "(Valor vazio)"}, {"Extension.Request.", "Solicita\u00E7\u00E3o de Extens\u00E3o:"}, - {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.", - "Solicita\u00E7\u00E3o do Certificado PKCS #10 (Vers\u00E3o 1.0)\nAssunto: %s\nChave P\u00FAblica: %s formato %s chave\n"}, {"Unknown.keyUsage.type.", "Tipo de keyUsage desconhecido: "}, {"Unknown.extendedkeyUsage.type.", "Tipo de extendedkeyUsage desconhecido: "}, {"Unknown.AccessDescription.type.", "Tipo de AccessDescription desconhecido: "}, @@ -426,7 +421,37 @@ "Esta extens\u00E3o n\u00E3o pode ser marcada como cr\u00EDtica. "}, {"Odd.number.of.hex.digits.found.", "Encontrado n\u00FAmero \u00EDmpar de seis d\u00EDgitos: "}, {"Unknown.extension.type.", "Tipo de extens\u00E3o desconhecido: "}, - {"command.{0}.is.ambiguous.", "o comando {0} \u00E9 amb\u00EDguo:"} + {"command.{0}.is.ambiguous.", "o comando {0} \u00E9 amb\u00EDguo:"}, + + // 8171319: keytool should print out warnings when reading or + // generating cert/cert req using weak algorithms + {"the.certificate.request", "A solicita\u00E7\u00E3o do certificado"}, + {"the.issuer", "O emissor"}, + {"the.generated.certificate", "O certificado gerado"}, + {"the.generated.crl", "A CRL gerada"}, + {"the.generated.certificate.request", "A solicita\u00E7\u00E3o do certificado gerada"}, + {"the.certificate", "O certificado"}, + {"the.crl", "A CRL"}, + {"the.tsa.certificate", "O certificado TSA"}, + {"the.input", "A entrada"}, + {"reply", "Resposta"}, + {"one.in.many", "%s #%d de %d"}, + {"alias.in.cacerts", "Emissor <%s> no cacerts"}, + {"alias.in.keystore", "Emissor <%s>"}, + {"with.weak", "%s (fraca)"}, + {"key.bit", "Chave %s de %d bits"}, + {"key.bit.weak", "Chave %s de %d bits (fraca)"}, + {".PATTERN.printX509Cert.with.weak", + "Propriet\u00E1rio: {0}\nEmissor: {1}\nN\u00FAmero de s\u00E9rie: {2}\nV\u00E1lido de {3} at\u00E9 {4}\nFingerprints do certificado:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\nNome do algoritmo de assinatura: {8}\nAlgoritmo de Chave P\u00FAblica do Assunto: {9}\nVers\u00E3o: {10}"}, + {"PKCS.10.with.weak", + "Solicita\u00E7\u00E3o do Certificado PKCS #10 (Vers\u00E3o 1.0)\nAssunto: %s\nFormato: %s\nChave P\u00FAblica: %s\nAlgoritmo de assinatura: %s\n"}, + {"verified.by.s.in.s.weak", "Verificado por %s em %s com um %s"}, + {"whose.sigalg.risk", "%s usa o algoritmo de assinatura %s que \u00E9 considerado um risco \u00E0 seguran\u00E7a."}, + {"whose.key.risk", "%s usa um %s que \u00E9 considerado um risco \u00E0 seguran\u00E7a."}, + {"jks.storetype.warning", "O armazenamento de chaves %1$s usa um formato propriet\u00E1rio. \u00C9 recomendada a migra\u00E7\u00E3o para PKCS12, que \u00E9 um formato de padr\u00E3o industrial que usa \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"."}, + {"migrate.keystore.warning", "\"%1$s\" foi migrado para %4$s. O backup do armazenamento de chaves %2$s \u00E9 feito como \"%3$s\"."}, + {"backup.keystore.warning", "O backup do armazenamento de chaves original \"%1$s\" \u00E9 feito como \"%3$s\"..."}, + {"importing.keystore.status", "Importando armazenamento de chaves %1$s to %2$s..."}, };
--- a/src/share/classes/sun/security/tools/keytool/Resources_sv.java Fri Sep 29 14:28:55 2017 -0400 +++ b/src/share/classes/sun/security/tools/keytool/Resources_sv.java Sun Oct 01 11:49:32 2017 -0700 @@ -345,8 +345,6 @@ {"Enter.alias.name.", "Ange aliasnamn: "}, {".RETURN.if.same.as.for.otherAlias.", "\t(RETURN om det \u00E4r det samma som f\u00F6r <{0}>)"}, - {".PATTERN.printX509Cert", - "\u00C4gare: {0}\nUtf\u00E4rdare: {1}\nSerienummer: {2}\nGiltigt fr\u00E5n den: {3} till: {4}\nCertifikatets fingeravtryck:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Namn p\u00E5 signaturalgoritm: {8}\n\t Version: {9}"}, {"What.is.your.first.and.last.name.", "Vad heter du i f\u00F6r- och efternamn?"}, {"What.is.the.name.of.your.organizational.unit.", @@ -409,15 +407,12 @@ {"Please.provide.keysize.for.secret.key.generation", "Ange -keysize f\u00F6r att skapa hemlig nyckel"}, - {"verified.by.s.in.s", "Verifierad av %s i %s"}, {"warning.not.verified.make.sure.keystore.is.correct", "VARNING: ej verifierad. Se till att -nyckellager \u00E4r korrekt."}, {"Extensions.", "Till\u00E4gg: "}, {".Empty.value.", "(Tomt v\u00E4rde)"}, {"Extension.Request.", "Till\u00E4ggsbeg\u00E4ran:"}, - {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.", - "PKCS #10 certifikatbeg\u00E4ran (version 1.0)\n\u00C4rende: %s\n\u00D6ppen nyckel: %s-format %s-nyckel\n"}, {"Unknown.keyUsage.type.", "Ok\u00E4nd keyUsage-typ: "}, {"Unknown.extendedkeyUsage.type.", "Ok\u00E4nd extendedkeyUsage-typ: "}, {"Unknown.AccessDescription.type.", "Ok\u00E4nd AccessDescription-typ: "}, @@ -426,7 +421,37 @@ "Detta till\u00E4gg kan inte markeras som kritiskt. "}, {"Odd.number.of.hex.digits.found.", "Udda antal hex-siffror p\u00E5tr\u00E4ffades: "}, {"Unknown.extension.type.", "Ok\u00E4nd till\u00E4ggstyp: "}, - {"command.{0}.is.ambiguous.", "kommandot {0} \u00E4r tvetydigt:"} + {"command.{0}.is.ambiguous.", "kommandot {0} \u00E4r tvetydigt:"}, + + // 8171319: keytool should print out warnings when reading or + // generating cert/cert req using weak algorithms + {"the.certificate.request", "Certifikatbeg\u00E4ran"}, + {"the.issuer", "Utf\u00E4rdaren"}, + {"the.generated.certificate", "Det genererade certifikatet"}, + {"the.generated.crl", "Den genererade listan \u00F6ver \u00E5terkallade certifikat"}, + {"the.generated.certificate.request", "Den genererade certifikatbeg\u00E4ran"}, + {"the.certificate", "Certifikatet"}, + {"the.crl", "Listan \u00F6ver \u00E5terkallade certifikat"}, + {"the.tsa.certificate", "TSA-certifikatet"}, + {"the.input", "Indata"}, + {"reply", "Svar"}, + {"one.in.many", "%s %d av %d"}, + {"alias.in.cacerts", "Utf\u00E4rdaren <%s> i cacerts"}, + {"alias.in.keystore", "Utf\u00E4rdaren <%s>"}, + {"with.weak", "%s (svag)"}, + {"key.bit", "%d-bitars %s-nyckel"}, + {"key.bit.weak", "%d-bitars %s-nyckel (svag)"}, + {".PATTERN.printX509Cert.with.weak", + "\u00C4gare: {0}\nUtf\u00E4rdare: {1}\nSerienummer: {2}\nGiltigt fr\u00E5n: {3}, till: {4}\nCertifikatfingeravtryck:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\nSignaturalgoritmnamn: {8}\nAlgoritm f\u00F6r \u00E4mne f\u00F6r \u00F6ppen nyckel: {9}\nVersion: {10}"}, + {"PKCS.10.with.weak", + "PKCS #10-certifikatbeg\u00E4ran (version 1.0)\n\u00C4mne: %s\nFormat: %s\n\u00D6ppen nyckel: %s\nSignaturalgoritm: %s\n"}, + {"verified.by.s.in.s.weak", "Verifierades av %s i %s med en %s"}, + {"whose.sigalg.risk", "%s anv\u00E4nder signaturalgoritmen %s, vilket anses utg\u00F6ra en s\u00E4kerhetsrisk."}, + {"whose.key.risk", "%s anv\u00E4nder en %s, vilket anses utg\u00F6ra en s\u00E4kerhetsrisk."}, + {"jks.storetype.warning", "Nyckellagret %1$s anv\u00E4nder ett propriet\u00E4rt format. Du b\u00F6r migrera till PKCS12, som \u00E4r ett branschstandardformat, med \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"."}, + {"migrate.keystore.warning", "Migrerade \"%1$s\" till %4$s. Nyckellagret %2$s s\u00E4kerhetskopierades som \"%3$s\"."}, + {"backup.keystore.warning", "Det ursprungliga nyckellagret, \"%1$s\", s\u00E4kerhetskopieras som \"%3$s\"..."}, + {"importing.keystore.status", "Importerar nyckellagret %1$s till %2$s..."}, };
--- a/src/share/classes/sun/security/tools/keytool/Resources_zh_CN.java Fri Sep 29 14:28:55 2017 -0400 +++ b/src/share/classes/sun/security/tools/keytool/Resources_zh_CN.java Sun Oct 01 11:49:32 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2017, 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 @@ -345,8 +345,6 @@ {"Enter.alias.name.", "\u8F93\u5165\u522B\u540D: "}, {".RETURN.if.same.as.for.otherAlias.", "\t(\u5982\u679C\u548C <{0}> \u76F8\u540C, \u5219\u6309\u56DE\u8F66)"}, - {".PATTERN.printX509Cert", - "\u6240\u6709\u8005: {0}\n\u53D1\u5E03\u8005: {1}\n\u5E8F\u5217\u53F7: {2}\n\u6709\u6548\u671F\u5F00\u59CB\u65E5\u671F: {3}, \u622A\u6B62\u65E5\u671F: {4}\n\u8BC1\u4E66\u6307\u7EB9:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t \u7B7E\u540D\u7B97\u6CD5\u540D\u79F0: {8}\n\t \u7248\u672C: {9}"}, {"What.is.your.first.and.last.name.", "\u60A8\u7684\u540D\u5B57\u4E0E\u59D3\u6C0F\u662F\u4EC0\u4E48?"}, {"What.is.the.name.of.your.organizational.unit.", @@ -409,15 +407,12 @@ {"Please.provide.keysize.for.secret.key.generation", "\u8BF7\u63D0\u4F9B -keysize \u4EE5\u751F\u6210\u5BC6\u94A5"}, - {"verified.by.s.in.s", "\u7531 %s \u9A8C\u8BC1(\u5728 %s \u4E2D)"}, {"warning.not.verified.make.sure.keystore.is.correct", "\u8B66\u544A: \u672A\u9A8C\u8BC1\u3002\u8BF7\u786E\u4FDD\u5BC6\u94A5\u5E93\u662F\u6B63\u786E\u7684\u3002"}, {"Extensions.", "\u6269\u5C55: "}, {".Empty.value.", "(\u7A7A\u503C)"}, {"Extension.Request.", "\u6269\u5C55\u8BF7\u6C42:"}, - {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.", - "PKCS #10 \u8BC1\u4E66\u8BF7\u6C42 (\u7248\u672C 1.0)\n\u4E3B\u9898: %s\n\u516C\u5171\u5BC6\u94A5: %s \u683C\u5F0F %s \u5BC6\u94A5\n"}, {"Unknown.keyUsage.type.", "\u672A\u77E5 keyUsage \u7C7B\u578B: "}, {"Unknown.extendedkeyUsage.type.", "\u672A\u77E5 extendedkeyUsage \u7C7B\u578B: "}, {"Unknown.AccessDescription.type.", "\u672A\u77E5 AccessDescription \u7C7B\u578B: "}, @@ -426,7 +421,37 @@ "\u65E0\u6CD5\u5C06\u6B64\u6269\u5C55\u6807\u8BB0\u4E3A\u201C\u4E25\u91CD\u201D\u3002"}, {"Odd.number.of.hex.digits.found.", "\u627E\u5230\u5947\u6570\u4E2A\u5341\u516D\u8FDB\u5236\u6570\u5B57: "}, {"Unknown.extension.type.", "\u672A\u77E5\u6269\u5C55\u7C7B\u578B: "}, - {"command.{0}.is.ambiguous.", "\u547D\u4EE4{0}\u4E0D\u660E\u786E:"} + {"command.{0}.is.ambiguous.", "\u547D\u4EE4{0}\u4E0D\u660E\u786E:"}, + + // 8171319: keytool should print out warnings when reading or + // generating cert/cert req using weak algorithms + {"the.certificate.request", "\u8BC1\u4E66\u8BF7\u6C42"}, + {"the.issuer", "\u53D1\u5E03\u8005"}, + {"the.generated.certificate", "\u751F\u6210\u7684\u8BC1\u4E66"}, + {"the.generated.crl", "\u751F\u6210\u7684 CRL"}, + {"the.generated.certificate.request", "\u751F\u6210\u7684\u8BC1\u4E66\u8BF7\u6C42"}, + {"the.certificate", "\u8BC1\u4E66"}, + {"the.crl", "CRL"}, + {"the.tsa.certificate", "TSA \u8BC1\u4E66"}, + {"the.input", "\u8F93\u5165"}, + {"reply", "\u56DE\u590D"}, + {"one.in.many", "%s #%d/%d"}, + {"alias.in.cacerts", "cacerts \u4E2D\u7684\u53D1\u5E03\u8005 <%s>"}, + {"alias.in.keystore", "\u53D1\u5E03\u8005 <%s>"}, + {"with.weak", "%s (\u5F31)"}, + {"key.bit", "%d \u4F4D %s \u5BC6\u94A5"}, + {"key.bit.weak", "%d \u4F4D %s \u5BC6\u94A5 (\u5F31)"}, + {".PATTERN.printX509Cert.with.weak", + "\u6240\u6709\u8005: {0}\n\u53D1\u5E03\u8005: {1}\n\u5E8F\u5217\u53F7: {2}\n\u6709\u6548\u671F\u4E3A {3} \u81F3 {4}\n\u8BC1\u4E66\u6307\u7EB9:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\u7B7E\u540D\u7B97\u6CD5\u540D\u79F0: {8}\n\u4E3B\u4F53\u516C\u5171\u5BC6\u94A5\u7B97\u6CD5: {9}\n\u7248\u672C: {10}"}, + {"PKCS.10.with.weak", + "PKCS #10 \u8BC1\u4E66\u8BF7\u6C42 (\u7248\u672C 1.0)\n\u4E3B\u4F53: %s\n\u683C\u5F0F: %s\n\u516C\u5171\u5BC6\u94A5: %s\n\u7B7E\u540D\u7B97\u6CD5: %s\n"}, + {"verified.by.s.in.s.weak", "\u7531 %2$s \u4E2D\u7684 %1$s \u4EE5 %3$s \u9A8C\u8BC1"}, + {"whose.sigalg.risk", "%s \u4F7F\u7528\u7684 %s \u7B7E\u540D\u7B97\u6CD5\u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002"}, + {"whose.key.risk", "%s \u4F7F\u7528\u7684 %s \u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002"}, + {"jks.storetype.warning", "%1$s \u5BC6\u94A5\u5E93\u4F7F\u7528\u4E13\u7528\u683C\u5F0F\u3002\u5EFA\u8BAE\u4F7F\u7528 \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\" \u8FC1\u79FB\u5230\u884C\u4E1A\u6807\u51C6\u683C\u5F0F PKCS12\u3002"}, + {"migrate.keystore.warning", "\u5DF2\u5C06 \"%1$s\" \u8FC1\u79FB\u5230 %4$s\u3002\u5C06 %2$s \u5BC6\u94A5\u5E93\u4F5C\u4E3A \"%3$s\" \u8FDB\u884C\u4E86\u5907\u4EFD\u3002"}, + {"backup.keystore.warning", "\u5DF2\u5C06\u539F\u59CB\u5BC6\u94A5\u5E93 \"%1$s\" \u5907\u4EFD\u4E3A \"%3$s\"..."}, + {"importing.keystore.status", "\u6B63\u5728\u5C06\u5BC6\u94A5\u5E93 %1$s \u5BFC\u5165\u5230 %2$s..."}, };
--- a/src/share/classes/sun/security/tools/keytool/Resources_zh_TW.java Fri Sep 29 14:28:55 2017 -0400 +++ b/src/share/classes/sun/security/tools/keytool/Resources_zh_TW.java Sun Oct 01 11:49:32 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2017, 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 @@ -345,8 +345,6 @@ {"Enter.alias.name.", "\u8F38\u5165\u5225\u540D\u540D\u7A31: "}, {".RETURN.if.same.as.for.otherAlias.", "\t(RETURN \u5982\u679C\u548C <{0}> \u7684\u76F8\u540C)"}, - {".PATTERN.printX509Cert", - "\u64C1\u6709\u8005: {0}\n\u767C\u51FA\u8005: {1}\n\u5E8F\u865F: {2}\n\u6709\u6548\u671F\u81EA: {3} \u5230: {4}\n\u6191\u8B49\u6307\u7D0B:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t \u7C3D\u7AE0\u6F14\u7B97\u6CD5\u540D\u7A31: {8}\n\t \u7248\u672C: {9}"}, {"What.is.your.first.and.last.name.", "\u60A8\u7684\u540D\u5B57\u8207\u59D3\u6C0F\u70BA\u4F55\uFF1F"}, {"What.is.the.name.of.your.organizational.unit.", @@ -409,15 +407,12 @@ {"Please.provide.keysize.for.secret.key.generation", "\u8ACB\u63D0\u4F9B -keysize \u4EE5\u7522\u751F\u79D8\u5BC6\u91D1\u9470"}, - {"verified.by.s.in.s", "\u7531 %s \u9A57\u8B49 (\u5728 %s \u4E2D)"}, {"warning.not.verified.make.sure.keystore.is.correct", "\u8B66\u544A: \u672A\u9A57\u8B49\u3002\u8ACB\u78BA\u5B9A -keystore \u6B63\u78BA\u3002"}, {"Extensions.", "\u64F4\u5145\u5957\u4EF6: "}, {".Empty.value.", "(\u7A7A\u767D\u503C)"}, {"Extension.Request.", "\u64F4\u5145\u5957\u4EF6\u8981\u6C42:"}, - {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.", - "PKCS #10 \u6191\u8B49\u8981\u6C42 (\u7248\u672C 1.0)\n\u4E3B\u9AD4: %s\n\u516C\u7528\u91D1\u9470: %s \u683C\u5F0F %s \u91D1\u9470\n"}, {"Unknown.keyUsage.type.", "\u4E0D\u660E\u7684 keyUsage \u985E\u578B: "}, {"Unknown.extendedkeyUsage.type.", "\u4E0D\u660E\u7684 extendedkeyUsage \u985E\u578B: "}, {"Unknown.AccessDescription.type.", "\u4E0D\u660E\u7684 AccessDescription \u985E\u578B: "}, @@ -426,7 +421,37 @@ "\u6B64\u64F4\u5145\u5957\u4EF6\u7121\u6CD5\u6A19\u793A\u70BA\u95DC\u9375\u3002"}, {"Odd.number.of.hex.digits.found.", "\u627E\u5230\u5341\u516D\u9032\u4F4D\u6578\u5B57\u7684\u5947\u6578: "}, {"Unknown.extension.type.", "\u4E0D\u660E\u7684\u64F4\u5145\u5957\u4EF6\u985E\u578B: "}, - {"command.{0}.is.ambiguous.", "\u547D\u4EE4 {0} \u4E0D\u660E\u78BA:"} + {"command.{0}.is.ambiguous.", "\u547D\u4EE4 {0} \u4E0D\u660E\u78BA:"}, + + // 8171319: keytool should print out warnings when reading or + // generating cert/cert req using weak algorithms + {"the.certificate.request", "\u6191\u8B49\u8981\u6C42"}, + {"the.issuer", "\u767C\u884C\u4EBA"}, + {"the.generated.certificate", "\u7522\u751F\u7684\u6191\u8B49"}, + {"the.generated.crl", "\u7522\u751F\u7684 CRL"}, + {"the.generated.certificate.request", "\u7522\u751F\u7684\u6191\u8B49\u8981\u6C42"}, + {"the.certificate", "\u6191\u8B49"}, + {"the.crl", "CRL"}, + {"the.tsa.certificate", "TSA \u6191\u8B49"}, + {"the.input", "\u8F38\u5165"}, + {"reply", "\u56DE\u8986"}, + {"one.in.many", "%s #%d / %d"}, + {"alias.in.cacerts", "cacerts \u4E2D\u7684\u767C\u884C\u4EBA <%s>"}, + {"alias.in.keystore", "\u767C\u884C\u4EBA <%s>"}, + {"with.weak", "%s (\u4F4E\u5F37\u5EA6)"}, + {"key.bit", "%d \u4F4D\u5143\u7684 %s \u91D1\u9470"}, + {"key.bit.weak", "%d \u4F4D\u5143\u7684 %s \u91D1\u9470 (\u4F4E\u5F37\u5EA6)"}, + {".PATTERN.printX509Cert.with.weak", + "\u64C1\u6709\u8005: {0}\n\u767C\u884C\u4EBA: {1}\n\u5E8F\u865F: {2}\n\u6709\u6548\u671F\u81EA: {3} \u5230: {4}\n\u6191\u8B49\u6307\u7D0B:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\u7C3D\u7AE0\u6F14\u7B97\u6CD5\u540D\u7A31: {8}\n\u4E3B\u9AD4\u516C\u958B\u91D1\u9470\u6F14\u7B97\u6CD5: {9}\n\u7248\u672C: {10}"}, + {"PKCS.10.with.weak", + "PKCS #10 \u6191\u8B49\u8981\u6C42 (\u7248\u672C 1.0)\n\u4E3B\u9AD4: %s\n\u683C\u5F0F: %s\n\u516C\u7528\u91D1\u9470: %s\n\u7C3D\u7AE0\u6F14\u7B97\u6CD5: %s\n"}, + {"verified.by.s.in.s.weak", "\u7531 %2$s \u4E2D\u7684 %1$s \u4EE5 %3$s \u9A57\u8B49"}, + {"whose.sigalg.risk", "%s \u4F7F\u7528\u7684 %s \u7C3D\u7AE0\u6F14\u7B97\u6CD5\u5B58\u5728\u5B89\u5168\u98A8\u96AA\u3002"}, + {"whose.key.risk", "%s \u4F7F\u7528\u7684 %s \u5B58\u5728\u5B89\u5168\u98A8\u96AA\u3002"}, + {"jks.storetype.warning", "%1$s \u91D1\u9470\u5132\u5B58\u5EAB\u4F7F\u7528\u5C08\u6709\u683C\u5F0F\u3002\u5EFA\u8B70\u60A8\u4F7F\u7528 \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\" \u79FB\u8F49\u6210\u70BA\u4F7F\u7528 PKCS12 (\u696D\u754C\u6A19\u6E96\u683C\u5F0F)\u3002"}, + {"migrate.keystore.warning", "\u5DF2\u5C07 \"%1$s\" \u79FB\u8F49\u6210\u70BA %4$s\u3002%2$s \u91D1\u9470\u5132\u5B58\u5EAB\u5DF2\u5099\u4EFD\u70BA \"%3$s\"\u3002"}, + {"backup.keystore.warning", "\u539F\u59CB\u7684\u91D1\u9470\u5132\u5B58\u5EAB \"%1$s\" \u5DF2\u5099\u4EFD\u70BA \"%3$s\"..."}, + {"importing.keystore.status", "\u6B63\u5728\u5C07\u91D1\u9470\u5132\u5B58\u5EAB %1$s \u532F\u5165 %2$s..."}, };
--- a/test/com/sun/jdi/LineNumberInfo.java Fri Sep 29 14:28:55 2017 -0400 +++ b/test/com/sun/jdi/LineNumberInfo.java Sun Oct 01 11:49:32 2017 -0700 @@ -23,7 +23,7 @@ /** * @test - * @bug 4238644 4238643 4238641 4944198 + * @bug 4238644 4238643 4238641 4944198 8181500 * @summary Test javac regressions in the generation of line number info * @author Gordon Hirsch * @@ -72,6 +72,7 @@ 36, 37, 36, + 37, 40, 41, 42, @@ -110,6 +111,7 @@ 85 , 93 , 96 , + 105, 107, 111, 119,