Applied patch by Martin von Gagern:

The attached patch fixes gnutls_priority_init(3), but in a very hackish way, treating
a percent sign as indicating a constant only if it is not immediately
preceded by a double quote.

diff --git a/doc/scripts/gdoc b/doc/scripts/gdoc
index 82d9e0af1bd412aa8b4592a02d86768ff9c4124a..b2416a036a68f1794c00c59d0190de9c4dcd283c 100755 (executable)
--- a/doc/scripts/gdoc
+++ b/doc/scripts/gdoc
@@ -132,7 +132,7 @@
 use POSIX qw(strftime);
 
 # match expressions used to find embedded type information
-$type_constant = "\\\%(\\w+)";
+$type_constant = "(?<!\")\\\%(\\w+)";
 $type_func = "(\\w+\\(\\))";
 $type_param = "\\\@(\\w+)";
 $type_struct = "\\\#(\\w+)";

diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index aba04ffe8ad5b984a2bd28798c1984150317cb05..4f34b983700072a4c5235fca3df75e1c653dcc85 100644 (file)
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -469,13 +469,13 @@ gnutls_priority_set (gnutls_session_t session, gnutls_priority_t priority)
   * compression methods.
   *
   * Special keywords:
-  * '!' or '-' appended with an algorithm will remove this algorithm.
-  * '+' appended with an algorithm will add this algorithm.
-  * '%COMPAT' will enable compatibility features for a server.
-  * '%SSL3_RECORD_VERSION' will use SSL3.0 record version in client hello
-  * '%VERIFY_ALLOW_SIGN_RSA_MD5' will allow RSA-MD5 signatures in
+  * "!" or "-" appended with an algorithm will remove this algorithm.
+  * "+" appended with an algorithm will add this algorithm.
+  * "%COMPAT" will enable compatibility features for a server.
+  * "%SSL3_RECORD_VERSION" will use SSL3.0 record version in client hello.
+  * "%VERIFY_ALLOW_SIGN_RSA_MD5" will allow RSA-MD5 signatures in
   * certificate chains.
-  * '%VERIFY_ALLOW_X509_V1_CA_CRT' will allow V1 CAs in chains.
+  * "%VERIFY_ALLOW_X509_V1_CA_CRT" will allow V1 CAs in chains.
   *
   * To avoid collisions in order to specify a compression algorithm in
   * this string you have to prefix it with "COMP-", protocol versions