svn commit: r51189 - head/ja_JP.eucJP/books/handbook/security

Ryusuke SUZUKI ryusuke at FreeBSD.org
Wed Nov 8 12:19:21 UTC 2017


Author: ryusuke
Date: Wed Nov  8 12:19:20 2017
New Revision: 51189
URL: https://svnweb.freebsd.org/changeset/doc/51189

Log:
  - Merge the following from the English version:
  
  	r38269 -> r39016	head/ja_JP.eucJP/books/handbook/security/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/security/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/security/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/security/chapter.xml	Tue Nov  7 14:13:27 2017	(r51188)
+++ head/ja_JP.eucJP/books/handbook/security/chapter.xml	Wed Nov  8 12:19:20 2017	(r51189)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r38269
+     Original revision: r39016
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="security">
@@ -435,7 +435,7 @@
       <para>¥¢¥«¥¦¥ó¥È¤ò´°Á´¤Ë¥í¥Ã¥¯¤¹¤ë¤Ë¤Ï¡¢
 	&man.pw.8; ¥³¥Þ¥ó¥É¤ò»È¤¦¤Ù¤­¤Ç¤¹¡£</para>
 
-      <screen>&prompt.root;<userinput>pw lock <replaceable>staff</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>pw lock <replaceable>staff</replaceable></userinput></screen>
 
       <para>¤³¤ì¤Ë¤è¤ê¡¢¥æ¡¼¥¶¤Ï¡¢&man.ssh.1;
 	¤ò´Þ¤à¤¤¤«¤Ê¤ëÊýË¡¤Ç¤â¥í¥°¥¤¥ó¤Ç¤­¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£</para>
@@ -1165,7 +1165,7 @@
 
   <sect1 xml:id="crypt">
 
-    <info><title>DES, Blowfish, MD5 ¤È Crypt</title>
+    <info><title>DES, Blowfish, MD5, SHA256, SHA512 ¤ª¤è¤Ó Crypt</title>
       <authorgroup>
 	<author>
 	  <personname>
@@ -1185,6 +1185,8 @@
     <indexterm><primary>Blowfish</primary></indexterm>
     <indexterm><primary>DES</primary></indexterm>
     <indexterm><primary>MD5</primary></indexterm>
+    <indexterm><primary>SHA256</primary></indexterm>
+    <indexterm><primary>SHA512</primary></indexterm>
 
     <para><emphasis>Ìõ: &a.hanai;,
 	12 September 1996.</emphasis></para>
@@ -1228,8 +1230,8 @@
     <sect2>
       <title>°Å¹æ²½µ¡¹½¤òÍý²ò¤¹¤ë</title>
 
-      <para>¸½ºß¤Ç¤Ï¡¢¥é¥¤¥Ö¥é¥ê¤Ï DES, MD5 ¤ª¤è¤Ó Blowfish
-	¥Ï¥Ã¥·¥å´Ø¿ô¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢&os;
+      <para>¸½ºß¤Ç¤Ï¡¢¥é¥¤¥Ö¥é¥ê¤Ï DES, MD5, Blowfish, SHA256 ¤ª¤è¤Ó 
+	SHA512 ¥Ï¥Ã¥·¥å´Ø¿ô¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢&os;
 	¤Ï¥Ñ¥¹¥ï¡¼¥É¤Î°Å¹æ²½¤Ë MD5 ¤òÍøÍѤ·¤Þ¤¹¡£</para>
 
       <para>&os;
@@ -1247,14 +1249,18 @@
 	¤È¤¤¤¦Ê¸»ú¤ò´Þ¤Þ¤Ê¤¤ 64
 	ʸ»ú¤Î¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤ò»È¤Ã¤Æɽ¸½¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢
 	Èæ³ÓŪû¤¤Ê¸»úÎó¤Ç¥É¥ëµ­¹æ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Ê¤¤¤â¤Î¤Ï¤ª¤½¤é¤¯
