From: Jim Jagielski Date: Wed, 12 Dec 2012 14:40:07 +0000 (+0000) Subject: update xforms X-Git-Tag: 2.4.4~321 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7be2a74b3cefcf3440bf52cf2ec1dfdc41a1894a;p=apache update xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1420707 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en index eff973da46..2388602f8a 100644 --- a/docs/manual/howto/auth.html.en +++ b/docs/manual/howto/auth.html.en @@ -266,7 +266,7 @@ Require user rbowen file to authenticate the user on each request. Apache also has the ability to store user information in fast database files. The mod_authn_dbm module provides the AuthDBMUserFile directive. These - files can be created and manipulated with the dbmmanage program. Many + files can be created and manipulated with the dbmmanage and htdbm programs. Many other types of authentication options are available from third party modules in the Apache Modules Database.

@@ -372,17 +372,15 @@ Require group GroupName you can choose dbm or dbd as your storage format.

-

To select a dbd file rather than a text file, for example:

+

To select a dbm file rather than a text file, for example:

 <Directory /www/docs/private>
-
     AuthName "Private"
     AuthType Basic
     AuthBasicProvider dbm
     AuthDBMUserFile /www/passwords/passwd.dbm
     Require valid-user
-
 </Directory>
@@ -402,14 +400,12 @@ Require group GroupName 
 <Directory /www/docs/private>
-
     AuthName "Private"
     AuthType Basic
     AuthBasicProvider file ldap
     AuthUserFile /usr/local/apache/passwd/passwords
     AuthLDAPURL ldap://ldaphost/o=yourorg
     Require valid-user
-
 </Directory>
@@ -429,7 +425,6 @@ Require group GroupName 
 <Directory /www/docs/private>
-
     AuthName "Private"
     AuthType Basic
     AuthBasicProvider file
@@ -438,7 +433,6 @@ Require group GroupName
     AuthGroupFile /usr/local/apache/passwd/groups
     Require group GroupName
     Require ldap-group cn=mygroup,o=yourorg
-
 </Directory>
diff --git a/docs/manual/howto/auth.html.fr b/docs/manual/howto/auth.html.fr index b5d436d9cf..713a85835e 100644 --- a/docs/manual/howto/auth.html.fr +++ b/docs/manual/howto/auth.html.fr @@ -27,6 +27,8 @@  ko  |  tr 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

L'authentification est un processus qui vous permet de vérifier qu'une personne est bien celle qu'elle prétend être. L'autorisation @@ -393,13 +395,11 @@ passe 

 <Directory /www/docs/private>
-
     AuthName "Private"
     AuthType Basic
     AuthBasicProvider dbm
     AuthDBMUserFile /www/passwords/passwd.dbm
     Require valid-user
-
 </Directory>
@@ -422,14 +422,12 @@ d'authentification 
 <Directory /www/docs/private>
-
     AuthName "Private"
     AuthType Basic
     AuthBasicProvider file ldap
     AuthUserFile /usr/local/apache/passwd/passwords
     AuthLDAPURL ldap://ldaphost/o=yourorg
     Require valid-user
-
 </Directory>
@@ -452,7 +450,6 @@ d'authentification 
 <Directory /www/docs/private>
-
     AuthName "Private"
     AuthType Basic
     AuthBasicProvider file
@@ -461,7 +458,6 @@ d'authentification
     AuthGroupFile /usr/local/apache/passwd/groups
     Require group GroupName
     Require ldap-group cn=mygroup,o=yourorg
-
 </Directory>
