Replace '=for comment ifdef' with '=for openssl'

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10151)

diff --git a/doc/man1/openssl-ca.pod b/doc/man1/openssl-ca.pod
index 6f6580cb54f794ee9a1b876f5b18ceb515035c00..e51e5dda6fb61e4232cf5681d996aa84d7acfde0 100644 (file)
--- a/doc/man1/openssl-ca.pod
+++ b/doc/man1/openssl-ca.pod
@@ -59,7 +59,7 @@ B<openssl> B<ca>
 [B<-sm2-id> I<string>]
 [B<-sm2-hex-id> I<hex-string>]
 
-=for comment ifdef engine sm2-id sm2-hex-id
+=for openssl ifdef engine sm2-id sm2-hex-id
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-ciphers.pod b/doc/man1/openssl-ciphers.pod
index e0fd549b96efd9f5abdc21254814185ead6aab48..ed8e1a95a5326b2275268628a80ecc5dea511c6b 100644 (file)
--- a/doc/man1/openssl-ciphers.pod
+++ b/doc/man1/openssl-ciphers.pod
@@ -24,7 +24,7 @@ B<openssl> B<ciphers>
 [B<-ciphersuites> I<val>]
 [I<cipherlist>]
 
-=for comment ifdef ssl3 tls1 tls1_1 tls1_2 tls1_3 psk srp
+=for openssl ifdef ssl3 tls1 tls1_1 tls1_2 tls1_3 psk srp
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-cms.pod b/doc/man1/openssl-cms.pod
index 40ffd0fdde68e0d790cd704bca61796fd2f3de93..507490498c043905971811db38bfe94ef6d1472d 100644 (file)
--- a/doc/man1/openssl-cms.pod
+++ b/doc/man1/openssl-cms.pod
@@ -103,7 +103,7 @@ B<openssl> B<cms>
 [B<-subject> I<subj>]
 [I<cert.pem> ...]
 
-=for comment ifdef des-wrap engine
+=for openssl ifdef des-wrap engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-crl.pod b/doc/man1/openssl-crl.pod
index 1dcf6b0bb1743e54e559a4134ef06865ccac8c51..fa29d4b0c4fe503b933c38832e4d0f2456e34478 100644 (file)
--- a/doc/man1/openssl-crl.pod
+++ b/doc/man1/openssl-crl.pod
@@ -22,7 +22,7 @@ B<openssl> B<crl>
 [B<-CAfile> I<file>]
 [B<-CApath> I<dir>]
 
-=for comment ifdef hash_old
+=for openssl ifdef hash_old
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-dhparam.pod b/doc/man1/openssl-dhparam.pod
index 01eab5cc916f120feca58ca25739dad4f1999ad3..c7929e8126425dae12f1f2b5e4719093d60c86aa 100644 (file)
--- a/doc/man1/openssl-dhparam.pod
+++ b/doc/man1/openssl-dhparam.pod
@@ -25,7 +25,7 @@ B<openssl dhparam>
 [B<-engine> I<id>]
 [I<numbits>]
 
-=for comment ifdef dsaparam engine
+=for openssl ifdef dsaparam engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-dsa.pod b/doc/man1/openssl-dsa.pod
index 14a95284f16e8d068156d341205f0ba86ebcbb5d..ef219adaed0d3918ab265a487ed4cf96ce834799 100644 (file)
--- a/doc/man1/openssl-dsa.pod
+++ b/doc/man1/openssl-dsa.pod
@@ -33,7 +33,7 @@ B<openssl> B<dsa>
 [B<-pubout>]
 [B<-engine> I<id>]
 
-=for comment ifdef pvk-string pvk-weak pvk-none engine
+=for openssl ifdef pvk-string pvk-weak pvk-none engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-ec.pod b/doc/man1/openssl-ec.pod
index 82a33bbe246ed14cab5faada700e0b030a93ca57..d0d54bcb0bd8519ee687f8014bd08fbcc9050605 100644 (file)
--- a/doc/man1/openssl-ec.pod
+++ b/doc/man1/openssl-ec.pod
@@ -28,7 +28,7 @@ B<openssl> B<ec>
 [B<-check>]
 [B<-engine> I<id>]
 