-	DES ¤Î¥Ñ¥¹¥ï¡¼¥É¤Ç¤·¤ç¤¦¡£</para>
+	DES ¤Î¥Ñ¥¹¥ï¡¼¥É¤Ç¤·¤ç¤¦¡£
+	SHA256 ¤È SHA256 ¤Î¾ì¹ç¤Ï¡¢<literal>$6$</literal>
+	¤«¤é»Ï¤Þ¤ê¤Þ¤¹¡£</para>
 
       <para>¿·µ¬¥Ñ¥¹¥ï¡¼¥É¤¬¤É¤Á¤é¤Î¥Ñ¥¹¥ï¡¼¥É·Á¼°¤Ë¤Ê¤ë¤«¤Ï¡¢
 	<filename>/etc/login.conf</filename> ¤ÎÃæ¤Î
 	<literal>passwd_format</literal>
 	¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤Ë¤è¤Ã¤ÆÀ©¸æ¤µ¤ì¤Þ¤¹¡£
-	¤½¤ÎÃͤȤ·¤Æ¤Ï¡¢<literal>des</literal>,	<literal>md5</literal>
-	¤Þ¤¿¤Ï <literal>blf</literal> ¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+	¤½¤ÎÃͤȤ·¤Æ¤Ï¡¢
+	<literal>des</literal>,	<literal>md5</literal>,
+	<literal>blf</literal>, <literal>sha256</literal> ¤Þ¤¿¤Ï
+	<literal>sha512</literal> ¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤Ë´Ø¤¹¤ë¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤Ï¡¢
 	&man.login.conf.5; ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
     </sect2>
@@ -1388,6 +1394,7 @@ Then run opiepasswd without the -c parameter.
 Using MD5 to compute responses.
 Enter new secret pass phrase:
 Again new secret pass phrase:
+
 ID unfurl OTP key is 499 to4268
 MOS MALL GOAT ARM AVID COED</screen>
 
@@ -1431,18 +1438,15 @@ MOS MALL GOAT ARM AVID COED</screen>
 
 Updating unfurl:
 You need the response from an OTP generator.