diff --git a/docs/manual/howto/auth.xml.fr b/docs/manual/howto/auth.xml.fr index 00e8eb99ed..1b573255d9 100644 --- a/docs/manual/howto/auth.xml.fr +++ b/docs/manual/howto/auth.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/howto/auth.xml.ja b/docs/manual/howto/auth.xml.ja index eb3b0abb52..d1d2790107 100644 --- a/docs/manual/howto/auth.xml.ja +++ b/docs/manual/howto/auth.xml.ja @@ -1,7 +1,7 @@ - + + + + diff --git a/docs/manual/mod/mod_headers.xml.ja b/docs/manual/mod/mod_headers.xml.ja index 3b71ebd2b4..5447cfc264 100644 --- a/docs/manual/mod/mod_headers.xml.ja +++ b/docs/manual/mod/mod_headers.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_rewrite.xml.meta b/docs/manual/mod/mod_rewrite.xml.meta index decc0a7b1e..0be21e86f4 100644 --- a/docs/manual/mod/mod_rewrite.xml.meta +++ b/docs/manual/mod/mod_rewrite.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en index 39d665511c..abe1dc2dd1 100644 --- a/docs/manual/mod/mod_ssl.html.en +++ b/docs/manual/mod/mod_ssl.html.en @@ -92,6 +92,8 @@ to provide the cryptography engine.

  • SSLSessionCache
  • SSLSessionCacheTimeout
  • SSLSessionTicketKeyFile
    • +
  • SSLSRPUnknownUserSeed
    • +
  • SSLSRPVerifierFile
  • SSLStaplingCache
  • SSLStaplingErrorCacheTimeout
  • SSLStaplingFakeTryLater
    • @@ -170,6 +172,8 @@ compatibility variables.

    SSL_SERVER_A_SIG string Algorithm used for the signature of server's certificate SSL_SERVER_A_KEY string Algorithm used for the public key of server's certificate SSL_SERVER_CERT string PEM-encoded server certificate +SSL_SRP_USER string SRP username +SSL_SRP_USERINFO string SRP user info

    x509 specifies a component of an X.509 DN; one of @@ -655,6 +659,7 @@ openssl version. Newer openssl versions may include additional ciphers.

    kDHr Diffie-Hellman key exchange with RSA key kDHd Diffie-Hellman key exchange with DSA key kEDH Ephemeral (temp.key) Diffie-Hellman key exchange (no cert) +kSRP Secure Remote Password (SRP) key exchange Authentication Algorithm: aNULL No authentication aRSA RSA authentication @@ -690,6 +695,7 @@ openssl version. Newer openssl versions may include additional ciphers.

    ECDH Elliptic Curve Diffie-Hellman key exchange ADH all ciphers using Anonymous Diffie-Hellman key exchange AECDH all ciphers using Anonymous Elliptic Curve Diffie-Hellman key exchange +SRP all ciphers using Secure Remote Password (SRP) key exchange DSS all ciphers using DSS authentication ECDSA all ciphers using ECDSA authentication aNULL all ciphers using no authentication @@ -2088,6 +2094,57 @@ be protected with file permissions similar to those used for SSLCertificateKeyFile.

    + +
    top
    +

    SSLSRPUnknownUserSeed Directive

    + + + + + + + +
    Description:SRP unknown user seed
    Syntax:SSLSRPUnknownUserSeed secret-string
    Context:server config, virtual host
    Status:Extension
    Module:mod_ssl
    Compatibility:Available in httpd 2.4.4 and later, if using OpenSSL 1.0.1 or +later
    +

    +This directive sets the seed used to fake SRP user parameters for unknown +users, to avoid leaking whether a given user exists. Specify a secret +string. If this directive is not used, then Apache will return the +UNKNOWN_PSK_IDENTITY alert to clients who specify an unknown username. +

    +

    Example

    +SSLSRPUnknownUserSeed "secret" +

    + +
    +
    top
    +

    SSLSRPVerifierFile Directive

    + + + + + + + +
    Description:Path to SRP verifier file
    Syntax:SSLSRPVerifierFile file-path
    Context:server config, virtual host
    Status:Extension
    Module:mod_ssl
    Compatibility:Available in httpd 2.4.4 and later, if using OpenSSL 1.0.1 or +later
    +

    +This directive enables TLS-SRP and sets the path to the OpenSSL SRP (Secure +Remote Password) verifier file containing TLS-SRP usernames, verifiers, salts, +and group parameters.

    +

    Example

    +SSLSRPVerifierFile "/path/to/file.srpv" +

    +

    +The verifier file can be created with the openssl command line +utility:

    +

    Creating the SRP verifier file

    +openssl srp -srpvfile passwd.srpv -userinfo "some info" -add username +

    +

    The value given with the optional -userinfo parameter is +avalable in the SSL_SRP_USERINFO request environment variable.

    + +
    top

    SSLStaplingCache Directive

    diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de index 33abe49257..2e4e32ca28 100644 --- a/docs/manual/mod/quickreference.html.de +++ b/docs/manual/mod/quickreference.html.de @@ -414,7 +414,7 @@ by MIME type request ExtFilterDefine filtername parameterssEDefine an external filter ExtFilterOptions option [option] ... NoLogStderr dEConfigure mod_ext_filter options -FallbackResource local-urlsvdhBDefine a default URL for requests that don't map to a file +FallbackResource disabled | local-urlsvdhBDefine a default URL for requests that don't map to a file FileETag Komponente ... INode MTime Size svdhCDateiattribute, die zur Erstellung des HTTP-Response-Headers ETag verwendet werden <Files Dateiname> ... </Files>svdhCEnthält Direktiven, die sich nur auf passende Dateinamen @@ -953,6 +953,8 @@ Cache SSLSessionCacheTimeout seconds 300 svENumber of seconds before an SSL session expires in the Session Cache SSLSessionTicketKeyFile file-pathsvEPersistent encryption/decryption key for TLS session tickets +SSLSRPUnknownUserSeed secret-stringsvESRP unknown user seed +SSLSRPVerifierFile file-pathsvEPath to SRP verifier file SSLStaplingCache typesEConfigures the OCSP stapling cache SSLStaplingErrorCacheTimeout seconds 600 svENumber of seconds before expiring invalid responses in the OCSP stapling cache SSLStaplingFakeTryLater on|off on svESynthesize "tryLater" responses for failed OCSP stapling queries diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index 688a150a6e..a8c79e3fb0 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -406,7 +406,7 @@ by MIME type request ExtFilterDefine filtername parameterssEDefine an external filter ExtFilterOptions option [option] ... NoLogStderr dEConfigure mod_ext_filter options -FallbackResource local-urlsvdhBDefine a default URL for requests that don't map to a file +FallbackResource disabled | local-urlsvdhBDefine a default URL for requests that don't map to a file FileETag component ... MTime Size svdhCFile attributes used to create the ETag HTTP response header for static files <Files filename> ... </Files>svdhCContains directives that apply to matched @@ -938,6 +938,8 @@ Cache SSLSessionCacheTimeout seconds 300 svENumber of seconds before an SSL session expires in the Session Cache SSLSessionTicketKeyFile file-pathsvEPersistent encryption/decryption key for TLS session tickets +SSLSRPUnknownUserSeed secret-stringsvESRP unknown user seed +SSLSRPVerifierFile file-pathsvEPath to SRP verifier file SSLStaplingCache typesEConfigures the OCSP stapling cache SSLStaplingErrorCacheTimeout seconds 600 svENumber of seconds before expiring invalid responses in the OCSP stapling cache SSLStaplingFakeTryLater on|off on svESynthesize "tryLater" responses for failed OCSP stapling queries diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es index 72f097529a..2b9f465140 100644 --- a/docs/manual/mod/quickreference.html.es +++ b/docs/manual/mod/quickreference.html.es @@ -413,7 +413,7 @@ by MIME type request ExtFilterDefine filtername parameterssEDefine an external filter ExtFilterOptions option [option] ... NoLogStderr dEConfigure mod_ext_filter options -FallbackResource local-urlsvdhBDefine a default URL for requests that don't map to a file +FallbackResource disabled | local-urlsvdhBDefine a default URL for requests that don't map to a file FileETag component ... INode MTime Size svdhCFile attributes used to create the ETag HTTP response header for static files <Files filename> ... </Files>svdhCContains directives that apply to matched @@ -945,6 +945,8 @@ Cache SSLSessionCacheTimeout seconds 300 svENumber of seconds before an SSL session expires in the Session Cache SSLSessionTicketKeyFile file-pathsvEPersistent encryption/decryption key for TLS session tickets +SSLSRPUnknownUserSeed secret-stringsvESRP unknown user seed +SSLSRPVerifierFile file-pathsvEPath to SRP verifier file SSLStaplingCache typesEConfigures the OCSP stapling cache SSLStaplingErrorCacheTimeout seconds 600 svENumber of seconds before expiring invalid responses in the OCSP stapling cache SSLStaplingFakeTryLater on|off on svESynthesize "tryLater" responses for failed OCSP stapling queries diff --git a/docs/manual/mod/quickreference.html.ja.utf8 b/docs/manual/mod/quickreference.html.ja.utf8 index 6a86607636..e14af4c923 100644 --- a/docs/manual/mod/quickreference.html.ja.utf8 +++ b/docs/manual/mod/quickreference.html.ja.utf8 @@ -872,6 +872,8 @@ Cache SSLSessionCacheTimeout seconds 300 svENumber of seconds before an SSL session expires in the Session Cache SSLSessionTicketKeyFile file-pathsvEPersistent encryption/decryption key for TLS session tickets +SSLSRPUnknownUserSeed secret-stringsvESRP unknown user seed +SSLSRPVerifierFile file-pathsvEPath to SRP verifier file SSLStaplingCache typesEConfigures the OCSP stapling cache SSLStaplingErrorCacheTimeout seconds 600 svENumber of seconds before expiring invalid responses in the OCSP stapling cache SSLStaplingFakeTryLater on|off on svESynthesize "tryLater" responses for failed OCSP stapling queries diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr index 4dbc7841c9..51ab87c504 100644 --- a/docs/manual/mod/quickreference.html.ko.euc-kr +++ b/docs/manual/mod/quickreference.html.ko.euc-kr @@ -897,6 +897,8 @@ Cache SSLSessionCacheTimeout seconds 300 svENumber of seconds before an SSL session expires in the Session Cache SSLSessionTicketKeyFile file-pathsvEPersistent encryption/decryption key for TLS session tickets +SSLSRPUnknownUserSeed secret-stringsvESRP unknown user seed +SSLSRPVerifierFile file-pathsvEPath to SRP verifier file SSLStaplingCache typesEConfigures the OCSP stapling cache SSLStaplingErrorCacheTimeout seconds 600 svENumber of seconds before expiring invalid responses in the OCSP stapling cache SSLStaplingFakeTryLater on|off on svESynthesize "tryLater" responses for failed OCSP stapling queries diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8 index 3b4f5ff0ec..a5d1ef7113 100644 --- a/docs/manual/mod/quickreference.html.tr.utf8 +++ b/docs/manual/mod/quickreference.html.tr.utf8 @@ -935,6 +935,8 @@ Cache SSLSessionCacheTimeout seconds 300 skENumber of seconds before an SSL session expires in the Session Cache SSLSessionTicketKeyFile file-pathskEPersistent encryption/decryption key for TLS session tickets +SSLSRPUnknownUserSeed secret-stringskESRP unknown user seed +SSLSRPVerifierFile file-pathskEPath to SRP verifier file SSLStaplingCache typesEConfigures the OCSP stapling cache SSLStaplingErrorCacheTimeout seconds 600 skENumber of seconds before expiring invalid responses in the OCSP stapling cache SSLStaplingFakeTryLater on|off on skESynthesize "tryLater" responses for failed OCSP stapling queries diff --git a/docs/manual/mod/quickreference.html.zh-cn b/docs/manual/mod/quickreference.html.zh-cn index d123db3c4b..8f69397234 100644 --- a/docs/manual/mod/quickreference.html.zh-cn +++ b/docs/manual/mod/quickreference.html.zh-cn @@ -401,7 +401,7 @@ by MIME type request ExtFilterDefine filtername parameterssEDefine an external filter ExtFilterOptions option [option] ... NoLogStderr dEConfigure mod_ext_filter options -FallbackResource local-urlsvdhBDefine a default URL for requests that don't map to a file +FallbackResource disabled | local-urlsvdhBDefine a default URL for requests that don't map to a file FileETag component ... MTime Size svdhCFile attributes used to create the ETag HTTP response header for static files <Files filename> ... </Files>svdhCContains directives that apply to matched @@ -933,6 +933,8 @@ Cache SSLSessionCacheTimeout seconds 300 svENumber of seconds before an SSL session expires in the Session Cache SSLSessionTicketKeyFile file-pathsvEPersistent encryption/decryption key for TLS session tickets +SSLSRPUnknownUserSeed secret-stringsvESRP unknown user seed +SSLSRPVerifierFile file-pathsvEPath to SRP verifier file SSLStaplingCache typesEConfigures the OCSP stapling cache SSLStaplingErrorCacheTimeout seconds 600 svENumber of seconds before expiring invalid responses in the OCSP stapling cache SSLStaplingFakeTryLater on|off on svESynthesize "tryLater" responses for failed OCSP stapling queries diff --git a/docs/manual/ssl/ssl_faq.html.en b/docs/manual/ssl/ssl_faq.html.en index 6941209c43..70723b4082 100644 --- a/docs/manual/ssl/ssl_faq.html.en +++ b/docs/manual/ssl/ssl_faq.html.en @@ -725,6 +725,27 @@ SetEnvIf User-Agent "MSIE [2-5]" \ or otherwise.

    +

    How do I enable TLS-SRP?

    +

    TLS-SRP (Secure Remote Password key exchange for TLS, specified in RFC 5054) + can supplement or replace certificates in authenticating an SSL connection. + To use TLS-SRP, set the + SSLSRPVerifierFile directive to + point to an OpenSSL SRP verifier file. To create the verifier file, use the + openssl tool:

    +

    + openssl srp -srpvfile passwd.srpv -add username +

    +

    After creating this file, specify it in the SSL server configuration:

    +

    + SSLSRPVerifierFile /path/to/passwd.srpv +

    +

    To force clients to use non-certificate TLS-SRP cipher suites, use the + following directive:

    +

    + SSLCipherSuite "!DSS:!aRSA:SRP" +

    + +
    top

    mod_ssl Support

    diff --git a/docs/manual/ssl/ssl_faq.html.fr b/docs/manual/ssl/ssl_faq.html.fr index 7aafc36083..a95980e3ae 100644 --- a/docs/manual/ssl/ssl_faq.html.fr +++ b/docs/manual/ssl/ssl_faq.html.fr @@ -24,6 +24,8 @@

    Langues Disponibles:  en  |  fr 

    +
    Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

    Le sage n'apporte pas de bonnes réponses, il pose les bonnes questions

    diff --git a/docs/manual/ssl/ssl_faq.xml.fr b/docs/manual/ssl/ssl_faq.xml.fr index 6075a741e7..9df7e96d14 100644 --- a/docs/manual/ssl/ssl_faq.xml.fr +++ b/docs/manual/ssl/ssl_faq.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/ssl/ssl_faq.xml.meta b/docs/manual/ssl/ssl_faq.xml.meta index 61db826966..a5d5a97804 100644 --- a/docs/manual/ssl/ssl_faq.xml.meta +++ b/docs/manual/ssl/ssl_faq.xml.meta @@ -8,6 +8,6 @@ en - fr + fr