Skip to content

Commit 19aa702

Browse files
committed
mcrypt : fix XML by converting para to simpara tags via script
1 parent 5776cb6 commit 19aa702

37 files changed

+331
-340
lines changed

reference/mcrypt/book.xml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 67ae2b943e98fcbf3f3f93e8bce6eca97c2c859d Maintainer: yuanyuqiang Status: ready -->
3+
<!-- EN-Revision: e849a6c4225bd992474793ec6983df7898cae0be Maintainer: yuanyuqiang Status: ready -->
44
<!-- CREDITS: mowangjuanzi -->
5-
<book xml:id="book.mcrypt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
5+
<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.mcrypt">
66
<?phpdoc extension-membership="pecl" ?>
77
<title>Mcrypt</title>
8-
8+
99
<!-- {{{ preface -->
1010
<preface xml:id="intro.mcrypt">
1111
&reftitle.intro;
@@ -21,27 +21,26 @@
2121
</member>
2222
</simplelist>
2323
</warning>
24-
24+
2525
<note>
26-
<para>
26+
<simpara>
2727
&pecl.moved-ver;7.2.0.
28-
</para>
28+
</simpara>
2929
</note>
30-
31-
<para>
30+
31+
<simpara>
3232
本扩展是 mcrypt 库的接口,mcrypt 库提供了对多种块算法的支持,包括:DES、TripleDES、Blowfish(默认)、3-WAY、SAFER-SK64、SAFER-SK128、TWOFISH、TEA、RC2
3333
以及 GOST,并且支持 CBC、OFB、CFB 和 ECB 密码模式。此外,还支持诸如 RC6 和 IDEA 这两种“非免费”的算法。默认情况下,CFB/OFB 是 8bit。
34-
</para>
34+
</simpara>
3535
</preface>
3636
<!-- }}} -->
37-
37+
3838
&reference.mcrypt.setup;
3939
&reference.mcrypt.constants;
4040
&reference.mcrypt.ciphers;
4141
&reference.mcrypt.reference;
4242

4343
</book>
44-
4544
<!-- Keep this comment at the end of the file
4645
Local variables:
4746
mode: sgml
@@ -62,4 +61,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
6261
vim: et tw=78 syn=sgml
6362
vi: ts=1 sw=1
6463
-->
65-

