Nikos Mavrogiannopoulos wrote: > Corrected. Thank you. No, that's not the one I'm talking about. I wrote about gnutls_priority_init(3) while you fixed gnutls-cli(1). 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.
I guess it would be nice to have some kind of generic escaping mechanism in order to include verbatim % and @ characters. Up to you to decide how you would like to encode this. The current hack works for current gnutls, as the gnutls_priority_init contains the only occurrences of ``"%'' inside a documentation comment, and none of them is a constant. Greetings, Martin
diff --git a/doc/scripts/gdoc b/doc/scripts/gdoc index 82d9e0a..b2416a0 100755 --- 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 aba04ff..4f34b98 100644 --- 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
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Help-gnutls mailing list [email protected] http://lists.gnu.org/mailman/listinfo/help-gnutls