-	) `opiepasswd' ¥³¥Þ¥ó¥É¤¬½ÐÎϤ¹¤ëÃí°Õ¤Ç¤¹¡£Ìõ¤¹¤È¡¢
-	) OTP À¸À®´ï¤ÎÊÖ¤¹½ÐÎϤ¬É¬Íפˤʤê¤Þ¤¹¡£
 Old secret pass phrase:
-        otp-md5 498 to4268 ext
-        Response: GAME GAG WELT OUT DOWN CHAT
+	otp-md5 498 to4268 ext
+	Response: GAME GAG WELT OUT DOWN CHAT
 New secret pass phrase:
-        otp-md5 499 to4269
-        Response: LINE PAP MILK NELL BUOY TROY
+	otp-md5 499 to4269
+	Response: LINE PAP MILK NELL BUOY TROY
 
 ID mark OTP key is 499 gr4269
-LINE PAP MILK NELL BUOY TROY
-</screen>
+LINE PAP MILK NELL BUOY TROY</screen>
 
       <para>¥Ç¥Õ¥©¥ë¥È¤Î¥·¡¼¥É¤Ç¹½¤ï¤Ê¤±¤ì¤Ð¡¢<keycap>Return</keycap>
 	¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£¼¡¤Ë¡¢¥¢¥¯¥»¥¹¥Ñ¥¹¥ï¡¼¥É¤òÆþ¤ì¤ëÁ°¤Ë¡¢
@@ -1453,8 +1457,7 @@ LINE PAP MILK NELL BUOY TROY
 Using the MD5 algorithm to compute response.
 Reminder: Don't use opiekey from telnet or dial-in sessions.
 Enter secret pass phrase:
-GAME GAG WELT OUT DOWN CHAT
-</screen>
+GAME GAG WELT OUT DOWN CHAT</screen>
 
       <para>¤³¤³¤Ç¿®Íê¤Ç¤­¤Ê¤¤ÄÌ¿®Ï©¤ÎÊý¤ËÌá¤Ã¤Æ¡¢
 	À¸À®¤µ¤ì¤¿¥ï¥ó¥¿¥¤¥à¥Ñ¥¹¥ï¡¼¥É¤ò¥³¥Ô¡¼¤·¤ÆÂбþ¤¹¤ë¥×¥í¥°¥é¥à¤ËÆþÎϤ·¤Þ¤¹¡£</para>
@@ -1723,8 +1726,8 @@ qpopper : ALL : allow</programlisting>
 
 	<programlisting># The rest of the daemons are protected.
 ALL : ALL \
-        : severity auth.info \
-        : twist /bin/echo "You are not welcome to use %d from %h."</programlisting>
+	: severity auth.info \
+	: twist /bin/echo "You are not welcome to use %d from %h."</programlisting>
 
 	<para>¤³¤ÎÎã¤Ï¡¢
 	  <quote>You are not allowed to use <literal>daemon</literal>
@@ -2727,7 +2730,7 @@ kadmind5_server_enable="YES"</programlisting>
     <para><application>OpenSSL</application> ¤Ï¡¢
       ¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤Î°Å¹æ²½¤µ¤ì¤¿Ç§¾Ú¡¢
       ¥¯¥ì¥¸¥Ã¥È¥«¡¼¥É¤Ç¤Î»Ùʧ¤¤¤È¤¤¤Ã¤¿¥¦¥§¥Ö¥Ù¡¼¥¹¤Î¼è°ú¤Ê¤É¤Ç»È¤ï¤ì¤Þ¤¹¡£
-      <filename role="package">www/apache13-ssl</filename> ¤ª¤è¤Ó
+      <filename role="package">www/apache22</filename> ¤ª¤è¤Ó
       <filename role="package">mail/claws-mail</filename>
       ¤È¤¤¤Ã¤¿Â¿¤¯¤Î port ¤Ç¤Ï¡¢
       <application>OpenSSL</application>
@@ -3053,8 +3056,7 @@ Connection closed by foreign host.</screen>
 
       <screen>
 options   IPSEC        #IP security
-device    crypto
-      </screen>
+device    crypto</screen>
 
       <indexterm>
 	<primary>¥«¡¼¥Í¥ë¥ª¥×¥·¥ç¥ó</primary>
@@ -3473,7 +3475,7 @@ racoon_enable="yes"</programlisting>
     </sect2>
 
     <sect2>
-      <title>sshd ¤òÍ­¸ú¤Ë¤¹¤ë</title>
+      <title><application>sshd</application> ¤òÍ­¸ú¤Ë¤¹¤ë</title>
 
       <indexterm>
 	<primary>OpenSSH</primary>
@@ -3487,7 +3489,7 @@ racoon_enable="yes"</programlisting>
 	¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤É¤¦¤«¤ò³Îǧ¤¹¤ë¤Ë¤Ï¡¢
 	<filename>rc.conf</filename> ¥Õ¥¡¥¤¥ë¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>sshd_enable="YES"</screen>
+      <programlisting>sshd_enable="YES"</programlisting>
 
       <para>¼¡¤Ëµ¯Æ°¤·¤¿¤È¤­¤«¤é
 	<application>OpenSSH</application> ¤Î¥Ç¡¼¥â¥ó¥×¥í¥°¥é¥à¤Ç¤¢¤ë
@@ -3496,7 +3498,7 @@ racoon_enable="yes"</programlisting>
 	¥¹¥¯¥ê¥×¥È¤ò»È¤Ã¤Æ¡¢<application>OpenSSH</application>
 	¤òµ¯Æ°¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
 
-      <programlisting>/etc/rc.d/sshd start</programlisting>
+      <screen>&prompt.root; <userinput>/etc/rc.d/sshd start</userinput></screen>
     </sect2>
 
     <sect2>
@@ -3599,7 +3601,7 @@ COPYRIGHT            100% |***************************
     </sect2>
 
     <sect2 xml:id="security-ssh-keygen">
-      <title>ssh-keygen</title>
+      <title><application>ssh-keygen</application></title>
 
       <para>¥Ñ¥¹¥ï¡¼¥É¤ÎÂå¤ï¤ê¤Ë &man.ssh-keygen.1;
 	¤ò»È¤Ã¤Æ¥æ¡¼¥¶¤Îǧ¾ÚÍѤΠDSA ¤Þ¤¿¤Ï
@@ -3614,8 +3616,7 @@ Enter same passphrase again:
 Your identification has been saved in /home/user/.ssh/id_dsa.
 Your public key has been saved in /home/user/.ssh/id_dsa.pub.
 The key fingerprint is:
-bb:48:db:f2:93:57:80:b6:aa:bc:f5:d5:ba:8f:79:17 user at host.example.com
-</screen>
+bb:48:db:f2:93:57:80:b6:aa:bc:f5:d5:ba:8f:79:17 user at host.example.com</screen>
 
       <para>&man.ssh-keygen.1; ¤Ïǧ¾Ú¤Ë»È¤¦°Ù¤Î¸ø³«¸°¤ÈÈëÌ©¸°¤Î¥Ú¥¢¤òºî¤ê¤Þ¤¹¡£
 	<acronym>DSA</acronym> ¤Þ¤¿¤Ï <acronym>RSA</acronym> ¸°¤Ë±þ¤¸¤Æ¡¢
@@ -3650,7 +3651,8 @@ bb:48:db:f2:93:57:80:b6:aa:bc:f5:d5:ba:8f:79:17 user at h
     </sect2>
 
     <sect2 xml:id="security-ssh-agent">
-      <title>ssh-agent ¤ª¤è¤Ó ssh-add</title>
+      <title><application>ssh-agent</application> ¤ª¤è¤Ó
+	<application>ssh-add</application></title>
 
       <para>&man.ssh-agent.1; ¤ª¤è¤Ó &man.ssh-add.1; ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¡¢
 	¥Ñ¥¹¥Õ¥ì¡¼¥º¤òËè²óÆþÎϤ¹¤ë¤³¤È¤Ê¤·¤Ë¡¢
@@ -4205,13 +4207,13 @@ You are advised to update or deinstall the affected pa
 FreeBSD-SA-XX:XX.UTIL                                       Security Advisory
                                                           The FreeBSD Project
 
-Topic:          denial of service due to some problem<co xml:id="co-topic"/>
+Topic:          denial of service due to some problem <co xml:id="co-topic"/>
 
-Category:       core<co xml:id="co-category"/>
-Module:         sys<co xml:id="co-module"/>
-Announced:      2003-09-23<co xml:id="co-announce"/>
-Credits:        Person<co xml:id="co-credit"/>
-Affects:        All releases of &os;<co xml:id="co-affects"/>
+Category:       core <co xml:id="co-category"/>
+Module:         sys <co xml:id="co-module"/>
+Announced:      2003-09-23 <co xml:id="co-announce"/>
+Credits:        Person <co xml:id="co-credit"/>
+Affects:        All releases of &os; <co xml:id="co-affects"/>
                 &os; 4-STABLE prior to the correction date
 Corrected:      2003-09-23 16:42:59 UTC (RELENG_4, 4.9-PRERELEASE)
                 2003-09-23 20:08:42 UTC (RELENG_5_1, 5.1-RELEASE-p6)
@@ -4221,33 +4223,33 @@ Corrected:      2003-09-23 16:42:59 UTC (RELENG_4, 4.9
                 2003-09-23 16:49:46 UTC (RELENG_4_6, 4.6-RELEASE-p21)
                 2003-09-23 16:51:24 UTC (RELENG_4_5, 4.5-RELEASE-p33)
                 2003-09-23 16:52:45 UTC (RELENG_4_4, 4.4-RELEASE-p43)
-                2003-09-23 16:54:39 UTC (RELENG_4_3, 4.3-RELEASE-p39)<co xml:id="co-corrected"/>
-<acronym>CVE</acronym> Name:       CVE-XXXX-XXXX<co xml:id="co-cve"/>
+                2003-09-23 16:54:39 UTC (RELENG_4_3, 4.3-RELEASE-p39) <co xml:id="co-corrected"/>
+<acronym>CVE</acronym> Name:       CVE-XXXX-XXXX <co xml:id="co-cve"/>
 
 For general information regarding FreeBSD Security Advisories,
 including descriptions of the fields above, security branches, and the
 following sections, please visit
 http://www.FreeBSD.org/security/.
 
-I.   Background<co xml:id="co-backround"/>
+I.   Background <co xml:id="co-backround"/>
 
 
-II.  Problem Description<co xml:id="co-descript"/>
+II.  Problem Description <co xml:id="co-descript"/>
 
 
-III. Impact<co xml:id="co-impact"/>
+III. Impact <co xml:id="co-impact"/>
 
 
-IV.  Workaround<co xml:id="co-workaround"/>
+IV.  Workaround <co xml:id="co-workaround"/>
 
 
-V.   Solution<co xml:id="co-solution"/>
+V.   Solution <co xml:id="co-solution"/>
 
 
-VI.  Correction details<co xml:id="co-details"/>
+VI.  Correction details <co xml:id="co-details"/>
 
 
-VII. References<co xml:id="co-ref"/></programlisting>
+VII. References <co xml:id="co-ref"/></programlisting>
 
 
       <calloutlist>


More information about the svn-doc-all mailing list