reference/mcrypt/ciphers.xml

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: af4410a7e15898c3dbe83d6ea38246745ed9c6fb Maintainer: yuanyuqiang Status: ready -->
3+
<!-- EN-Revision: e849a6c4225bd992474793ec6983df7898cae0be Maintainer: yuanyuqiang Status: ready -->
44
<!-- Reviewed: no -->
5-
6-
<appendix xml:id="mcrypt.ciphers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
5+
<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="mcrypt.ciphers">
76
<title>Mcrypt 密码</title>
87
<para>
98
下表是 mcrypt 扩展所支持的密码。
@@ -15,49 +14,49 @@
1514
来进行访问。
1615
<itemizedlist>
1716
<listitem><simpara>MCRYPT_3DES</simpara></listitem>
18-
<listitem><simpara>MCRYPT_ARCFOUR_IV ( 仅 libmcrypt > 2.4.x 可用 )</simpara></listitem>
19-
<listitem><simpara>MCRYPT_ARCFOUR ( 仅 libmcrypt > 2.4.x 可用 )</simpara></listitem>
17+
<listitem><simpara>MCRYPT_ARCFOUR_IV ( 仅 libmcrypt &gt; 2.4.x 可用 )</simpara></listitem>
18+
<listitem><simpara>MCRYPT_ARCFOUR ( 仅 libmcrypt &gt; 2.4.x 可用 )</simpara></listitem>
2019
<listitem><simpara>MCRYPT_BLOWFISH</simpara></listitem>
2120
<listitem><simpara>MCRYPT_CAST_128</simpara></listitem>
2221
<listitem><simpara>MCRYPT_CAST_256</simpara></listitem>
2322
<listitem><simpara>MCRYPT_CRYPT</simpara></listitem>
2423
<listitem><simpara>MCRYPT_DES</simpara></listitem>
2524
<listitem><simpara>MCRYPT_DES_COMPAT ( 仅 libmcrypt 2.2.x 可用 )</simpara></listitem>
26-
<listitem><simpara>MCRYPT_ENIGMA ( 仅 libmcrypt > 2.4.x 可用,MCRYPT_CRYPT 的别名)</simpara></listitem>
25+
<listitem><simpara>MCRYPT_ENIGMA ( 仅 libmcrypt &gt; 2.4.x 可用,MCRYPT_CRYPT 的别名)</simpara></listitem>
2726
<listitem><simpara>MCRYPT_GOST</simpara></listitem>
2827
<listitem><simpara>MCRYPT_IDEA (非免费算法)</simpara></listitem>
29-
<listitem><simpara>MCRYPT_LOKI97 ( 仅 libmcrypt > 2.4.x 可用 )</simpara></listitem>
30-
<listitem><simpara>MCRYPT_MARS ( 仅 libmcrypt > 2.4.x 可用,非免费算法)</simpara></listitem>
31-
<listitem><simpara>MCRYPT_PANAMA ( 仅 libmcrypt > 2.4.x 可用 )</simpara></listitem>
32-
<listitem><simpara>MCRYPT_RIJNDAEL_128 ( 仅 libmcrypt > 2.4.x 可用 )</simpara></listitem>
33-
<listitem><simpara>MCRYPT_RIJNDAEL_192 ( 仅 libmcrypt > 2.4.x 可用 )</simpara></listitem>
34-
<listitem><simpara>MCRYPT_RIJNDAEL_256 ( 仅 libmcrypt > 2.4.x 可用 )</simpara></listitem>
28+
<listitem><simpara>MCRYPT_LOKI97 ( 仅 libmcrypt &gt; 2.4.x 可用 )</simpara></listitem>
29+
<listitem><simpara>MCRYPT_MARS ( 仅 libmcrypt &gt; 2.4.x 可用,非免费算法)</simpara></listitem>
30+
<listitem><simpara>MCRYPT_PANAMA ( 仅 libmcrypt &gt; 2.4.x 可用 )</simpara></listitem>
31+
<listitem><simpara>MCRYPT_RIJNDAEL_128 ( 仅 libmcrypt &gt; 2.4.x 可用 )</simpara></listitem>
32+
<listitem><simpara>MCRYPT_RIJNDAEL_192 ( 仅 libmcrypt &gt; 2.4.x 可用 )</simpara></listitem>
33+
<listitem><simpara>MCRYPT_RIJNDAEL_256 ( 仅 libmcrypt &gt; 2.4.x 可用 )</simpara></listitem>
3534
<listitem><simpara>MCRYPT_RC2</simpara></listitem>
3635
<listitem><simpara>MCRYPT_RC4 ( 仅 libmcrypt 2.2.x 可用 )</simpara></listitem>
37-
<listitem><simpara>MCRYPT_RC6 ( 仅 libmcrypt > 2.4.x 可用 )</simpara></listitem>
36+
<listitem><simpara>MCRYPT_RC6 ( 仅 libmcrypt &gt; 2.4.x 可用 )</simpara></listitem>
3837
<listitem><simpara>MCRYPT_RC6_128 ( 仅 libmcrypt 2.2.x 可用 )</simpara></listitem>
3938
<listitem><simpara>MCRYPT_RC6_192 ( 仅 libmcrypt 2.2.x 可用 )</simpara></listitem>
4039
<listitem><simpara>MCRYPT_RC6_256 ( 仅 libmcrypt 2.2.x 可用 )</simpara></listitem>
4140
<listitem><simpara>MCRYPT_SAFER64</simpara></listitem>
4241
<listitem><simpara>MCRYPT_SAFER128</simpara></listitem>
43-
<listitem><simpara>MCRYPT_SAFERPLUS ( 仅 libmcrypt > 2.4.x 可用 )</simpara></listitem>
44-
<listitem><simpara>MCRYPT_SERPENT( 仅 libmcrypt > 2.4.x 可用 )</simpara></listitem>
42+
<listitem><simpara>MCRYPT_SAFERPLUS ( 仅 libmcrypt &gt; 2.4.x 可用 )</simpara></listitem>
43+
<listitem><simpara>MCRYPT_SERPENT( 仅 libmcrypt &gt; 2.4.x 可用 )</simpara></listitem>
4544
<listitem><simpara>MCRYPT_SERPENT_128 ( 仅 libmcrypt 2.2.x 可用 )</simpara></listitem>
4645
<listitem><simpara>MCRYPT_SERPENT_192 ( 仅 libmcrypt 2.2.x 可用 )</simpara></listitem>
4746
<listitem><simpara>MCRYPT_SERPENT_256 ( 仅 libmcrypt 2.2.x 可用 )</simpara></listitem>
48-
<listitem><simpara>MCRYPT_SKIPJACK ( 仅 libmcrypt > 2.4.x 可用 )</simpara></listitem>
47+
<listitem><simpara>MCRYPT_SKIPJACK ( 仅 libmcrypt &gt; 2.4.x 可用 )</simpara></listitem>
4948
<listitem><simpara>MCRYPT_TEAN ( 仅 libmcrypt 2.2.x 可用 )</simpara></listitem>
5049
<listitem><simpara>MCRYPT_THREEWAY</simpara></listitem>
51-
<listitem><simpara>MCRYPT_TRIPLEDES ( 仅 libmcrypt > 2.4.x 可用 )</simpara></listitem>
50+
<listitem><simpara>MCRYPT_TRIPLEDES ( 仅 libmcrypt &gt; 2.4.x 可用 )</simpara></listitem>
5251
<listitem><simpara>MCRYPT_TWOFISH ( mcrypt 2.x 之前的版本,或者 2.4.x 之后版本可用 )</simpara></listitem>
5352
<listitem><simpara>MCRYPT_TWOFISH128 (TWOFISHxxx 在新的 2.x 版本可用,但在 2.4.x 版本不可用)</simpara></listitem>
5453
<listitem><simpara>MCRYPT_TWOFISH192</simpara></listitem>
5554
<listitem><simpara>MCRYPT_TWOFISH256</simpara></listitem>
56-
<listitem><simpara>MCRYPT_WAKE ( 仅 libmcrypt > 2.4.x 可用 )</simpara></listitem>
57-
<listitem><simpara>MCRYPT_XTEA ( 仅 libmcrypt > 2.4.x 可用 )</simpara></listitem>
55+
<listitem><simpara>MCRYPT_WAKE ( 仅 libmcrypt &gt; 2.4.x 可用 )</simpara></listitem>
56+
<listitem><simpara>MCRYPT_XTEA ( 仅 libmcrypt &gt; 2.4.x 可用 )</simpara></listitem>
5857
</itemizedlist>
5958
</para>
60-
<para>
59+
<simpara>
6160
如果使用 <constant>CFB</constant> 和 <constant>OFB</constant> 模式,
6261
必须提供初始向量(IV),
6362
如果使用 <constant>CBC</constant> 模式,
@@ -68,9 +67,8 @@
6867
例如文件名的 MD5 散列值,
6968
这样你就可以把初始向量和加密后的数据一起传输
7069
(关于本话题的更多信息,请参见 &book.applied.cryptography; 9.3 一节)。
71-
</para>
70+
</simpara>
7271
</appendix>
73-
7472
<!-- Keep this comment at the end of the file
7573
Local variables:
7674
mode: sgml
@@ -91,4 +89,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
9189
vim: et tw=78 syn=sgml
9290
vi: ts=1 sw=1
9391
-->
94-

