Correct d2i/i2d typos.

diff --git a/doc/crypto/CMS_encrypt.pod b/doc/crypto/CMS_encrypt.pod
index d6cd47f600d3685916c6654efb87c65cdb715ee0..4ba2b22da4ffa05555a5ca6f3b3f46cab0fca239 100644 (file)
--- a/doc/crypto/CMS_encrypt.pod
+++ b/doc/crypto/CMS_encrypt.pod
@@ -71,7 +71,7 @@ B<not> complete and outputting its contents via a function that does not
 properly finalize the B<CMS_ContentInfo> structure will give unpredictable
 results.
 
-Several functions including SMIME_write_CMS(), d2i_CMS_bio_stream(),
+Several functions including SMIME_write_CMS(), i2d_CMS_bio_stream(),
 PEM_write_bio_CMS_stream() finalize the structure. Alternatively finalization
 can be performed by obtaining the streaming ASN1 B<BIO> directly using
 BIO_new_CMS().

diff --git a/doc/crypto/CMS_sign.pod b/doc/crypto/CMS_sign.pod
index 8f573018c228939d3552a1033efef94d536746fd..3047b283a4bb68240ad827bb1362bfd63fc0abab 100644 (file)
--- a/doc/crypto/CMS_sign.pod
+++ b/doc/crypto/CMS_sign.pod
@@ -77,7 +77,7 @@ B<not> complete and outputting its contents via a function that does not
 properly finalize the B<CMS_ContentInfo> structure will give unpredictable
 results.
 
-Several functions including SMIME_write_CMS(), d2i_CMS_bio_stream(),
+Several functions including SMIME_write_CMS(), i2d_CMS_bio_stream(),
 PEM_write_bio_CMS_stream() finalize the structure. Alternatively finalization
 can be performed by obtaining the streaming ASN1 B<BIO> directly using
 BIO_new_CMS().

diff --git a/doc/crypto/PEM_write_bio_CMS_stream.pod b/doc/crypto/PEM_write_bio_CMS_stream.pod
index 0d88551b9731cf753531ea60036c8a2e498642ef..bbb865a3712b3ac6fccd34cbd520fac4886b4c4c 100644 (file)
--- a/doc/crypto/PEM_write_bio_CMS_stream.pod
+++ b/doc/crypto/PEM_write_bio_CMS_stream.pod
@@ -32,7 +32,7 @@ L<ERR_get_error(3)|ERR_get_error(3)>, L<CMS_sign(3)|CMS_sign(3)>,
 L<CMS_verify(3)|CMS_verify(3)>, L<CMS_encrypt(3)|CMS_encrypt(3)>
 L<CMS_decrypt(3)|CMS_decrypt(3)>,
 L<SMIME_write_CMS(3)|SMIME_write_CMS(3)>,
-L<d2i_CMS_bio_stream(3)|d2i_CMS_bio_stream(3)>
+L<i2d_CMS_bio_stream(3)|i2d_CMS_bio_stream(3)>
 
 =head1 HISTORY
 

diff --git a/doc/crypto/PEM_write_bio_PKCS7_stream.pod b/doc/crypto/PEM_write_bio_PKCS7_stream.pod
index d7e6508c4e43bc0dbce457be6295c36ac4270633..afa760831eacf9237d1d54fba757d70512f6f5f7 100644 (file)
--- a/doc/crypto/PEM_write_bio_PKCS7_stream.pod
+++ b/doc/crypto/PEM_write_bio_PKCS7_stream.pod
@@ -32,7 +32,7 @@ L<ERR_get_error(3)|ERR_get_error(3)>, L<PKCS7_sign(3)|PKCS7_sign(3)>,
 L<PKCS7_verify(3)|PKCS7_verify(3)>, L<PKCS7_encrypt(3)|PKCS7_encrypt(3)>
 L<PKCS7_decrypt(3)|PKCS7_decrypt(3)>,
 L<SMIME_write_PKCS7(3)|SMIME_write_PKCS7(3)>,
-L<d2i_PKCS7_bio_stream(3)|d2i_PKCS7_bio_stream(3)>
+L<i2d_PKCS7_bio_stream(3)|i2d_PKCS7_bio_stream(3)>
 
 =head1 HISTORY
 

diff --git a/doc/crypto/PKCS7_encrypt.pod b/doc/crypto/PKCS7_encrypt.pod
index c17cb8d1e945935599cdfdd3fa0e853e18993c26..035220aa162f6346c8d25e9df117cac6082b51ff 100644 (file)
--- a/doc/crypto/PKCS7_encrypt.pod
+++ b/doc/crypto/PKCS7_encrypt.pod
@@ -58,7 +58,7 @@ complete and outputting its contents via a function that does not
 properly finalize the B<PKCS7> structure will give unpredictable 
 results.
 
-Several functions including SMIME_write_PKCS7(), d2i_PKCS7_bio_stream(),
+Several functions including SMIME_write_PKCS7(), i2d_PKCS7_bio_stream(),
 PEM_write_bio_PKCS7_stream() finalize the structure. Alternatively finalization
 can be performed by obtaining the streaming ASN1 B<BIO> directly using
 BIO_new_PKCS7().

diff --git a/doc/crypto/PKCS7_sign.pod b/doc/crypto/PKCS7_sign.pod
index b10df26044861e0777997751ed04e0875f89c999..6f781b192564847a1d4625f5cf7976def70ae585 100644 (file)
--- a/doc/crypto/PKCS7_sign.pod
+++ b/doc/crypto/PKCS7_sign.pod
@@ -72,7 +72,7 @@ If the flag B<PKCS7_STREAM> is set the returned B<PKCS7> structure is B<not>
 complete and outputting its contents via a function that does not properly
 finalize the B<PKCS7> structure will give unpredictable results.
 