-=for comment ifdef engine
+=for openssl ifdef engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-ecparam.pod b/doc/man1/openssl-ecparam.pod
index 46c0af7f589dd71273a3e9db7612b3d94f64746d..e52d1833e1acc418c9be02fc1d3b4c4869298804 100644 (file)
--- a/doc/man1/openssl-ecparam.pod
+++ b/doc/man1/openssl-ecparam.pod
@@ -27,7 +27,7 @@ B<openssl ecparam>
 [B<-genkey>]
 [B<-engine> I<id>]
 
-=for comment ifdef engine
+=for openssl ifdef engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-enc.pod b/doc/man1/openssl-enc.pod
index 327356da1cada91a3197aa5d3793eeb1f7195438..99486ee1521cfe3df11d95518c86ed77b1280a6d 100644 (file)
--- a/doc/man1/openssl-enc.pod
+++ b/doc/man1/openssl-enc.pod
@@ -39,7 +39,7 @@ B<openssl> B<enc>|I<cipher>
 [B<-writerand> I<file>]
 [B<-engine> I<id>]
 
-=for comment ifdef z engine
+=for openssl ifdef z engine
 
 B<openssl> I<cipher> [B<...>]
 

diff --git a/doc/man1/openssl-gendsa.pod b/doc/man1/openssl-gendsa.pod
index 8fc91cf64cf1b5eb47fa20149116b3ca7f670282..62fc25089e8227c3c093ddc451e41e116793ee99 100644 (file)
--- a/doc/man1/openssl-gendsa.pod
+++ b/doc/man1/openssl-gendsa.pod
@@ -27,7 +27,7 @@ B<openssl> B<gendsa>
 [B<-verbose>]
 [I<paramfile>]
 
-=for comment ifdef engine
+=for openssl ifdef engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-genpkey.pod b/doc/man1/openssl-genpkey.pod
index 3fd6bef091bde0b1d9a9ec5b34475daf39e65dab..3c2ff77f73a712f20186eeda0b78e70fcc6c48da 100644 (file)
--- a/doc/man1/openssl-genpkey.pod
+++ b/doc/man1/openssl-genpkey.pod
@@ -19,7 +19,7 @@ B<openssl> B<genpkey>
 [B<-genparam>]
 [B<-text>]
 
-=for comment ifdef engine
+=for openssl ifdef engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-genrsa.pod b/doc/man1/openssl-genrsa.pod
index 27ca9f7402e81334312a68e3ae1a9d6f21fb29fb..2b3c5c303f6bb1af1d8da9c2f8dde727b562a82a 100644 (file)
--- a/doc/man1/openssl-genrsa.pod
+++ b/doc/man1/openssl-genrsa.pod
@@ -30,7 +30,7 @@ B<openssl> B<genrsa>
 [B<-verbose>]
 [B<numbits>]
 
-=for comment ifdef engine
+=for openssl ifdef engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-ocsp.pod b/doc/man1/openssl-ocsp.pod
index 7f6c31fe9443a0c8595a7115878d82ba890a0bfc..5e75e6af538179c54bfb2886c21bb9073bebd219 100644 (file)
--- a/doc/man1/openssl-ocsp.pod
+++ b/doc/man1/openssl-ocsp.pod
@@ -90,7 +90,7 @@ B<openssl> B<ocsp>
 [B<-rcid> I<digest>]
 [B<-I<digest>>]
 
-=for comment ifdef multi
+=for openssl ifdef multi
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-passwd.pod b/doc/man1/openssl-passwd.pod
index 27a5c1bf61aa8bbc65c64df74894039683ca2eaa..c1daac17abfbe2f0f90a7d5b6fe35b6ec367aef2 100644 (file)
--- a/doc/man1/openssl-passwd.pod
+++ b/doc/man1/openssl-passwd.pod
@@ -24,7 +24,7 @@ B<openssl passwd>
 [B<-writerand> I<file>]
 {I<password>}
 
-=for comment ifdef crypt
+=for openssl ifdef crypt
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-pkcs12.pod b/doc/man1/openssl-pkcs12.pod
index af044d5da1f3e371e43256fe8d1be4dd1fa1b17d..412438285fe9e8d222ce79c3f4e09309be981379 100644 (file)
--- a/doc/man1/openssl-pkcs12.pod
+++ b/doc/man1/openssl-pkcs12.pod
@@ -44,7 +44,7 @@ B<openssl> B<pkcs12>
 [B<-no-CApath>]
 [B<-CSP> I<name>]
 