reference/mcrypt/configure.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 4df3145f2badb48519b4eeee7dab307b2c11d74e Maintainer: yuanyuqiang Status: ready -->
3+
<!-- EN-Revision: e849a6c4225bd992474793ec6983df7898cae0be Maintainer: yuanyuqiang Status: ready -->
44
<!-- CREDITS: mowangjuanzi -->
5-
<section xml:id="mcrypt.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
5+
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="mcrypt.installation">
66
&reftitle.install;
7-
<para>
7+
<simpara>
88
&pecl.moved-ver;7.2.0
9-
</para>
10-
<para>
9+
</simpara>
10+
<simpara>
1111
&pecl.info;
1212
<link xlink:href="&url.pecl.package;mcrypt">&url.pecl.package;mcrypt</link>.
13-
</para>
13+
</simpara>
1414
</section>
15-
1615
<!-- Keep this comment at the end of the file
1716
Local variables:
1817
mode: sgml

reference/mcrypt/functions/mcrypt-create-iv.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 6126b024cb929b12ea29d9676671e4dde342f03d Maintainer: yuanyuqiang Status: ready -->
3+
<!-- EN-Revision: e849a6c4225bd992474793ec6983df7898cae0be Maintainer: yuanyuqiang Status: ready -->
44
<!-- CREDITS: mowangjuanzi -->
55
<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mcrypt-create-iv">
66
<refnamediv>
@@ -24,14 +24,14 @@
2424
<methodparam><type>int</type><parameter>size</parameter></methodparam>
2525
<methodparam choice="opt"><type>int</type><parameter>source</parameter><initializer>MCRYPT_DEV_URANDOM</initializer></methodparam>
2626
</methodsynopsis>
27-
<para>
27+
<simpara>
2828
从随机源创建初始向量。
29-
</para>
30-
<para>
29+
</simpara>
30+
<simpara>
3131
初始向量只是为了给加密算法提供一个可用的种子,
3232
所以它不需要安全保护,
3333
你甚至可以随同密文一起发布初始向量也不会对安全性带来影响。
34-
</para>
34+
</simpara>
3535
</refsect1>
3636

