From 3d961d1212caf12b9870676100daf28496ae94b5 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Fri, 8 Jun 2012 09:46:50 +0000 Subject: [PATCH] xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1347983 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/directives.html.de | 2 + docs/manual/mod/directives.html.en | 2 + docs/manual/mod/directives.html.es | 2 + docs/manual/mod/directives.html.ja.utf8 | 2 + docs/manual/mod/directives.html.ko.euc-kr | 2 + docs/manual/mod/directives.html.tr.utf8 | 2 + docs/manual/mod/directives.html.zh-cn | 2 + docs/manual/mod/mod_ssl.html.en | 44 +++++++++++++++++++ docs/manual/mod/quickreference.html.de | 2 + docs/manual/mod/quickreference.html.en | 2 + docs/manual/mod/quickreference.html.es | 2 + docs/manual/mod/quickreference.html.ja.utf8 | 2 + docs/manual/mod/quickreference.html.ko.euc-kr | 2 + docs/manual/mod/quickreference.html.tr.utf8 | 2 + docs/manual/mod/quickreference.html.zh-cn | 2 + docs/manual/ssl/ssl_faq.html.en | 21 +++++++++ docs/manual/ssl/ssl_faq.html.fr | 2 + docs/manual/ssl/ssl_faq.xml.fr | 2 +- docs/manual/ssl/ssl_faq.xml.meta | 2 +- 19 files changed, 97 insertions(+), 2 deletions(-) diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de index 15777ebf45..b2ef78c24f 100644 --- a/docs/manual/mod/directives.html.de +++ b/docs/manual/mod/directives.html.de @@ -600,6 +600,8 @@
  • SSLSessionCache
  • SSLSessionCacheTimeout
  • SSLSessionTicketKeyFile
    • +
  • SSLSRPUnknownUserSeed
    • +
  • SSLSRPVerifierFile
  • SSLStaplingCache
  • SSLStaplingErrorCacheTimeout
  • SSLStaplingFakeTryLater
    • diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index 16a8b9e4e5..432a9073ed 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -601,6 +601,8 @@
  • SSLSessionCache
  • SSLSessionCacheTimeout
  • SSLSessionTicketKeyFile
    • +
  • SSLSRPUnknownUserSeed
    • +
  • SSLSRPVerifierFile
  • SSLStaplingCache
  • SSLStaplingErrorCacheTimeout
  • SSLStaplingFakeTryLater
    • diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es index dc32120b9e..540ea33571 100644 --- a/docs/manual/mod/directives.html.es +++ b/docs/manual/mod/directives.html.es @@ -603,6 +603,8 @@
  • SSLSessionCache
  • SSLSessionCacheTimeout
  • SSLSessionTicketKeyFile
    • +
  • SSLSRPUnknownUserSeed
    • +
  • SSLSRPVerifierFile
  • SSLStaplingCache
  • SSLStaplingErrorCacheTimeout
  • SSLStaplingFakeTryLater
    • diff --git a/docs/manual/mod/directives.html.ja.utf8 b/docs/manual/mod/directives.html.ja.utf8 index 9e8f434201..d2bd9ef4db 100644 --- a/docs/manual/mod/directives.html.ja.utf8 +++ b/docs/manual/mod/directives.html.ja.utf8 @@ -598,6 +598,8 @@
  • SSLSessionCache
  • SSLSessionCacheTimeout
  • SSLSessionTicketKeyFile
    • +
  • SSLSRPUnknownUserSeed
    • +
  • SSLSRPVerifierFile
  • SSLStaplingCache
  • SSLStaplingErrorCacheTimeout
  • SSLStaplingFakeTryLater
    • diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr index 8d2372e785..31ce630a70 100644 --- a/docs/manual/mod/directives.html.ko.euc-kr +++ b/docs/manual/mod/directives.html.ko.euc-kr @@ -598,6 +598,8 @@
  • SSLSessionCache
  • SSLSessionCacheTimeout
  • SSLSessionTicketKeyFile
    • +
  • SSLSRPUnknownUserSeed
    • +
  • SSLSRPVerifierFile
  • SSLStaplingCache
  • SSLStaplingErrorCacheTimeout
  • SSLStaplingFakeTryLater
    • diff --git a/docs/manual/mod/directives.html.tr.utf8 b/docs/manual/mod/directives.html.tr.utf8 index 7483ee44fc..ad379d9db6 100644 --- a/docs/manual/mod/directives.html.tr.utf8 +++ b/docs/manual/mod/directives.html.tr.utf8 @@ -597,6 +597,8 @@
  • SSLSessionCache
  • SSLSessionCacheTimeout
  • SSLSessionTicketKeyFile
    • +
  • SSLSRPUnknownUserSeed
    • +
  • SSLSRPVerifierFile
  • SSLStaplingCache
  • SSLStaplingErrorCacheTimeout
  • SSLStaplingFakeTryLater
    • diff --git a/docs/manual/mod/directives.html.zh-cn b/docs/manual/mod/directives.html.zh-cn index 13ee31781a..ae1a11d6c6 100644 --- a/docs/manual/mod/directives.html.zh-cn +++ b/docs/manual/mod/directives.html.zh-cn @@ -596,6 +596,8 @@
  • SSLSessionCache
  • SSLSessionCacheTimeout
  • SSLSessionTicketKeyFile
    • +
  • SSLSRPUnknownUserSeed
    • +
  • SSLSRPVerifierFile
  • SSLStaplingCache
  • SSLStaplingErrorCacheTimeout
  • SSLStaplingFakeTryLater
    • diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en index 5e561dfa2d..a9067d4aec 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 @@ -654,6 +658,7 @@ specify the preference and order for the ciphers (see Table 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 @@ -684,6 +689,7 @@ specify the preference and order for the ciphers (see Table DH all ciphers using Diffie-Hellman key exchange EDH all ciphers using Ephemeral Diffie-Hellman key exchange ADH all ciphers using Anonymous Diffie-Hellman key exchange +SRP all ciphers using Secure Remote Password (SRP) key exchange DSS all ciphers using DSS authentication NULL all ciphers using no encryption @@ -2077,6 +2083,44 @@ 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
    +

    +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
    +

    +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" +

    +
    top

    SSLStaplingCache Directive

    diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de index fffcf13286..9953bb34f8 100644 --- a/docs/manual/mod/quickreference.html.de +++ b/docs/manual/mod/quickreference.html.de @@ -990,6 +990,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 9e34740b9f..0bf05c591e 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -975,6 +975,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 27ce21c964..f413ed181d 100644 --- a/docs/manual/mod/quickreference.html.es +++ b/docs/manual/mod/quickreference.html.es @@ -982,6 +982,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 3eeb6a1a6e..31aebea1a9 100644 --- a/docs/manual/mod/quickreference.html.ja.utf8 +++ b/docs/manual/mod/quickreference.html.ja.utf8 @@ -913,6 +913,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 38ae299519..defa19e264 100644 --- a/docs/manual/mod/quickreference.html.ko.euc-kr +++ b/docs/manual/mod/quickreference.html.ko.euc-kr @@ -937,6 +937,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 ca2d97db15..002e8565dd 100644 --- a/docs/manual/mod/quickreference.html.tr.utf8 +++ b/docs/manual/mod/quickreference.html.tr.utf8 @@ -972,6 +972,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 98be66315c..26f158bc8c 100644 --- a/docs/manual/mod/quickreference.html.zh-cn +++ b/docs/manual/mod/quickreference.html.zh-cn @@ -970,6 +970,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 0ccebfb2a2..4793ca4926 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 67f5569553..03ee02d3f6 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 e5bdd074f3..b98701d94b 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 -- 2.40.0