-=for comment ifdef engine
+=for openssl ifdef engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-pkcs7.pod b/doc/man1/openssl-pkcs7.pod
index b21feeea5f82809e87e3817da7ea16709dda8737..b11973f20652422cc80fddb099fe800705237e56 100644 (file)
--- a/doc/man1/openssl-pkcs7.pod
+++ b/doc/man1/openssl-pkcs7.pod
@@ -17,7 +17,7 @@ B<openssl> B<pkcs7>
 [B<-noout>]
 [B<-engine> I<id>]
 
-=for comment ifdef engine
+=for openssl ifdef engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-pkcs8.pod b/doc/man1/openssl-pkcs8.pod
index 7015ab9fa30dda13889c131fdc80725115e5c26c..01c13487b6b71cd4a5e44ac8f9fe9bb463d79f7f 100644 (file)
--- a/doc/man1/openssl-pkcs8.pod
+++ b/doc/man1/openssl-pkcs8.pod
@@ -30,7 +30,7 @@ B<openssl> B<pkcs8>
 [B<-scrypt_r> I<r>]
 [B<-scrypt_p> I<p>]
 
-=for comment ifdef engine scrypt scrypt_N scrypt_r scrypt_p
+=for openssl ifdef engine scrypt scrypt_N scrypt_r scrypt_p
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-pkey.pod b/doc/man1/openssl-pkey.pod
index 66ec9d17c3c60ac6917adc2c109cacef6eac9cbb..0290ee2662ed909c7b1dd54221824bc1064465c0 100644 (file)
--- a/doc/man1/openssl-pkey.pod
+++ b/doc/man1/openssl-pkey.pod
@@ -25,7 +25,7 @@ B<openssl> B<pkey>
 [B<-check>]
 [B<-pubcheck>]
 
-=for comment ifdef engine
+=for openssl ifdef engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-pkeyparam.pod b/doc/man1/openssl-pkeyparam.pod
index 9b69c7bbf74ecdd2d249421bf8a6d02ba4e76bcd..36ff7f5245bab826daae725d30985bbaa9be0886 100644 (file)
--- a/doc/man1/openssl-pkeyparam.pod
+++ b/doc/man1/openssl-pkeyparam.pod
@@ -15,7 +15,7 @@ B<openssl> B<pkeyparam>
 [B<-engine> I<id>]
 [B<-check>]
 
-=for comment ifdef engine
+=for openssl ifdef engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-pkeyutl.pod b/doc/man1/openssl-pkeyutl.pod
index b614b4af3781314b3ffd488043ad8620b6deca56..6ad23064215adcb2fc3ea247c35a4b12bcd2d408 100644 (file)
--- a/doc/man1/openssl-pkeyutl.pod
+++ b/doc/man1/openssl-pkeyutl.pod
@@ -38,7 +38,7 @@ B<openssl> B<pkeyutl>
 [B<-engine> I<id>]
 [B<-engine_impl>]
 
-=for comment ifdef engine engine_impl
+=for openssl ifdef engine engine_impl
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-rand.pod b/doc/man1/openssl-rand.pod
index 6ce3326efd75c6b497a29973ac166e69b0414748..f63859e304611b054e29625856a1ea8caa7a92e5 100644 (file)
--- a/doc/man1/openssl-rand.pod
+++ b/doc/man1/openssl-rand.pod
@@ -15,7 +15,7 @@ B<openssl rand>
 [B<-hex>]
 I<num>
 
-=for comment ifdef engine
+=for openssl ifdef engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-req.pod b/doc/man1/openssl-req.pod
index 13126734a40ffcc00fae86b77476339690794949..13f62574928bddc854cd5bf3432523e014ae89a7 100644 (file)
--- a/doc/man1/openssl-req.pod
+++ b/doc/man1/openssl-req.pod
@@ -51,7 +51,7 @@ B<openssl> B<req>
 [B<-sm2-id> I<string>]
 [B<-sm2-hex-id> I<hex-string>]
 
-=for comment ifdef engine keygen_engine sm2-id sm2-hex-id
+=for openssl ifdef engine keygen_engine sm2-id sm2-hex-id
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-rsa.pod b/doc/man1/openssl-rsa.pod
index 61a3f267e566f1353c1a203bd636eca42360a77d..ed6505c138cf18eacc5b55f6931c47e41aba8f2c 100644 (file)
--- a/doc/man1/openssl-rsa.pod
+++ b/doc/man1/openssl-rsa.pod
@@ -36,7 +36,7 @@ B<openssl> B<rsa>
 [B<-RSAPublicKey_out>]
 [B<-engine> I<id>]
 