3737
<refsect1 role="parameters">
@@ -40,27 +40,27 @@
4040
<varlistentry>
4141
<term><parameter>size</parameter></term>
4242
<listitem>
43-
<para>
43+
<simpara>
4444
初始向量大小。
45-
</para>
45+
</simpara>
4646
</listitem>
4747
</varlistentry>
4848
<varlistentry>
4949
<term><parameter>source</parameter></term>
5050
<listitem>
51-
<para>
51+
<simpara>
5252
初始向量数据来源。可选值有:
5353
<constant>MCRYPT_RAND</constant> (系统随机数生成器),
5454
<constant>MCRYPT_DEV_RANDOM</constant> (从
5555
<filename>/dev/random</filename> 文件读取数据) 和
5656
<constant>MCRYPT_DEV_URANDOM</constant> (从
5757
<filename>/dev/urandom</filename> 文件读取数据)。
5858
在 Windows 平台,PHP 5.3.0 之前的版本中,仅支持 <constant>MCRYPT_RAND</constant>。
59-
</para>
60-
<para>
59+
</simpara>
60+
<simpara>
6161
请注意,在 PHP 5.6.0 之前的版本中,
6262
此参数的默认值为 <constant>MCRYPT_DEV_RANDOM</constant>。
63-
</para>
63+
</simpara>
6464
<note>
6565
<simpara>
6666
需要注意的是,如果没有更多可用的用来产生随机数据的信息,那么
@@ -74,9 +74,9 @@
7474

7575
<refsect1 role="returnvalues">
7676
&reftitle.returnvalues;
77-
<para>
77+
<simpara>
7878
返回初始向量。如果发生错误,则返回 &false;
79-
</para>
79+
</simpara>
8080
</refsect1>
8181

8282
<refsect1 role="examples">

reference/mcrypt/functions/mcrypt-decrypt.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 6126b024cb929b12ea29d9676671e4dde342f03d Maintainer: yuanyuqiang Status: ready -->
3+
<!-- EN-Revision: e849a6c4225bd992474793ec6983df7898cae0be Maintainer: yuanyuqiang Status: ready -->
44
<!-- CREDITS: mowangjuanzi -->
55
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-decrypt">
66
<refnamediv>
@@ -20,9 +20,9 @@
2020
<methodparam><type>string</type><parameter>mode</parameter></methodparam>
2121
<methodparam choice="opt"><type>string</type><parameter>iv</parameter></methodparam>
2222
</methodsynopsis>
23-
<para>
23+
<simpara>
2424
解密 <parameter>data</parameter> 并返回明文。
25-
</para>
25+
</simpara>
2626
</refsect1>
2727
<refsect1 role="parameters">
2828
&reftitle.parameters;
@@ -36,21 +36,21 @@
3636
<varlistentry>
3737
<term><parameter>key</parameter></term>
3838
<listitem>
39-
<para>
39+
<simpara>
4040
数据加密密钥。
4141
如果密钥长度不是加解密算法能够支持的有效长度,
4242
那么会产生警告并且返回 &false;
43-
</para>
43+
</simpara>
4444
</listitem>
4545
</varlistentry>
4646
<varlistentry>
4747
<term><parameter>data</parameter></term>
4848
<listitem>
49-
<para>
49+
<simpara>
5050
要使用给定的 <parameter>cipher</parameter> 和
5151
<parameter>mode</parameter> 解密的数据。
5252
如果数据大小不是 n * 分组大小,则在其后追加 '<literal>\0</literal>' 来补齐。
53-
</para>
53+
</simpara>
5454
</listitem>
5555
</varlistentry>
5656
<varlistentry>
@@ -69,9 +69,9 @@
6969
</refsect1>
7070
<refsect1 role="returnvalues">
7171
&reftitle.returnvalues;
72-
<para>
72+
<simpara>
7373
以字符串格式返回解密后的数据, &return.falseforfailure;
74-
</para>
74+
</simpara>
7575
</refsect1>
7676