-Several functions including SMIME_write_PKCS7(), d2i_PKCS7_bio_stream(),
+Several functions including SMIME_write_PKCS7(), i2d_PKCS7_bio_stream(),
 PEM_write_bio_PKCS7_stream() finalize the structure. Alternatively finalization
 can be performed by obtaining the streaming ASN1 B<BIO> directly using
 BIO_new_PKCS7().

diff --git a/doc/crypto/d2i_PKCS7_bio_stream.pod b/doc/crypto/d2i_PKCS7_bio_stream.pod
deleted file mode 100644 (file)
index 9570861..0000000
--- a/doc/crypto/d2i_PKCS7_bio_stream.pod
+++ /dev/null
@@ -1,44 +0,0 @@
-=pod
-
-=head1 NAME
-
-d2i_PKCS7_bio_stream - output PKCS7 structure in BER format.
-
-=head1 SYNOPSIS
-
- #include <openssl/pkcs7.h>
-
- int d2i_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *data, int flags);
-
-=head1 DESCRIPTION
-
-d2i_PKCS7_bio_stream() outputs a PKCS7 structure in BER format.
-
-It is otherwise identical to the function SMIME_write_PKCS7().
-
-=head1 NOTES
-
-This function is effectively a version of the d2i_PKCS7_bio() supporting
-streaming.
-
-=head1 BUGS
-
-The prefix "d2i" is arguably wrong because the function outputs BER format.
-
-=head1 RETURN VALUES
-
-d2i_PKCS7_bio_stream() returns 1 for success or 0 for failure.
-
-=head1 SEE ALSO
-
-L<ERR_get_error(3)|ERR_get_error(3)>, L<PKCS7_sign(3)|PKCS7_sign(3)>,
-L<PKCS7_verify(3)|PKCS7_verify(3)>, L<PKCS7_encrypt(3)|PKCS7_encrypt(3)>
-L<PKCS7_decrypt(3)|PKCS7_decrypt(3)>,
-L<SMIME_write_PKCS7(3)|SMIME_write_PKCS7(3)>,
-L<PEM_write_bio_PKCS7_stream(3)|PEM_write_bio_PKCS7_stream(3)>
-
-=head1 HISTORY
-
-d2i_PKCS7_bio_stream() was added to OpenSSL 0.9.9
-
-=cut

diff --git a/doc/crypto/i2d_CMS_bio_stream.pod b/doc/crypto/i2d_CMS_bio_stream.pod
index 6d499375f8ce79c1b10212278deada2d72572bae..d8b8e5815688b57ac926308202b71dfab1416210 100644 (file)
--- a/doc/crypto/i2d_CMS_bio_stream.pod
+++ b/doc/crypto/i2d_CMS_bio_stream.pod
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-d2i_CMS_bio_stream - output CMS_ContentInfo structure in BER format.
+i2d_CMS_bio_stream - output CMS_ContentInfo structure in BER format.
 
 =head1 SYNOPSIS
 
@@ -39,6 +39,6 @@ L<PEM_write_bio_CMS_stream(3)|PEM_write_bio_CMS_stream(3)>
 
 =head1 HISTORY
 
-d2i_CMS_bio_stream() was added to OpenSSL 0.9.9
+i2d_CMS_bio_stream() was added to OpenSSL 0.9.9
 
 =cut

diff --git a/doc/crypto/i2d_PKCS7_bio_stream.pod b/doc/crypto/i2d_PKCS7_bio_stream.pod
new file mode 100644 (file)
index 0000000..c7da2fa
--- /dev/null
+++ b/doc/crypto/i2d_PKCS7_bio_stream.pod
@@ -0,0 +1,44 @@
+=pod
+
+=head1 NAME
+
+i2d_PKCS7_bio_stream - output PKCS7 structure in BER format.
+
+=head1 SYNOPSIS
+
+ #include <openssl/pkcs7.h>
+
+ int i2d_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *data, int flags);
+
+=head1 DESCRIPTION
+
+i2d_PKCS7_bio_stream() outputs a PKCS7 structure in BER format.
+
+It is otherwise identical to the function SMIME_write_PKCS7().
+
+=head1 NOTES
+
+This function is effectively a version of the d2i_PKCS7_bio() supporting
+streaming.
+
+=head1 BUGS
+
+The prefix "d2i" is arguably wrong because the function outputs BER format.
+
+=head1 RETURN VALUES
+
+i2d_PKCS7_bio_stream() returns 1 for success or 0 for failure.
+
+=head1 SEE ALSO
+
+L<ERR_get_error(3)|ERR_get_error(3)>, L<PKCS7_sign(3)|PKCS7_sign(3)>,
+L<PKCS7_verify(3)|PKCS7_verify(3)>, L<PKCS7_encrypt(3)|PKCS7_encrypt(3)>
+L<PKCS7_decrypt(3)|PKCS7_decrypt(3)>,
+L<SMIME_write_PKCS7(3)|SMIME_write_PKCS7(3)>,
+L<PEM_write_bio_PKCS7_stream(3)|PEM_write_bio_PKCS7_stream(3)>
+
+=head1 HISTORY
+
+i2d_PKCS7_bio_stream() was added to OpenSSL 0.9.9
+
+=cut