-=for comment ifdef pvk-strong pvk-weak pvk-none engine
+=for openssl ifdef pvk-strong pvk-weak pvk-none engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-rsautl.pod b/doc/man1/openssl-rsautl.pod
index 0774b92797e52941bb3d8cd952e1a502f7c2b3e7..508237364c0a497a819f82beae1d771a9c5cc584 100644 (file)
--- a/doc/man1/openssl-rsautl.pod
+++ b/doc/man1/openssl-rsautl.pod
@@ -26,7 +26,7 @@ B<openssl> B<rsautl>
 [B<-hexdump>]
 [B<-asn1parse>]
 
-=for comment ifdef engine
+=for openssl ifdef engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-s_client.pod b/doc/man1/openssl-s_client.pod
index 598e6836bce360040b7378e39d17026f6898e098..b7021cdf9ab0d1e963373dd71be61944e1e9236c 100644 (file)
--- a/doc/man1/openssl-s_client.pod
+++ b/doc/man1/openssl-s_client.pod
@@ -139,15 +139,15 @@ B<openssl> B<s_client>
 [B<-enable_pha>]
 [I<host>:I<port>]
 
-=for comment ifdef engine ssl_client_engine ct noct ctlogfile
+=for openssl ifdef engine ssl_client_engine ct noct ctlogfile
 
-=for comment ifdef ssl3 unix 4 6 use_srtp status trace wdebug nextprotoneg
+=for openssl ifdef ssl3 unix 4 6 use_srtp status trace wdebug nextprotoneg
 
-=for comment ifdef ssl3 tls1 tls1_1 tls1_2 tls1_3 dtls mtu dtls1 dtls1_2
+=for openssl ifdef ssl3 tls1 tls1_1 tls1_2 tls1_3 dtls mtu dtls1 dtls1_2
 
-=for comment ifdef sctp_label_bug sctp
+=for openssl ifdef sctp_label_bug sctp
 
-=for comment ifdef srpuser srppass srp_lateuser srp_moregroups srp_strength
+=for openssl ifdef srpuser srppass srp_lateuser srp_moregroups srp_strength
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-s_server.pod b/doc/man1/openssl-s_server.pod
index 4c44db820ad3184bb5cdcddb63152785fd6c7761..d035f5e4fd97abb55cd7b68900ad1df225720715 100644 (file)
--- a/doc/man1/openssl-s_server.pod
+++ b/doc/man1/openssl-s_server.pod
@@ -185,15 +185,15 @@ B<openssl> B<s_server>
 [B<-no_anti_replay>]
 [B<-http_server_binmode>]
 
-=for comment ifdef unix 4 6 unlink no_dhe nextprotoneg use_srtp engine
+=for openssl ifdef unix 4 6 unlink no_dhe nextprotoneg use_srtp engine
 
-=for comment ifdef status status_verbose status_timeout status_url status_file
+=for openssl ifdef status status_verbose status_timeout status_url status_file
 
-=for comment ifdef psk_hint srpvfile srpuserseed sctp sctp_label_bug
+=for openssl ifdef psk_hint srpvfile srpuserseed sctp sctp_label_bug
 
-=for comment ifdef sctp sctp_label_bug trace mtu timeout listen
+=for openssl ifdef sctp sctp_label_bug trace mtu timeout listen
 
-=for comment ifdef ssl3 tls1 tls1_1 tls1_2 tls1_3 dtls mtu dtls1 dtls1_2
+=for openssl ifdef ssl3 tls1 tls1_1 tls1_2 tls1_3 dtls mtu dtls1 dtls1_2
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-s_time.pod b/doc/man1/openssl-s_time.pod
index edeeb87b6910b3ed01305c0bcfabb6c102f4a560..4af9e84a608c2d389b6777b7c80646e41c73c50c 100644 (file)
--- a/doc/man1/openssl-s_time.pod
+++ b/doc/man1/openssl-s_time.pod
@@ -30,7 +30,7 @@ B<openssl> B<s_time>
 [B<-cipher> I<cipherlist>]
 [B<-ciphersuites> I<val>]
 