7777
<refsect1 role="seealso">

reference/mcrypt/functions/mcrypt-enc-get-algorithms-name.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 6126b024cb929b12ea29d9676671e4dde342f03d Maintainer: yuanyuqiang Status: ready -->
3+
<!-- EN-Revision: e849a6c4225bd992474793ec6983df7898cae0be Maintainer: yuanyuqiang Status: ready -->
44
<!-- Reviewed: no -->
55
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-enc-get-algorithms-name">
66
<refnamediv>
@@ -18,9 +18,9 @@
1818
<type>string</type><methodname>mcrypt_enc_get_algorithms_name</methodname>
1919
<methodparam><type>resource</type><parameter>td</parameter></methodparam>
2020
</methodsynopsis>
21-
<para>
21+
<simpara>
2222
本函数返回算法名称。
23-
</para>
23+
</simpara>
2424
</refsect1>
2525

2626
<refsect1 role="parameters">
@@ -29,19 +29,19 @@
2929
<varlistentry>
3030
<term><parameter>td</parameter></term>
3131
<listitem>
32-
<para>
32+
<simpara>
3333
加密描述符。
34-
</para>
34+
</simpara>
3535
</listitem>
3636
</varlistentry>
3737
</variablelist>
3838
</refsect1>
3939

4040
<refsect1 role="returnvalues">
4141
&reftitle.returnvalues;
42-
<para>
42+
<simpara>
4343
以字符串格式返回打开的加密算法名称。
44-
</para>
44+
</simpara>
4545
</refsect1>
4646

4747
<refsect1 role="examples">

reference/mcrypt/functions/mcrypt-enc-get-block-size.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 6126b024cb929b12ea29d9676671e4dde342f03d Maintainer: yuanyuqiang Status: ready -->
3+
<!-- EN-Revision: e849a6c4225bd992474793ec6983df7898cae0be Maintainer: yuanyuqiang Status: ready -->
44
<!-- Reviewed: no -->
55
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-enc-get-block-size">
66
<refnamediv>
@@ -16,28 +16,28 @@
1616
<type>int</type><methodname>mcrypt_enc_get_block_size</methodname>
1717
<methodparam><type>resource</type><parameter>td</parameter></methodparam>
1818
</methodsynopsis>
19-
<para>
19+
<simpara>
2020
获取打开的算法的分组大小。
21-
</para>
21+
</simpara>
2222
</refsect1>
2323
<refsect1 role="parameters">
2424
&reftitle.parameters;
2525
<variablelist>
2626
<varlistentry>
2727
<term><parameter>td</parameter></term>
2828
<listitem>
29-
<para>
29+
<simpara>
3030
加密描述符。
31-
</para>
31+
</simpara>
3232
</listitem>
3333
</varlistentry>
3434
</variablelist>
3535
</refsect1>
3636
<refsect1 role="returnvalues">
3737
&reftitle.returnvalues;
38-
<para>
38+
<simpara>
3939
返回指定算法的分组大小,以字节为单位。
40-
</para>
40+
</simpara>
4141
</refsect1>
4242
</refentry>
4343
<!-- Keep this comment at the end of the file

0 commit comments

Comments
 (0)