-=for comment ifdef ssl3 tls1 tls1_1 tls1_2 tls1_3
+=for openssl ifdef ssl3 tls1 tls1_1 tls1_2 tls1_3
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-smime.pod b/doc/man1/openssl-smime.pod
index 50fabe3fb1166790a4314b153ad2c73b155d801e..b8cb7cd63559084a78c9beac4dd6d85fa8a58bfb 100644 (file)
--- a/doc/man1/openssl-smime.pod
+++ b/doc/man1/openssl-smime.pod
@@ -70,7 +70,7 @@ B<openssl> B<smime>
 [B<-md> I<digest>]
 I<cert.pem> ...
 
-=for comment ifdef engine
+=for openssl ifdef engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-speed.pod b/doc/man1/openssl-speed.pod
index fd788729961fab7972121e2b78019e0bb69a7284..d227b0235c7a1e72314673ca262d8792da678d83 100644 (file)
--- a/doc/man1/openssl-speed.pod
+++ b/doc/man1/openssl-speed.pod
@@ -21,7 +21,7 @@ B<openssl speed>
 [B<-bytes> I<num>]
 [I<algorithm> ...]
 
-=for comment ifdef cmac multi async_jobs engine
+=for openssl ifdef cmac multi async_jobs engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-spkac.pod b/doc/man1/openssl-spkac.pod
index 0f26986f921261b4ce8c0b053ca64c1021598907..8de83444c70aa6baf7e44b3a1433c0c54514a42f 100644 (file)
--- a/doc/man1/openssl-spkac.pod
+++ b/doc/man1/openssl-spkac.pod
@@ -21,7 +21,7 @@ B<openssl> B<spkac>
 [B<-verify>]
 [B<-engine> I<id>]
 
-=for comment ifdef engine
+=for openssl ifdef engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-srp.pod b/doc/man1/openssl-srp.pod
index d25867a36b4815df0fc9d6c0a7cd4bf2d45cfa51..9096499750a3c579dff11f3bbb62907c6fbf3364 100644 (file)
--- a/doc/man1/openssl-srp.pod
+++ b/doc/man1/openssl-srp.pod
@@ -22,7 +22,7 @@ B<openssl srp>
 [B<-passout> I<arg>]
 [I<user> ...]
 
-=for comment ifdef engine
+=for openssl ifdef engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-ts.pod b/doc/man1/openssl-ts.pod
index 2e095d4d1343b7765505294cbd012800e004e6b5..1f7a0b7341cc87f6f5d9879a6723a9765b445d14 100644 (file)
--- a/doc/man1/openssl-ts.pod
+++ b/doc/man1/openssl-ts.pod
@@ -82,7 +82,7 @@ I<verify options:>
 [B<-verify_name> I<name>]
 [B<-x509_strict>]
 
-=for comment ifdef engine
+=for openssl ifdef engine
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-verify.pod b/doc/man1/openssl-verify.pod
index d795afca5de911b1cd62dcc5fdfc770bb3b24cac..63277949e16573713b2f3a6fadc6cf1d61b7a1a2 100644 (file)
--- a/doc/man1/openssl-verify.pod
+++ b/doc/man1/openssl-verify.pod
@@ -54,7 +54,7 @@ B<openssl> B<verify>
 [B<-->]
 [I<certificate> ...]
 
-=for comment ifdef engine sm2-id sm2-hex-id
+=for openssl ifdef engine sm2-id sm2-hex-id
 
 =head1 DESCRIPTION
 

diff --git a/doc/man1/openssl-x509.pod b/doc/man1/openssl-x509.pod
index b4d41df3b221a19d0a9e216ce807343650ac914b..731cb61344ff2e4522c407e81a44c56940183c5f 100644 (file)
--- a/doc/man1/openssl-x509.pod
+++ b/doc/man1/openssl-x509.pod
@@ -68,7 +68,7 @@ B<openssl> B<x509>
 [B<-engine> I<id>]
 [B<-preserve_dates>]
 
-=for comment ifdef engine subject_hash_old issuer_hash_old
+=for openssl ifdef engine subject_hash_old issuer_hash_old
 
 =head1 DESCRIPTION
 

diff --git a/util/find-doc-nits b/util/find-doc-nits
index 30cdd77fe60c7cf41b3d15ba9b475c2535a74054..576eac2cb7a32fcdd5eaef246b7b99c67a1d2057 100755 (executable)
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -789,7 +789,7 @@ sub checkflags {
     while ( <CFH> ) {
         chop;
         last if /DESCRIPTION/;
-        if ( /=for comment ifdef (.*)/ ) {
+        if ( /=for openssl ifdef (.*)/ ) {
             foreach my $f ( split / /, $1 ) {
                 $localskips{$f} = 1;
             }