diff options
author | jim <> | 2014-05-04 21:46:36 +0000 |
---|---|---|
committer | jim <> | 2014-05-04 21:46:36 +0000 |
commit | adc2a0a37a306f738da40a5a46f14e7fc9f1f571 (patch) | |
tree | a8892de8fd6e54fc93e929516a1ed1c754ef77fd | |
parent | c247b29180fe4c94ba872da4fd237eab43c0df48 (diff) | |
download | openbsd-adc2a0a37a306f738da40a5a46f14e7fc9f1f571.tar.gz openbsd-adc2a0a37a306f738da40a5a46f14e7fc9f1f571.tar.bz2 openbsd-adc2a0a37a306f738da40a5a46f14e7fc9f1f571.zip |
Remove trailing whitespace.
fine jmc@
140 files changed, 345 insertions, 345 deletions
diff --git a/src/lib/libcrypto/doc/DES_set_key.pod b/src/lib/libcrypto/doc/DES_set_key.pod index 6f0cf1cc5e..b49545877a 100644 --- a/src/lib/libcrypto/doc/DES_set_key.pod +++ b/src/lib/libcrypto/doc/DES_set_key.pod | |||
@@ -28,16 +28,16 @@ DES_fcrypt, DES_crypt, DES_enc_read, DES_enc_write - DES encryption | |||
28 | void DES_set_odd_parity(DES_cblock *key); | 28 | void DES_set_odd_parity(DES_cblock *key); |
29 | int DES_is_weak_key(const_DES_cblock *key); | 29 | int DES_is_weak_key(const_DES_cblock *key); |
30 | 30 | ||
31 | void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output, | 31 | void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output, |
32 | DES_key_schedule *ks, int enc); | 32 | DES_key_schedule *ks, int enc); |
33 | void DES_ecb2_encrypt(const_DES_cblock *input, DES_cblock *output, | 33 | void DES_ecb2_encrypt(const_DES_cblock *input, DES_cblock *output, |
34 | DES_key_schedule *ks1, DES_key_schedule *ks2, int enc); | 34 | DES_key_schedule *ks1, DES_key_schedule *ks2, int enc); |
35 | void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output, | 35 | void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output, |
36 | DES_key_schedule *ks1, DES_key_schedule *ks2, | 36 | DES_key_schedule *ks1, DES_key_schedule *ks2, |
37 | DES_key_schedule *ks3, int enc); | 37 | DES_key_schedule *ks3, int enc); |
38 | 38 | ||
39 | void DES_ncbc_encrypt(const unsigned char *input, unsigned char *output, | 39 | void DES_ncbc_encrypt(const unsigned char *input, unsigned char *output, |
40 | long length, DES_key_schedule *schedule, DES_cblock *ivec, | 40 | long length, DES_key_schedule *schedule, DES_cblock *ivec, |
41 | int enc); | 41 | int enc); |
42 | void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, | 42 | void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, |
43 | int numbits, long length, DES_key_schedule *schedule, | 43 | int numbits, long length, DES_key_schedule *schedule, |
@@ -45,8 +45,8 @@ DES_fcrypt, DES_crypt, DES_enc_read, DES_enc_write - DES encryption | |||
45 | void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, | 45 | void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, |
46 | int numbits, long length, DES_key_schedule *schedule, | 46 | int numbits, long length, DES_key_schedule *schedule, |
47 | DES_cblock *ivec); | 47 | DES_cblock *ivec); |
48 | void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output, | 48 | void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output, |
49 | long length, DES_key_schedule *schedule, DES_cblock *ivec, | 49 | long length, DES_key_schedule *schedule, DES_cblock *ivec, |
50 | int enc); | 50 | int enc); |
51 | void DES_cfb64_encrypt(const unsigned char *in, unsigned char *out, | 51 | void DES_cfb64_encrypt(const unsigned char *in, unsigned char *out, |
52 | long length, DES_key_schedule *schedule, DES_cblock *ivec, | 52 | long length, DES_key_schedule *schedule, DES_cblock *ivec, |
@@ -55,8 +55,8 @@ DES_fcrypt, DES_crypt, DES_enc_read, DES_enc_write - DES encryption | |||
55 | long length, DES_key_schedule *schedule, DES_cblock *ivec, | 55 | long length, DES_key_schedule *schedule, DES_cblock *ivec, |
56 | int *num); | 56 | int *num); |
57 | 57 | ||
58 | void DES_xcbc_encrypt(const unsigned char *input, unsigned char *output, | 58 | void DES_xcbc_encrypt(const unsigned char *input, unsigned char *output, |
59 | long length, DES_key_schedule *schedule, DES_cblock *ivec, | 59 | long length, DES_key_schedule *schedule, DES_cblock *ivec, |
60 | const_DES_cblock *inw, const_DES_cblock *outw, int enc); | 60 | const_DES_cblock *inw, const_DES_cblock *outw, int enc); |
61 | 61 | ||
62 | void DES_ede2_cbc_encrypt(const unsigned char *input, | 62 | void DES_ede2_cbc_encrypt(const unsigned char *input, |
@@ -73,22 +73,22 @@ DES_fcrypt, DES_crypt, DES_enc_read, DES_enc_write - DES encryption | |||
73 | unsigned char *output, long length, DES_key_schedule *ks1, | 73 | unsigned char *output, long length, DES_key_schedule *ks1, |
74 | DES_key_schedule *ks2, DES_key_schedule *ks3, DES_cblock *ivec, | 74 | DES_key_schedule *ks2, DES_key_schedule *ks3, DES_cblock *ivec, |
75 | int enc); | 75 | int enc); |
76 | void DES_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out, | 76 | void DES_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out, |
77 | long length, DES_key_schedule *ks1, DES_key_schedule *ks2, | 77 | long length, DES_key_schedule *ks1, DES_key_schedule *ks2, |
78 | DES_key_schedule *ks3, DES_cblock *ivec1, DES_cblock *ivec2, | 78 | DES_key_schedule *ks3, DES_cblock *ivec1, DES_cblock *ivec2, |
79 | int enc); | 79 | int enc); |
80 | void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out, | 80 | void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out, |
81 | long length, DES_key_schedule *ks1, DES_key_schedule *ks2, | 81 | long length, DES_key_schedule *ks1, DES_key_schedule *ks2, |
82 | DES_key_schedule *ks3, DES_cblock *ivec, int *num, int enc); | 82 | DES_key_schedule *ks3, DES_cblock *ivec, int *num, int enc); |
83 | void DES_ede3_ofb64_encrypt(const unsigned char *in, unsigned char *out, | 83 | void DES_ede3_ofb64_encrypt(const unsigned char *in, unsigned char *out, |
84 | long length, DES_key_schedule *ks1, | 84 | long length, DES_key_schedule *ks1, |
85 | DES_key_schedule *ks2, DES_key_schedule *ks3, | 85 | DES_key_schedule *ks2, DES_key_schedule *ks3, |
86 | DES_cblock *ivec, int *num); | 86 | DES_cblock *ivec, int *num); |
87 | 87 | ||
88 | DES_LONG DES_cbc_cksum(const unsigned char *input, DES_cblock *output, | 88 | DES_LONG DES_cbc_cksum(const unsigned char *input, DES_cblock *output, |
89 | long length, DES_key_schedule *schedule, | 89 | long length, DES_key_schedule *schedule, |
90 | const_DES_cblock *ivec); | 90 | const_DES_cblock *ivec); |
91 | DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[], | 91 | DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[], |
92 | long length, int out_count, DES_cblock *seed); | 92 | long length, int out_count, DES_cblock *seed); |
93 | void DES_string_to_key(const char *str, DES_cblock *key); | 93 | void DES_string_to_key(const char *str, DES_cblock *key); |
94 | void DES_string_to_2keys(const char *str, DES_cblock *key1, | 94 | void DES_string_to_2keys(const char *str, DES_cblock *key1, |
diff --git a/src/lib/libcrypto/doc/DH_generate_parameters.pod b/src/lib/libcrypto/doc/DH_generate_parameters.pod index 9081e9ea7c..862aa0c39a 100644 --- a/src/lib/libcrypto/doc/DH_generate_parameters.pod +++ b/src/lib/libcrypto/doc/DH_generate_parameters.pod | |||
@@ -21,7 +21,7 @@ allocated B<DH> structure. The pseudo-random number generator must be | |||
21 | seeded prior to calling DH_generate_parameters(). | 21 | seeded prior to calling DH_generate_parameters(). |
22 | 22 | ||
23 | B<prime_len> is the length in bits of the safe prime to be generated. | 23 | B<prime_len> is the length in bits of the safe prime to be generated. |
24 | B<generator> is a small number E<gt> 1, typically 2 or 5. | 24 | B<generator> is a small number E<gt> 1, typically 2 or 5. |
25 | 25 | ||
26 | A callback function may be used to provide feedback about the progress | 26 | A callback function may be used to provide feedback about the progress |
27 | of the key generation. If B<callback> is not B<NULL>, it will be | 27 | of the key generation. If B<callback> is not B<NULL>, it will be |
diff --git a/src/lib/libcrypto/doc/DSA_set_method.pod b/src/lib/libcrypto/doc/DSA_set_method.pod index 9c1434bd8d..5ad7362f58 100644 --- a/src/lib/libcrypto/doc/DSA_set_method.pod +++ b/src/lib/libcrypto/doc/DSA_set_method.pod | |||
@@ -37,7 +37,7 @@ been set as a default for DSA, so this function is no longer recommended. | |||
37 | 37 | ||
38 | DSA_get_default_method() returns a pointer to the current default | 38 | DSA_get_default_method() returns a pointer to the current default |
39 | DSA_METHOD. However, the meaningfulness of this result is dependent on | 39 | DSA_METHOD. However, the meaningfulness of this result is dependent on |
40 | whether the ENGINE API is being used, so this function is no longer | 40 | whether the ENGINE API is being used, so this function is no longer |
41 | recommended. | 41 | recommended. |
42 | 42 | ||
43 | DSA_set_method() selects B<meth> to perform all operations using the key | 43 | DSA_set_method() selects B<meth> to perform all operations using the key |
diff --git a/src/lib/libcrypto/doc/ERR_get_error.pod b/src/lib/libcrypto/doc/ERR_get_error.pod index 828ecf529b..1a765f7aff 100644 --- a/src/lib/libcrypto/doc/ERR_get_error.pod +++ b/src/lib/libcrypto/doc/ERR_get_error.pod | |||
@@ -52,7 +52,7 @@ ERR_get_error_line_data(), ERR_peek_error_line_data() and | |||
52 | ERR_get_last_error_line_data() store additional data and flags | 52 | ERR_get_last_error_line_data() store additional data and flags |
53 | associated with the error code in *B<data> | 53 | associated with the error code in *B<data> |
54 | and *B<flags>, unless these are B<NULL>. *B<data> contains a string | 54 | and *B<flags>, unless these are B<NULL>. *B<data> contains a string |
55 | if *B<flags>&B<ERR_TXT_STRING> is true. | 55 | if *B<flags>&B<ERR_TXT_STRING> is true. |
56 | 56 | ||
57 | An application B<MUST NOT> free the *B<data> pointer (or any other pointers | 57 | An application B<MUST NOT> free the *B<data> pointer (or any other pointers |
58 | returned by these functions) with OPENSSL_free() as freeing is handled | 58 | returned by these functions) with OPENSSL_free() as freeing is handled |
diff --git a/src/lib/libcrypto/doc/EVP_DigestInit.pod b/src/lib/libcrypto/doc/EVP_DigestInit.pod index 367691cc7a..dcc5d73f69 100644 --- a/src/lib/libcrypto/doc/EVP_DigestInit.pod +++ b/src/lib/libcrypto/doc/EVP_DigestInit.pod | |||
@@ -26,18 +26,18 @@ EVP digest routines | |||
26 | int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx); | 26 | int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx); |
27 | void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx); | 27 | void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx); |
28 | 28 | ||
29 | int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out,const EVP_MD_CTX *in); | 29 | int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out,const EVP_MD_CTX *in); |
30 | 30 | ||
31 | int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type); | 31 | int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type); |
32 | int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, | 32 | int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, |
33 | unsigned int *s); | 33 | unsigned int *s); |
34 | 34 | ||
35 | int EVP_MD_CTX_copy(EVP_MD_CTX *out,EVP_MD_CTX *in); | 35 | int EVP_MD_CTX_copy(EVP_MD_CTX *out,EVP_MD_CTX *in); |
36 | 36 | ||
37 | #define EVP_MAX_MD_SIZE 64 /* SHA512 */ | 37 | #define EVP_MAX_MD_SIZE 64 /* SHA512 */ |
38 | 38 | ||
39 | int EVP_MD_type(const EVP_MD *md); | 39 | int EVP_MD_type(const EVP_MD *md); |
40 | int EVP_MD_pkey_type(const EVP_MD *md); | 40 | int EVP_MD_pkey_type(const EVP_MD *md); |
41 | int EVP_MD_size(const EVP_MD *md); | 41 | int EVP_MD_size(const EVP_MD *md); |
42 | int EVP_MD_block_size(const EVP_MD *md); | 42 | int EVP_MD_block_size(const EVP_MD *md); |
43 | 43 | ||
@@ -136,10 +136,10 @@ reasons. | |||
136 | EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_sha224(), EVP_sha256(), | 136 | EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_sha224(), EVP_sha256(), |
137 | EVP_sha384(), EVP_sha512(), EVP_mdc2() and EVP_ripemd160() return B<EVP_MD> | 137 | EVP_sha384(), EVP_sha512(), EVP_mdc2() and EVP_ripemd160() return B<EVP_MD> |
138 | structures for the MD2, MD5, SHA, SHA1, SHA224, SHA256, SHA384, SHA512, MDC2 | 138 | structures for the MD2, MD5, SHA, SHA1, SHA224, SHA256, SHA384, SHA512, MDC2 |
139 | and RIPEMD160 digest algorithms respectively. | 139 | and RIPEMD160 digest algorithms respectively. |
140 | 140 | ||
141 | EVP_dss() and EVP_dss1() return B<EVP_MD> structures for SHA and SHA1 digest | 141 | EVP_dss() and EVP_dss1() return B<EVP_MD> structures for SHA and SHA1 digest |
142 | algorithms but using DSS (DSA) for the signature algorithm. Note: there is | 142 | algorithms but using DSS (DSA) for the signature algorithm. Note: there is |
143 | no need to use these pseudo-digests in OpenSSL 1.0.0 and later, they are | 143 | no need to use these pseudo-digests in OpenSSL 1.0.0 and later, they are |
144 | however retained for compatibility. | 144 | however retained for compatibility. |
145 | 145 | ||
@@ -178,21 +178,21 @@ The B<EVP> interface to message digests should almost always be used in | |||
178 | preference to the low level interfaces. This is because the code then becomes | 178 | preference to the low level interfaces. This is because the code then becomes |
179 | transparent to the digest used and much more flexible. | 179 | transparent to the digest used and much more flexible. |
180 | 180 | ||
181 | New applications should use the SHA2 digest algorithms such as SHA256. | 181 | New applications should use the SHA2 digest algorithms such as SHA256. |
182 | The other digest algorithms are still in common use. | 182 | The other digest algorithms are still in common use. |
183 | 183 | ||
184 | For most applications the B<impl> parameter to EVP_DigestInit_ex() will be | 184 | For most applications the B<impl> parameter to EVP_DigestInit_ex() will be |
185 | set to NULL to use the default digest implementation. | 185 | set to NULL to use the default digest implementation. |
186 | 186 | ||
187 | The functions EVP_DigestInit(), EVP_DigestFinal() and EVP_MD_CTX_copy() are | 187 | The functions EVP_DigestInit(), EVP_DigestFinal() and EVP_MD_CTX_copy() are |
188 | obsolete but are retained to maintain compatibility with existing code. New | 188 | obsolete but are retained to maintain compatibility with existing code. New |
189 | applications should use EVP_DigestInit_ex(), EVP_DigestFinal_ex() and | 189 | applications should use EVP_DigestInit_ex(), EVP_DigestFinal_ex() and |
190 | EVP_MD_CTX_copy_ex() because they can efficiently reuse a digest context | 190 | EVP_MD_CTX_copy_ex() because they can efficiently reuse a digest context |
191 | instead of initializing and cleaning it up on each call and allow non default | 191 | instead of initializing and cleaning it up on each call and allow non default |
192 | implementations of digests to be specified. | 192 | implementations of digests to be specified. |
193 | 193 | ||
194 | In OpenSSL 0.9.7 and later if digest contexts are not cleaned up after use | 194 | In OpenSSL 0.9.7 and later if digest contexts are not cleaned up after use |
195 | memory leaks will occur. | 195 | memory leaks will occur. |
196 | 196 | ||
197 | Stack allocation of EVP_MD_CTX structures is common, for example: | 197 | Stack allocation of EVP_MD_CTX structures is common, for example: |
198 | 198 | ||
diff --git a/src/lib/libcrypto/doc/EVP_DigestSignInit.pod b/src/lib/libcrypto/doc/EVP_DigestSignInit.pod index 37d960e3b2..11e8f6f937 100644 --- a/src/lib/libcrypto/doc/EVP_DigestSignInit.pod +++ b/src/lib/libcrypto/doc/EVP_DigestSignInit.pod | |||
@@ -56,7 +56,7 @@ needed to be used to sign using SHA1 and DSA. This is no longer necessary and | |||
56 | the use of clone digest is now discouraged. | 56 | the use of clone digest is now discouraged. |
57 | 57 | ||
58 | For some key types and parameters the random number generator must be seeded | 58 | For some key types and parameters the random number generator must be seeded |
59 | or the operation will fail. | 59 | or the operation will fail. |
60 | 60 | ||
61 | The call to EVP_DigestSignFinal() internally finalizes a copy of the digest | 61 | The call to EVP_DigestSignFinal() internally finalizes a copy of the digest |
62 | context. This means that calls to EVP_DigestSignUpdate() and | 62 | context. This means that calls to EVP_DigestSignUpdate() and |
@@ -81,7 +81,7 @@ L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)> | |||
81 | 81 | ||
82 | =head1 HISTORY | 82 | =head1 HISTORY |
83 | 83 | ||
84 | EVP_DigestSignInit(), EVP_DigestSignUpdate() and EVP_DigestSignFinal() | 84 | EVP_DigestSignInit(), EVP_DigestSignUpdate() and EVP_DigestSignFinal() |
85 | were first added to OpenSSL 1.0.0. | 85 | were first added to OpenSSL 1.0.0. |
86 | 86 | ||
87 | =cut | 87 | =cut |
diff --git a/src/lib/libcrypto/doc/EVP_DigestVerifyInit.pod b/src/lib/libcrypto/doc/EVP_DigestVerifyInit.pod index f224488978..819e0d4b9f 100644 --- a/src/lib/libcrypto/doc/EVP_DigestVerifyInit.pod +++ b/src/lib/libcrypto/doc/EVP_DigestVerifyInit.pod | |||
@@ -56,7 +56,7 @@ needed to be used to sign using SHA1 and DSA. This is no longer necessary and | |||
56 | the use of clone digest is now discouraged. | 56 | the use of clone digest is now discouraged. |
57 | 57 | ||
58 | For some key types and parameters the random number generator must be seeded | 58 | For some key types and parameters the random number generator must be seeded |
59 | or the operation will fail. | 59 | or the operation will fail. |
60 | 60 | ||
61 | The call to EVP_DigestVerifyFinal() internally finalizes a copy of the digest | 61 | The call to EVP_DigestVerifyFinal() internally finalizes a copy of the digest |
62 | context. This means that calls to EVP_VerifyUpdate() and EVP_VerifyFinal() can | 62 | context. This means that calls to EVP_VerifyUpdate() and EVP_VerifyFinal() can |
@@ -76,7 +76,7 @@ L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)> | |||
76 | 76 | ||
77 | =head1 HISTORY | 77 | =head1 HISTORY |
78 | 78 | ||
79 | EVP_DigestVerifyInit(), EVP_DigestVerifyUpdate() and EVP_DigestVerifyFinal() | 79 | EVP_DigestVerifyInit(), EVP_DigestVerifyUpdate() and EVP_DigestVerifyFinal() |
80 | were first added to OpenSSL 1.0.0. | 80 | were first added to OpenSSL 1.0.0. |
81 | 81 | ||
82 | =cut | 82 | =cut |
diff --git a/src/lib/libcrypto/doc/EVP_EncryptInit.pod b/src/lib/libcrypto/doc/EVP_EncryptInit.pod index 1c4bf184a1..84875e0fe0 100644 --- a/src/lib/libcrypto/doc/EVP_EncryptInit.pod +++ b/src/lib/libcrypto/doc/EVP_EncryptInit.pod | |||
@@ -128,7 +128,7 @@ calls to EVP_EncryptUpdate() should be made. | |||
128 | 128 | ||
129 | If padding is disabled then EVP_EncryptFinal_ex() will not encrypt any more | 129 | If padding is disabled then EVP_EncryptFinal_ex() will not encrypt any more |
130 | data and it will return an error if any data remains in a partial block: | 130 | data and it will return an error if any data remains in a partial block: |
131 | that is if the total data length is not a multiple of the block size. | 131 | that is if the total data length is not a multiple of the block size. |
132 | 132 | ||
133 | EVP_DecryptInit_ex(), EVP_DecryptUpdate() and EVP_DecryptFinal_ex() are the | 133 | EVP_DecryptInit_ex(), EVP_DecryptUpdate() and EVP_DecryptFinal_ex() are the |
134 | corresponding decryption operations. EVP_DecryptFinal() will return an | 134 | corresponding decryption operations. EVP_DecryptFinal() will return an |
@@ -157,7 +157,7 @@ initialized and they always use the default cipher implementation. | |||
157 | 157 | ||
158 | EVP_EncryptFinal(), EVP_DecryptFinal() and EVP_CipherFinal() behave in a | 158 | EVP_EncryptFinal(), EVP_DecryptFinal() and EVP_CipherFinal() behave in a |
159 | similar way to EVP_EncryptFinal_ex(), EVP_DecryptFinal_ex() and | 159 | similar way to EVP_EncryptFinal_ex(), EVP_DecryptFinal_ex() and |
160 | EVP_CipherFinal_ex() except B<ctx> is automatically cleaned up | 160 | EVP_CipherFinal_ex() except B<ctx> is automatically cleaned up |
161 | after the call. | 161 | after the call. |
162 | 162 | ||
163 | EVP_get_cipherbyname(), EVP_get_cipherbynid() and EVP_get_cipherbyobj() | 163 | EVP_get_cipherbyname(), EVP_get_cipherbynid() and EVP_get_cipherbyobj() |
@@ -268,7 +268,7 @@ OBJECT IDENTIFIER or NID_undef if it has no defined OBJECT IDENTIFIER. | |||
268 | 268 | ||
269 | EVP_CIPHER_CTX_cipher() returns an B<EVP_CIPHER> structure. | 269 | EVP_CIPHER_CTX_cipher() returns an B<EVP_CIPHER> structure. |
270 | 270 | ||
271 | EVP_CIPHER_param_to_asn1() and EVP_CIPHER_asn1_to_param() return 1 for | 271 | EVP_CIPHER_param_to_asn1() and EVP_CIPHER_asn1_to_param() return 1 for |
272 | success or zero for failure. | 272 | success or zero for failure. |
273 | 273 | ||
274 | =head1 CIPHER LISTING | 274 | =head1 CIPHER LISTING |
@@ -283,7 +283,7 @@ Null cipher: does nothing. | |||
283 | 283 | ||
284 | =item EVP_des_cbc(void), EVP_des_ecb(void), EVP_des_cfb(void), EVP_des_ofb(void) | 284 | =item EVP_des_cbc(void), EVP_des_ecb(void), EVP_des_cfb(void), EVP_des_ofb(void) |
285 | 285 | ||
286 | DES in CBC, ECB, CFB and OFB modes respectively. | 286 | DES in CBC, ECB, CFB and OFB modes respectively. |
287 | 287 | ||
288 | =item EVP_des_ede_cbc(void), EVP_des_ede(), EVP_des_ede_ofb(void), EVP_des_ede_cfb(void) | 288 | =item EVP_des_ede_cbc(void), EVP_des_ede(), EVP_des_ede_ofb(void), EVP_des_ede_cfb(void) |
289 | 289 | ||
@@ -346,7 +346,7 @@ Where possible the B<EVP> interface to symmetric ciphers should be used in | |||
346 | preference to the low level interfaces. This is because the code then becomes | 346 | preference to the low level interfaces. This is because the code then becomes |
347 | transparent to the cipher used and much more flexible. | 347 | transparent to the cipher used and much more flexible. |
348 | 348 | ||
349 | PKCS padding works by adding B<n> padding bytes of value B<n> to make the total | 349 | PKCS padding works by adding B<n> padding bytes of value B<n> to make the total |
350 | length of the encrypted data a multiple of the block size. Padding is always | 350 | length of the encrypted data a multiple of the block size. Padding is always |
351 | added so if the data is already a multiple of the block size B<n> will equal | 351 | added so if the data is already a multiple of the block size B<n> will equal |
352 | the block size. For example if the block size is 8 and 11 bytes are to be | 352 | the block size. For example if the block size is 8 and 11 bytes are to be |
@@ -376,7 +376,7 @@ a limitation of the current RC5 code rather than the EVP interface. | |||
376 | 376 | ||
377 | EVP_MAX_KEY_LENGTH and EVP_MAX_IV_LENGTH only refer to the internal ciphers with | 377 | EVP_MAX_KEY_LENGTH and EVP_MAX_IV_LENGTH only refer to the internal ciphers with |
378 | default key lengths. If custom ciphers exceed these values the results are | 378 | default key lengths. If custom ciphers exceed these values the results are |
379 | unpredictable. This is because it has become standard practice to define a | 379 | unpredictable. This is because it has become standard practice to define a |
380 | generic key as a fixed unsigned char array containing EVP_MAX_KEY_LENGTH bytes. | 380 | generic key as a fixed unsigned char array containing EVP_MAX_KEY_LENGTH bytes. |
381 | 381 | ||
382 | The ASN1 code is incomplete (and sometimes inaccurate) it has only been tested | 382 | The ASN1 code is incomplete (and sometimes inaccurate) it has only been tested |
@@ -449,7 +449,7 @@ Encrypt a string using blowfish: | |||
449 | 449 | ||
450 | The ciphertext from the above example can be decrypted using the B<openssl> | 450 | The ciphertext from the above example can be decrypted using the B<openssl> |
451 | utility with the command line: | 451 | utility with the command line: |
452 | 452 | ||
453 | S<openssl bf -in cipher.bin -K 000102030405060708090A0B0C0D0E0F -iv 0102030405060708 -d> | 453 | S<openssl bf -in cipher.bin -K 000102030405060708090A0B0C0D0E0F -iv 0102030405060708 -d> |
454 | 454 | ||
455 | General encryption, decryption function example using FILE I/O and RC2 with an | 455 | General encryption, decryption function example using FILE I/O and RC2 with an |
@@ -472,7 +472,7 @@ General encryption, decryption function example using FILE I/O and RC2 with an | |||
472 | /* We finished modifying parameters so now we can set key and IV */ | 472 | /* We finished modifying parameters so now we can set key and IV */ |
473 | EVP_CipherInit_ex(&ctx, NULL, NULL, key, iv, do_encrypt); | 473 | EVP_CipherInit_ex(&ctx, NULL, NULL, key, iv, do_encrypt); |
474 | 474 | ||
475 | for(;;) | 475 | for(;;) |
476 | { | 476 | { |
477 | inlen = fread(inbuf, 1, 1024, in); | 477 | inlen = fread(inbuf, 1, 1024, in); |
478 | if(inlen <= 0) break; | 478 | if(inlen <= 0) break; |
diff --git a/src/lib/libcrypto/doc/EVP_OpenInit.pod b/src/lib/libcrypto/doc/EVP_OpenInit.pod index 2e710da945..1aa2a9cd6e 100644 --- a/src/lib/libcrypto/doc/EVP_OpenInit.pod +++ b/src/lib/libcrypto/doc/EVP_OpenInit.pod | |||
@@ -27,7 +27,7 @@ B<ekl> bytes passed in the B<ek> parameter using the private key B<priv>. | |||
27 | The IV is supplied in the B<iv> parameter. | 27 | The IV is supplied in the B<iv> parameter. |
28 | 28 | ||
29 | EVP_OpenUpdate() and EVP_OpenFinal() have exactly the same properties | 29 | EVP_OpenUpdate() and EVP_OpenFinal() have exactly the same properties |
30 | as the EVP_DecryptUpdate() and EVP_DecryptFinal() routines, as | 30 | as the EVP_DecryptUpdate() and EVP_DecryptFinal() routines, as |
31 | documented on the L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> manual | 31 | documented on the L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> manual |
32 | page. | 32 | page. |
33 | 33 | ||
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_CTX_ctrl.pod b/src/lib/libcrypto/doc/EVP_PKEY_CTX_ctrl.pod index 13b91f1e6e..e8d1ddda75 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_CTX_ctrl.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_CTX_ctrl.pod | |||
@@ -62,7 +62,7 @@ The macro EVP_PKEY_CTX_set_rsa_padding() sets the RSA padding mode for B<ctx>. | |||
62 | The B<pad> parameter can take the value RSA_PKCS1_PADDING for PKCS#1 padding, | 62 | The B<pad> parameter can take the value RSA_PKCS1_PADDING for PKCS#1 padding, |
63 | RSA_SSLV23_PADDING for SSLv23 padding, RSA_NO_PADDING for no padding, | 63 | RSA_SSLV23_PADDING for SSLv23 padding, RSA_NO_PADDING for no padding, |
64 | RSA_PKCS1_OAEP_PADDING for OAEP padding (encrypt and decrypt only), | 64 | RSA_PKCS1_OAEP_PADDING for OAEP padding (encrypt and decrypt only), |
65 | RSA_X931_PADDING for X9.31 padding (signature operations only) and | 65 | RSA_X931_PADDING for X9.31 padding (signature operations only) and |
66 | RSA_PKCS1_PSS_PADDING (sign and verify only). | 66 | RSA_PKCS1_PSS_PADDING (sign and verify only). |
67 | 67 | ||
68 | Two RSA padding modes behave differently if EVP_PKEY_CTX_set_signature_md() | 68 | Two RSA padding modes behave differently if EVP_PKEY_CTX_set_signature_md() |
@@ -87,7 +87,7 @@ RSA key genration to B<bits>. If not specified 1024 bits is used. | |||
87 | 87 | ||
88 | The EVP_PKEY_CTX_set_rsa_keygen_pubexp() macro sets the public exponent value | 88 | The EVP_PKEY_CTX_set_rsa_keygen_pubexp() macro sets the public exponent value |
89 | for RSA key generation to B<pubexp> currently it should be an odd integer. The | 89 | for RSA key generation to B<pubexp> currently it should be an odd integer. The |
90 | B<pubexp> pointer is used internally by this function so it should not be | 90 | B<pubexp> pointer is used internally by this function so it should not be |
91 | modified or free after the call. If this macro is not called then 65537 is used. | 91 | modified or free after the call. If this macro is not called then 65537 is used. |
92 | 92 | ||
93 | The macro EVP_PKEY_CTX_set_dsa_paramgen_bits() sets the number of bits used | 93 | The macro EVP_PKEY_CTX_set_dsa_paramgen_bits() sets the number of bits used |
@@ -118,8 +118,8 @@ L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, | |||
118 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, | 118 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, |
119 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, | 119 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, |
120 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, | 120 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, |
121 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> | 121 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> |
122 | L<EVP_PKEY_keygen(3)|EVP_PKEY_keygen(3)> | 122 | L<EVP_PKEY_keygen(3)|EVP_PKEY_keygen(3)> |
123 | 123 | ||
124 | =head1 HISTORY | 124 | =head1 HISTORY |
125 | 125 | ||
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_cmp.pod b/src/lib/libcrypto/doc/EVP_PKEY_cmp.pod index 4f8185e36c..4145245299 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_cmp.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_cmp.pod | |||
@@ -56,6 +56,6 @@ keys match, 0 if they don't match, -1 if the key types are different and | |||
56 | =head1 SEE ALSO | 56 | =head1 SEE ALSO |
57 | 57 | ||
58 | L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>, | 58 | L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>, |
59 | L<EVP_PKEY_keygen(3)|EVP_PKEY_keygen(3)> | 59 | L<EVP_PKEY_keygen(3)|EVP_PKEY_keygen(3)> |
60 | 60 | ||
61 | =cut | 61 | =cut |
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_decrypt.pod b/src/lib/libcrypto/doc/EVP_PKEY_decrypt.pod index 847983237b..197878eff7 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_decrypt.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_decrypt.pod | |||
@@ -50,7 +50,7 @@ Decrypt data using OAEP (for RSA keys): | |||
50 | 50 | ||
51 | EVP_PKEY_CTX *ctx; | 51 | EVP_PKEY_CTX *ctx; |
52 | unsigned char *out, *in; | 52 | unsigned char *out, *in; |
53 | size_t outlen, inlen; | 53 | size_t outlen, inlen; |
54 | EVP_PKEY *key; | 54 | EVP_PKEY *key; |
55 | /* NB: assumes key in, inlen are already set up | 55 | /* NB: assumes key in, inlen are already set up |
56 | * and that key is an RSA private key | 56 | * and that key is an RSA private key |
@@ -71,7 +71,7 @@ Decrypt data using OAEP (for RSA keys): | |||
71 | 71 | ||
72 | if (!out) | 72 | if (!out) |
73 | /* malloc failure */ | 73 | /* malloc failure */ |
74 | 74 | ||
75 | if (EVP_PKEY_decrypt(ctx, out, &outlen, in, inlen) <= 0) | 75 | if (EVP_PKEY_decrypt(ctx, out, &outlen, in, inlen) <= 0) |
76 | /* Error */ | 76 | /* Error */ |
77 | 77 | ||
@@ -84,7 +84,7 @@ L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>, | |||
84 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, | 84 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, |
85 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, | 85 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, |
86 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, | 86 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, |
87 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> | 87 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> |
88 | 88 | ||
89 | =head1 HISTORY | 89 | =head1 HISTORY |
90 | 90 | ||
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_derive.pod b/src/lib/libcrypto/doc/EVP_PKEY_derive.pod index 27464be571..de877ead1a 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_derive.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_derive.pod | |||
@@ -71,7 +71,7 @@ Derive shared secret (for example DH or EC keys): | |||
71 | 71 | ||
72 | if (!skey) | 72 | if (!skey) |
73 | /* malloc failure */ | 73 | /* malloc failure */ |
74 | 74 | ||
75 | if (EVP_PKEY_derive(ctx, skey, &skeylen) <= 0) | 75 | if (EVP_PKEY_derive(ctx, skey, &skeylen) <= 0) |
76 | /* Error */ | 76 | /* Error */ |
77 | 77 | ||
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_encrypt.pod b/src/lib/libcrypto/doc/EVP_PKEY_encrypt.pod index e495a81242..f7969c296f 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_encrypt.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_encrypt.pod | |||
@@ -50,7 +50,7 @@ Encrypt data using OAEP (for RSA keys): | |||
50 | 50 | ||
51 | EVP_PKEY_CTX *ctx; | 51 | EVP_PKEY_CTX *ctx; |
52 | unsigned char *out, *in; | 52 | unsigned char *out, *in; |
53 | size_t outlen, inlen; | 53 | size_t outlen, inlen; |
54 | EVP_PKEY *key; | 54 | EVP_PKEY *key; |
55 | /* NB: assumes key in, inlen are already set up | 55 | /* NB: assumes key in, inlen are already set up |
56 | * and that key is an RSA public key | 56 | * and that key is an RSA public key |
@@ -71,7 +71,7 @@ Encrypt data using OAEP (for RSA keys): | |||
71 | 71 | ||
72 | if (!out) | 72 | if (!out) |
73 | /* malloc failure */ | 73 | /* malloc failure */ |
74 | 74 | ||
75 | if (EVP_PKEY_encrypt(ctx, out, &outlen, in, inlen) <= 0) | 75 | if (EVP_PKEY_encrypt(ctx, out, &outlen, in, inlen) <= 0) |
76 | /* Error */ | 76 | /* Error */ |
77 | 77 | ||
@@ -84,7 +84,7 @@ L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, | |||
84 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, | 84 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, |
85 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, | 85 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, |
86 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, | 86 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, |
87 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> | 87 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> |
88 | 88 | ||
89 | =head1 HISTORY | 89 | =head1 HISTORY |
90 | 90 | ||
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_keygen.pod b/src/lib/libcrypto/doc/EVP_PKEY_keygen.pod index fd431ace6d..b6102da036 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_keygen.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_keygen.pod | |||
@@ -28,7 +28,7 @@ EVP_PKEY_keygen_init, EVP_PKEY_keygen, EVP_PKEY_paramgen_init, EVP_PKEY_paramgen | |||
28 | The EVP_PKEY_keygen_init() function initializes a public key algorithm | 28 | The EVP_PKEY_keygen_init() function initializes a public key algorithm |
29 | context using key B<pkey> for a key genration operation. | 29 | context using key B<pkey> for a key genration operation. |
30 | 30 | ||
31 | The EVP_PKEY_keygen() function performs a key generation operation, the | 31 | The EVP_PKEY_keygen() function performs a key generation operation, the |
32 | generated key is written to B<ppkey>. | 32 | generated key is written to B<ppkey>. |
33 | 33 | ||
34 | The functions EVP_PKEY_paramgen_init() and EVP_PKEY_paramgen() are similar | 34 | The functions EVP_PKEY_paramgen_init() and EVP_PKEY_paramgen() are similar |
@@ -152,7 +152,7 @@ L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, | |||
152 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, | 152 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, |
153 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, | 153 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, |
154 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, | 154 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, |
155 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> | 155 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> |
156 | 156 | ||
157 | =head1 HISTORY | 157 | =head1 HISTORY |
158 | 158 | ||
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_new.pod b/src/lib/libcrypto/doc/EVP_PKEY_new.pod index 10687e458d..11512249e4 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_new.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_new.pod | |||
@@ -14,7 +14,7 @@ EVP_PKEY_new, EVP_PKEY_free - private key allocation functions. | |||
14 | 14 | ||
15 | =head1 DESCRIPTION | 15 | =head1 DESCRIPTION |
16 | 16 | ||
17 | The EVP_PKEY_new() function allocates an empty B<EVP_PKEY> | 17 | The EVP_PKEY_new() function allocates an empty B<EVP_PKEY> |
18 | structure which is used by OpenSSL to store private keys. | 18 | structure which is used by OpenSSL to store private keys. |
19 | 19 | ||
20 | EVP_PKEY_free() frees up the private key B<key>. | 20 | EVP_PKEY_free() frees up the private key B<key>. |
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_print_private.pod b/src/lib/libcrypto/doc/EVP_PKEY_print_private.pod index ce9d70d7a7..c9b7a89821 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_print_private.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_print_private.pod | |||
@@ -28,7 +28,7 @@ be used. | |||
28 | 28 | ||
29 | =head1 NOTES | 29 | =head1 NOTES |
30 | 30 | ||
31 | Currently no public key algorithms include any options in the B<pctx> parameter | 31 | Currently no public key algorithms include any options in the B<pctx> parameter |
32 | parameter. | 32 | parameter. |
33 | 33 | ||
34 | If the key does not include all the components indicated by the function then | 34 | If the key does not include all the components indicated by the function then |
@@ -44,7 +44,7 @@ the public key algorithm. | |||
44 | =head1 SEE ALSO | 44 | =head1 SEE ALSO |
45 | 45 | ||
46 | L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>, | 46 | L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>, |
47 | L<EVP_PKEY_keygen(3)|EVP_PKEY_keygen(3)> | 47 | L<EVP_PKEY_keygen(3)|EVP_PKEY_keygen(3)> |
48 | 48 | ||
49 | =head1 HISTORY | 49 | =head1 HISTORY |
50 | 50 | ||
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_set1_RSA.pod b/src/lib/libcrypto/doc/EVP_PKEY_set1_RSA.pod index 2db692e271..8afb1b22e1 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_set1_RSA.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_set1_RSA.pod | |||
@@ -63,7 +63,7 @@ EVP_PKEY_set1_RSA(), EVP_PKEY_set1_DSA(), EVP_PKEY_set1_DH() and | |||
63 | EVP_PKEY_set1_EC_KEY() return 1 for success or 0 for failure. | 63 | EVP_PKEY_set1_EC_KEY() return 1 for success or 0 for failure. |
64 | 64 | ||
65 | EVP_PKEY_get1_RSA(), EVP_PKEY_get1_DSA(), EVP_PKEY_get1_DH() and | 65 | EVP_PKEY_get1_RSA(), EVP_PKEY_get1_DSA(), EVP_PKEY_get1_DH() and |
66 | EVP_PKEY_get1_EC_KEY() return the referenced key or B<NULL> if | 66 | EVP_PKEY_get1_EC_KEY() return the referenced key or B<NULL> if |
67 | an error occurred. | 67 | an error occurred. |
68 | 68 | ||
69 | EVP_PKEY_assign_RSA() EVP_PKEY_assign_DSA(), EVP_PKEY_assign_DH() | 69 | EVP_PKEY_assign_RSA() EVP_PKEY_assign_DSA(), EVP_PKEY_assign_DH() |
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_sign.pod b/src/lib/libcrypto/doc/EVP_PKEY_sign.pod index a044f2c131..fb8e61cf29 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_sign.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_sign.pod | |||
@@ -50,7 +50,7 @@ Sign data using RSA with PKCS#1 padding and SHA256 digest: | |||
50 | 50 | ||
51 | EVP_PKEY_CTX *ctx; | 51 | EVP_PKEY_CTX *ctx; |
52 | unsigned char *md, *sig; | 52 | unsigned char *md, *sig; |
53 | size_t mdlen, siglen; | 53 | size_t mdlen, siglen; |
54 | EVP_PKEY *signing_key; | 54 | EVP_PKEY *signing_key; |
55 | /* NB: assumes signing_key, md and mdlen are already set up | 55 | /* NB: assumes signing_key, md and mdlen are already set up |
56 | * and that signing_key is an RSA private key | 56 | * and that signing_key is an RSA private key |
@@ -73,7 +73,7 @@ Sign data using RSA with PKCS#1 padding and SHA256 digest: | |||
73 | 73 | ||
74 | if (!sig) | 74 | if (!sig) |
75 | /* malloc failure */ | 75 | /* malloc failure */ |
76 | 76 | ||
77 | if (EVP_PKEY_sign(ctx, sig, &siglen, md, mdlen) <= 0) | 77 | if (EVP_PKEY_sign(ctx, sig, &siglen, md, mdlen) <= 0) |
78 | /* Error */ | 78 | /* Error */ |
79 | 79 | ||
@@ -87,7 +87,7 @@ L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>, | |||
87 | L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, | 87 | L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, |
88 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, | 88 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, |
89 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, | 89 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, |
90 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> | 90 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> |
91 | 91 | ||
92 | =head1 HISTORY | 92 | =head1 HISTORY |
93 | 93 | ||
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_verify.pod b/src/lib/libcrypto/doc/EVP_PKEY_verify.pod index 90612ba2f0..f7ae4f9ebe 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_verify.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_verify.pod | |||
@@ -53,7 +53,7 @@ Verify signature using PKCS#1 and SHA256 digest: | |||
53 | 53 | ||
54 | EVP_PKEY_CTX *ctx; | 54 | EVP_PKEY_CTX *ctx; |
55 | unsigned char *md, *sig; | 55 | unsigned char *md, *sig; |
56 | size_t mdlen, siglen; | 56 | size_t mdlen, siglen; |
57 | EVP_PKEY *verify_key; | 57 | EVP_PKEY *verify_key; |
58 | /* NB: assumes verify_key, sig, siglen md and mdlen are already set up | 58 | /* NB: assumes verify_key, sig, siglen md and mdlen are already set up |
59 | * and that verify_key is an RSA public key | 59 | * and that verify_key is an RSA public key |
@@ -82,7 +82,7 @@ L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>, | |||
82 | L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, | 82 | L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, |
83 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, | 83 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, |
84 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, | 84 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, |
85 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> | 85 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> |
86 | 86 | ||
87 | =head1 HISTORY | 87 | =head1 HISTORY |
88 | 88 | ||
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_verify_recover.pod b/src/lib/libcrypto/doc/EVP_PKEY_verify_recover.pod index 23a28a9c43..00d53db783 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_verify_recover.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_verify_recover.pod | |||
@@ -29,7 +29,7 @@ B<rout> and the amount of data written to B<routlen>. | |||
29 | =head1 NOTES | 29 | =head1 NOTES |
30 | 30 | ||
31 | Normally an application is only interested in whether a signature verification | 31 | Normally an application is only interested in whether a signature verification |
32 | operation is successful in those cases the EVP_verify() function should be | 32 | operation is successful in those cases the EVP_verify() function should be |
33 | used. | 33 | used. |
34 | 34 | ||
35 | Sometimes however it is useful to obtain the data originally signed using a | 35 | Sometimes however it is useful to obtain the data originally signed using a |
@@ -58,7 +58,7 @@ Recover digest originally signed using PKCS#1 and SHA256 digest: | |||
58 | 58 | ||
59 | EVP_PKEY_CTX *ctx; | 59 | EVP_PKEY_CTX *ctx; |
60 | unsigned char *rout, *sig; | 60 | unsigned char *rout, *sig; |
61 | size_t routlen, siglen; | 61 | size_t routlen, siglen; |
62 | EVP_PKEY *verify_key; | 62 | EVP_PKEY *verify_key; |
63 | /* NB: assumes verify_key, sig and siglen are already set up | 63 | /* NB: assumes verify_key, sig and siglen are already set up |
64 | * and that verify_key is an RSA public key | 64 | * and that verify_key is an RSA public key |
@@ -81,7 +81,7 @@ Recover digest originally signed using PKCS#1 and SHA256 digest: | |||
81 | 81 | ||
82 | if (!rout) | 82 | if (!rout) |
83 | /* malloc failure */ | 83 | /* malloc failure */ |
84 | 84 | ||
85 | if (EVP_PKEY_verify_recover(ctx, rout, &routlen, sig, siglen) <= 0) | 85 | if (EVP_PKEY_verify_recover(ctx, rout, &routlen, sig, siglen) <= 0) |
86 | /* Error */ | 86 | /* Error */ |
87 | 87 | ||
@@ -94,7 +94,7 @@ L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>, | |||
94 | L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, | 94 | L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, |
95 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, | 95 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, |
96 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, | 96 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, |
97 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> | 97 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> |
98 | 98 | ||
99 | =head1 HISTORY | 99 | =head1 HISTORY |
100 | 100 | ||
diff --git a/src/lib/libcrypto/doc/EVP_SealInit.pod b/src/lib/libcrypto/doc/EVP_SealInit.pod index 7d793e19ef..172f210c64 100644 --- a/src/lib/libcrypto/doc/EVP_SealInit.pod +++ b/src/lib/libcrypto/doc/EVP_SealInit.pod | |||
@@ -42,9 +42,9 @@ If the cipher does not require an IV then the B<iv> parameter is ignored | |||
42 | and can be B<NULL>. | 42 | and can be B<NULL>. |
43 | 43 | ||
44 | EVP_SealUpdate() and EVP_SealFinal() have exactly the same properties | 44 | EVP_SealUpdate() and EVP_SealFinal() have exactly the same properties |
45 | as the EVP_EncryptUpdate() and EVP_EncryptFinal() routines, as | 45 | as the EVP_EncryptUpdate() and EVP_EncryptFinal() routines, as |
46 | documented on the L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> manual | 46 | documented on the L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> manual |
47 | page. | 47 | page. |
48 | 48 | ||
49 | =head1 RETURN VALUES | 49 | =head1 RETURN VALUES |
50 | 50 | ||
diff --git a/src/lib/libcrypto/doc/EVP_SignInit.pod b/src/lib/libcrypto/doc/EVP_SignInit.pod index 620a623ab6..682724b157 100644 --- a/src/lib/libcrypto/doc/EVP_SignInit.pod +++ b/src/lib/libcrypto/doc/EVP_SignInit.pod | |||
@@ -32,7 +32,7 @@ same B<ctx> to include additional data. | |||
32 | EVP_SignFinal() signs the data in B<ctx> using the private key B<pkey> and | 32 | EVP_SignFinal() signs the data in B<ctx> using the private key B<pkey> and |
33 | places the signature in B<sig>. The number of bytes of data written (i.e. the | 33 | places the signature in B<sig>. The number of bytes of data written (i.e. the |
34 | length of the signature) will be written to the integer at B<s>, at most | 34 | length of the signature) will be written to the integer at B<s>, at most |
35 | EVP_PKEY_size(pkey) bytes will be written. | 35 | EVP_PKEY_size(pkey) bytes will be written. |
36 | 36 | ||
37 | EVP_SignInit() initializes a signing context B<ctx> to use the default | 37 | EVP_SignInit() initializes a signing context B<ctx> to use the default |
38 | implementation of digest B<type>. | 38 | implementation of digest B<type>. |
@@ -57,7 +57,7 @@ transparent to the algorithm used and much more flexible. | |||
57 | 57 | ||
58 | Due to the link between message digests and public key algorithms the correct | 58 | Due to the link between message digests and public key algorithms the correct |
59 | digest algorithm must be used with the correct public key type. A list of | 59 | digest algorithm must be used with the correct public key type. A list of |
60 | algorithms and associated public key algorithms appears in | 60 | algorithms and associated public key algorithms appears in |
61 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>. | 61 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>. |
62 | 62 | ||
63 | When signing with DSA private keys the random number generator must be seeded | 63 | When signing with DSA private keys the random number generator must be seeded |
@@ -74,7 +74,7 @@ will occur. | |||
74 | 74 | ||
75 | =head1 BUGS | 75 | =head1 BUGS |
76 | 76 | ||
77 | Older versions of this documentation wrongly stated that calls to | 77 | Older versions of this documentation wrongly stated that calls to |
78 | EVP_SignUpdate() could not be made after calling EVP_SignFinal(). | 78 | EVP_SignUpdate() could not be made after calling EVP_SignFinal(). |
79 | 79 | ||
80 | Since the private key is passed in the call to EVP_SignFinal() any error | 80 | Since the private key is passed in the call to EVP_SignFinal() any error |
diff --git a/src/lib/libcrypto/doc/EVP_VerifyInit.pod b/src/lib/libcrypto/doc/EVP_VerifyInit.pod index 9097f09410..0ffb0a8077 100644 --- a/src/lib/libcrypto/doc/EVP_VerifyInit.pod +++ b/src/lib/libcrypto/doc/EVP_VerifyInit.pod | |||
@@ -51,7 +51,7 @@ transparent to the algorithm used and much more flexible. | |||
51 | 51 | ||
52 | Due to the link between message digests and public key algorithms the correct | 52 | Due to the link between message digests and public key algorithms the correct |
53 | digest algorithm must be used with the correct public key type. A list of | 53 | digest algorithm must be used with the correct public key type. A list of |
54 | algorithms and associated public key algorithms appears in | 54 | algorithms and associated public key algorithms appears in |
55 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>. | 55 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>. |
56 | 56 | ||
57 | The call to EVP_VerifyFinal() internally finalizes a copy of the digest context. | 57 | The call to EVP_VerifyFinal() internally finalizes a copy of the digest context. |
@@ -64,7 +64,7 @@ will occur. | |||
64 | 64 | ||
65 | =head1 BUGS | 65 | =head1 BUGS |
66 | 66 | ||
67 | Older versions of this documentation wrongly stated that calls to | 67 | Older versions of this documentation wrongly stated that calls to |
68 | EVP_VerifyUpdate() could not be made after calling EVP_VerifyFinal(). | 68 | EVP_VerifyUpdate() could not be made after calling EVP_VerifyFinal(). |
69 | 69 | ||
70 | Since the public key is passed in the call to EVP_SignFinal() any error | 70 | Since the public key is passed in the call to EVP_SignFinal() any error |
diff --git a/src/lib/libcrypto/doc/MD5.pod b/src/lib/libcrypto/doc/MD5.pod index d11d5c32cb..b0edd5416f 100644 --- a/src/lib/libcrypto/doc/MD5.pod +++ b/src/lib/libcrypto/doc/MD5.pod | |||
@@ -75,7 +75,7 @@ preferred. | |||
75 | 75 | ||
76 | =head1 RETURN VALUES | 76 | =head1 RETURN VALUES |
77 | 77 | ||
78 | MD2(), MD4(), and MD5() return pointers to the hash value. | 78 | MD2(), MD4(), and MD5() return pointers to the hash value. |
79 | 79 | ||
80 | MD2_Init(), MD2_Update(), MD2_Final(), MD4_Init(), MD4_Update(), | 80 | MD2_Init(), MD2_Update(), MD2_Final(), MD4_Init(), MD4_Update(), |
81 | MD4_Final(), MD5_Init(), MD5_Update(), and MD5_Final() return 1 for | 81 | MD4_Final(), MD5_Init(), MD5_Update(), and MD5_Final() return 1 for |
diff --git a/src/lib/libcrypto/doc/OBJ_nid2obj.pod b/src/lib/libcrypto/doc/OBJ_nid2obj.pod index 1e45dd40f6..458ef025f0 100644 --- a/src/lib/libcrypto/doc/OBJ_nid2obj.pod +++ b/src/lib/libcrypto/doc/OBJ_nid2obj.pod | |||
@@ -34,7 +34,7 @@ functions | |||
34 | The ASN1 object utility functions process ASN1_OBJECT structures which are | 34 | The ASN1 object utility functions process ASN1_OBJECT structures which are |
35 | a representation of the ASN1 OBJECT IDENTIFIER (OID) type. | 35 | a representation of the ASN1 OBJECT IDENTIFIER (OID) type. |
36 | 36 | ||
37 | OBJ_nid2obj(), OBJ_nid2ln() and OBJ_nid2sn() convert the NID B<n> to | 37 | OBJ_nid2obj(), OBJ_nid2ln() and OBJ_nid2sn() convert the NID B<n> to |
38 | an ASN1_OBJECT structure, its long name and its short name respectively, | 38 | an ASN1_OBJECT structure, its long name and its short name respectively, |
39 | or B<NULL> is an error occurred. | 39 | or B<NULL> is an error occurred. |
40 | 40 | ||
@@ -62,7 +62,7 @@ OBJ_cmp() compares B<a> to B<b>. If the two are identical 0 is returned. | |||
62 | 62 | ||
63 | OBJ_dup() returns a copy of B<o>. | 63 | OBJ_dup() returns a copy of B<o>. |
64 | 64 | ||
65 | OBJ_create() adds a new object to the internal table. B<oid> is the | 65 | OBJ_create() adds a new object to the internal table. B<oid> is the |
66 | numerical form of the object, B<sn> the short name and B<ln> the | 66 | numerical form of the object, B<sn> the short name and B<ln> the |
67 | long name. A new NID is returned for the created object. | 67 | long name. A new NID is returned for the created object. |
68 | 68 | ||
@@ -115,14 +115,14 @@ Create a new NID and initialize an object from it: | |||
115 | new_nid = OBJ_create("1.2.3.4", "NewOID", "New Object Identifier"); | 115 | new_nid = OBJ_create("1.2.3.4", "NewOID", "New Object Identifier"); |
116 | 116 | ||
117 | obj = OBJ_nid2obj(new_nid); | 117 | obj = OBJ_nid2obj(new_nid); |
118 | 118 | ||
119 | Create a new object directly: | 119 | Create a new object directly: |
120 | 120 | ||
121 | obj = OBJ_txt2obj("1.2.3.4", 1); | 121 | obj = OBJ_txt2obj("1.2.3.4", 1); |
122 | 122 | ||
123 | =head1 BUGS | 123 | =head1 BUGS |
124 | 124 | ||
125 | OBJ_obj2txt() is awkward and messy to use: it doesn't follow the | 125 | OBJ_obj2txt() is awkward and messy to use: it doesn't follow the |
126 | convention of other OpenSSL functions where the buffer can be set | 126 | convention of other OpenSSL functions where the buffer can be set |
127 | to B<NULL> to determine the amount of data that should be written. | 127 | to B<NULL> to determine the amount of data that should be written. |
128 | Instead B<buf> must point to a valid buffer and B<buf_len> should | 128 | Instead B<buf> must point to a valid buffer and B<buf_len> should |
diff --git a/src/lib/libcrypto/doc/OPENSSL_config.pod b/src/lib/libcrypto/doc/OPENSSL_config.pod index e7bba2aaca..552ed956ab 100644 --- a/src/lib/libcrypto/doc/OPENSSL_config.pod +++ b/src/lib/libcrypto/doc/OPENSSL_config.pod | |||
@@ -37,7 +37,7 @@ can be added without source changes. | |||
37 | 37 | ||
38 | The environment variable B<OPENSSL_CONF> can be set to specify the location | 38 | The environment variable B<OPENSSL_CONF> can be set to specify the location |
39 | of the configuration file. | 39 | of the configuration file. |
40 | 40 | ||
41 | Currently ASN1 OBJECTs and ENGINE configuration can be performed future | 41 | Currently ASN1 OBJECTs and ENGINE configuration can be performed future |
42 | versions of OpenSSL will add new configuration options. | 42 | versions of OpenSSL will add new configuration options. |
43 | 43 | ||
diff --git a/src/lib/libcrypto/doc/OPENSSL_load_builtin_modules.pod b/src/lib/libcrypto/doc/OPENSSL_load_builtin_modules.pod index f14dfaf005..6c99170197 100644 --- a/src/lib/libcrypto/doc/OPENSSL_load_builtin_modules.pod +++ b/src/lib/libcrypto/doc/OPENSSL_load_builtin_modules.pod | |||
@@ -24,15 +24,15 @@ ENGINE_add_conf_module() adds just the ENGINE configuration module. | |||
24 | 24 | ||
25 | =head1 NOTES | 25 | =head1 NOTES |
26 | 26 | ||
27 | If the simple configuration function OPENSSL_config() is called then | 27 | If the simple configuration function OPENSSL_config() is called then |
28 | OPENSSL_load_builtin_modules() is called automatically. | 28 | OPENSSL_load_builtin_modules() is called automatically. |
29 | 29 | ||
30 | Applications which use the configuration functions directly will need to | 30 | Applications which use the configuration functions directly will need to |
31 | call OPENSSL_load_builtin_modules() themselves I<before> any other | 31 | call OPENSSL_load_builtin_modules() themselves I<before> any other |
32 | configuration code. | 32 | configuration code. |
33 | 33 | ||
34 | Applications should call OPENSSL_load_builtin_modules() to load all | 34 | Applications should call OPENSSL_load_builtin_modules() to load all |
35 | configuration modules instead of adding modules selectively: otherwise | 35 | configuration modules instead of adding modules selectively: otherwise |
36 | functionality may be missing from the application if an when new | 36 | functionality may be missing from the application if an when new |
37 | modules are added. | 37 | modules are added. |
38 | 38 | ||
diff --git a/src/lib/libcrypto/doc/PEM_read_bio_PrivateKey.pod b/src/lib/libcrypto/doc/PEM_read_bio_PrivateKey.pod index 54414a3f6f..e196bf1498 100644 --- a/src/lib/libcrypto/doc/PEM_read_bio_PrivateKey.pod +++ b/src/lib/libcrypto/doc/PEM_read_bio_PrivateKey.pod | |||
@@ -250,7 +250,7 @@ structure. They will also process a trusted X509 certificate but | |||
250 | any trust settings are discarded. | 250 | any trust settings are discarded. |
251 | 251 | ||
252 | The B<X509_AUX> functions process a trusted X509 certificate using | 252 | The B<X509_AUX> functions process a trusted X509 certificate using |
253 | an X509 structure. | 253 | an X509 structure. |
254 | 254 | ||
255 | The B<X509_REQ> and B<X509_REQ_NEW> functions process a PKCS#10 | 255 | The B<X509_REQ> and B<X509_REQ_NEW> functions process a PKCS#10 |
256 | certificate request using an X509_REQ structure. The B<X509_REQ> | 256 | certificate request using an X509_REQ structure. The B<X509_REQ> |
@@ -435,7 +435,7 @@ which is an uninitialised pointer. | |||
435 | 435 | ||
436 | This old B<PrivateKey> routines use a non standard technique for encryption. | 436 | This old B<PrivateKey> routines use a non standard technique for encryption. |
437 | 437 | ||
438 | The private key (or other data) takes the following form: | 438 | The private key (or other data) takes the following form: |
439 | 439 | ||
440 | -----BEGIN RSA PRIVATE KEY----- | 440 | -----BEGIN RSA PRIVATE KEY----- |
441 | Proc-Type: 4,ENCRYPTED | 441 | Proc-Type: 4,ENCRYPTED |
@@ -461,7 +461,7 @@ an existing structure. Therefore the following: | |||
461 | 461 | ||
462 | PEM_read_bio_X509(bp, &x, 0, NULL); | 462 | PEM_read_bio_X509(bp, &x, 0, NULL); |
463 | 463 | ||
464 | where B<x> already contains a valid certificate, may not work, whereas: | 464 | where B<x> already contains a valid certificate, may not work, whereas: |
465 | 465 | ||
466 | X509_free(x); | 466 | X509_free(x); |
467 | x = PEM_read_bio_X509(bp, NULL, 0, NULL); | 467 | x = PEM_read_bio_X509(bp, NULL, 0, NULL); |
diff --git a/src/lib/libcrypto/doc/PKCS12_create.pod b/src/lib/libcrypto/doc/PKCS12_create.pod index de7cab2bdf..0a1e460cf1 100644 --- a/src/lib/libcrypto/doc/PKCS12_create.pod +++ b/src/lib/libcrypto/doc/PKCS12_create.pod | |||
@@ -60,7 +60,7 @@ certficate is required. In previous versions both had to be present or | |||
60 | a fatal error is returned. | 60 | a fatal error is returned. |
61 | 61 | ||
62 | B<nid_key> or B<nid_cert> can be set to -1 indicating that no encryption | 62 | B<nid_key> or B<nid_cert> can be set to -1 indicating that no encryption |
63 | should be used. | 63 | should be used. |
64 | 64 | ||
65 | B<mac_iter> can be set to -1 and the MAC will then be omitted entirely. | 65 | B<mac_iter> can be set to -1 and the MAC will then be omitted entirely. |
66 | 66 | ||
diff --git a/src/lib/libcrypto/doc/PKCS7_encrypt.pod b/src/lib/libcrypto/doc/PKCS7_encrypt.pod index 2cd925a7e0..e206684384 100644 --- a/src/lib/libcrypto/doc/PKCS7_encrypt.pod +++ b/src/lib/libcrypto/doc/PKCS7_encrypt.pod | |||
@@ -30,7 +30,7 @@ bit RC2. These can be used by passing EVP_rc2_40_cbc() and EVP_rc2_64_cbc() | |||
30 | respectively. | 30 | respectively. |
31 | 31 | ||
32 | The algorithm passed in the B<cipher> parameter must support ASN1 encoding of | 32 | The algorithm passed in the B<cipher> parameter must support ASN1 encoding of |
33 | its parameters. | 33 | its parameters. |
34 | 34 | ||
35 | Many browsers implement a "sign and encrypt" option which is simply an S/MIME | 35 | Many browsers implement a "sign and encrypt" option which is simply an S/MIME |
36 | envelopedData containing an S/MIME signed message. This can be readily produced | 36 | envelopedData containing an S/MIME signed message. This can be readily produced |
@@ -55,7 +55,7 @@ suitable for streaming I/O: no data is read from the BIO B<in>. | |||
55 | 55 | ||
56 | If the flag B<PKCS7_STREAM> is set the returned B<PKCS7> structure is B<not> | 56 | If the flag B<PKCS7_STREAM> is set the returned B<PKCS7> structure is B<not> |
57 | complete and outputting its contents via a function that does not | 57 | complete and outputting its contents via a function that does not |
58 | properly finalize the B<PKCS7> structure will give unpredictable | 58 | properly finalize the B<PKCS7> structure will give unpredictable |
59 | results. | 59 | results. |
60 | 60 | ||
61 | Several functions including SMIME_write_PKCS7(), i2d_PKCS7_bio_stream(), | 61 | Several functions including SMIME_write_PKCS7(), i2d_PKCS7_bio_stream(), |
diff --git a/src/lib/libcrypto/doc/PKCS7_sign.pod b/src/lib/libcrypto/doc/PKCS7_sign.pod index 64a35144f8..9a4f5b173e 100644 --- a/src/lib/libcrypto/doc/PKCS7_sign.pod +++ b/src/lib/libcrypto/doc/PKCS7_sign.pod | |||
@@ -15,7 +15,7 @@ PKCS7_sign - create a PKCS#7 signedData structure | |||
15 | PKCS7_sign() creates and returns a PKCS#7 signedData structure. B<signcert> is | 15 | PKCS7_sign() creates and returns a PKCS#7 signedData structure. B<signcert> is |
16 | the certificate to sign with, B<pkey> is the corresponsding private key. | 16 | the certificate to sign with, B<pkey> is the corresponsding private key. |
17 | B<certs> is an optional additional set of certificates to include in the PKCS#7 | 17 | B<certs> is an optional additional set of certificates to include in the PKCS#7 |
18 | structure (for example any intermediate CAs in the chain). | 18 | structure (for example any intermediate CAs in the chain). |
19 | 19 | ||
20 | The data to be signed is read from BIO B<data>. | 20 | The data to be signed is read from BIO B<data>. |
21 | 21 | ||
diff --git a/src/lib/libcrypto/doc/PKCS7_sign_add_signer.pod b/src/lib/libcrypto/doc/PKCS7_sign_add_signer.pod index ebec4d57de..afe8ad97cd 100644 --- a/src/lib/libcrypto/doc/PKCS7_sign_add_signer.pod +++ b/src/lib/libcrypto/doc/PKCS7_sign_add_signer.pod | |||
@@ -44,7 +44,7 @@ digest value from the PKCS7 struture: to add a signer to an existing structure. | |||
44 | An error occurs if a matching digest value cannot be found to copy. The | 44 | An error occurs if a matching digest value cannot be found to copy. The |
45 | returned PKCS7 structure will be valid and finalized when this flag is set. | 45 | returned PKCS7 structure will be valid and finalized when this flag is set. |
46 | 46 | ||
47 | If B<PKCS7_PARTIAL> is set in addition to B<PKCS7_REUSE_DIGEST> then the | 47 | If B<PKCS7_PARTIAL> is set in addition to B<PKCS7_REUSE_DIGEST> then the |
48 | B<PKCS7_SIGNER_INO> structure will not be finalized so additional attributes | 48 | B<PKCS7_SIGNER_INO> structure will not be finalized so additional attributes |
49 | can be added. In this case an explicit call to PKCS7_SIGNER_INFO_sign() is | 49 | can be added. In this case an explicit call to PKCS7_SIGNER_INFO_sign() is |
50 | needed to finalize it. | 50 | needed to finalize it. |
@@ -67,7 +67,7 @@ these algorithms is disabled then it will not be included. | |||
67 | 67 | ||
68 | 68 | ||
69 | PKCS7_sign_add_signers() returns an internal pointer to the PKCS7_SIGNER_INFO | 69 | PKCS7_sign_add_signers() returns an internal pointer to the PKCS7_SIGNER_INFO |
70 | structure just added, this can be used to set additional attributes | 70 | structure just added, this can be used to set additional attributes |
71 | before it is finalized. | 71 | before it is finalized. |
72 | 72 | ||
73 | =head1 RETURN VALUES | 73 | =head1 RETURN VALUES |
diff --git a/src/lib/libcrypto/doc/PKCS7_verify.pod b/src/lib/libcrypto/doc/PKCS7_verify.pod index 7c10a4cc3c..51ada03f2d 100644 --- a/src/lib/libcrypto/doc/PKCS7_verify.pod +++ b/src/lib/libcrypto/doc/PKCS7_verify.pod | |||
@@ -54,7 +54,7 @@ Any of the following flags (ored together) can be passed in the B<flags> paramet | |||
54 | to change the default verify behaviour. Only the flag B<PKCS7_NOINTERN> is | 54 | to change the default verify behaviour. Only the flag B<PKCS7_NOINTERN> is |
55 | meaningful to PKCS7_get0_signers(). | 55 | meaningful to PKCS7_get0_signers(). |
56 | 56 | ||
57 | If B<PKCS7_NOINTERN> is set the certificates in the message itself are not | 57 | If B<PKCS7_NOINTERN> is set the certificates in the message itself are not |
58 | searched when locating the signer's certificate. This means that all the signers | 58 | searched when locating the signer's certificate. This means that all the signers |
59 | certificates must be in the B<certs> parameter. | 59 | certificates must be in the B<certs> parameter. |
60 | 60 | ||
@@ -79,7 +79,7 @@ certificates supplied in B<certs> then the verify will fail because the | |||
79 | signer cannot be found. | 79 | signer cannot be found. |
80 | 80 | ||
81 | Care should be taken when modifying the default verify behaviour, for example | 81 | Care should be taken when modifying the default verify behaviour, for example |
82 | setting B<PKCS7_NOVERIFY|PKCS7_NOSIGS> will totally disable all verification | 82 | setting B<PKCS7_NOVERIFY|PKCS7_NOSIGS> will totally disable all verification |
83 | and any signed message will be considered valid. This combination is however | 83 | and any signed message will be considered valid. This combination is however |
84 | useful if one merely wishes to write the content to B<out> and its validity | 84 | useful if one merely wishes to write the content to B<out> and its validity |
85 | is not considered important. | 85 | is not considered important. |
diff --git a/src/lib/libcrypto/doc/RAND.pod b/src/lib/libcrypto/doc/RAND.pod index e460c1653e..8f803f33eb 100644 --- a/src/lib/libcrypto/doc/RAND.pod +++ b/src/lib/libcrypto/doc/RAND.pod | |||
@@ -54,7 +54,7 @@ described in L<RAND_add(3)|RAND_add(3)>. Its state can be saved in a seed file | |||
54 | seeding process whenever the application is started. | 54 | seeding process whenever the application is started. |
55 | 55 | ||
56 | L<RAND_bytes(3)|RAND_bytes(3)> describes how to obtain random data from the | 56 | L<RAND_bytes(3)|RAND_bytes(3)> describes how to obtain random data from the |
57 | PRNG. | 57 | PRNG. |
58 | 58 | ||
59 | =head1 INTERNALS | 59 | =head1 INTERNALS |
60 | 60 | ||
@@ -67,6 +67,6 @@ L<BN_rand(3)|BN_rand(3)>, L<RAND_add(3)|RAND_add(3)>, | |||
67 | L<RAND_load_file(3)|RAND_load_file(3)>, | 67 | L<RAND_load_file(3)|RAND_load_file(3)>, |
68 | L<RAND_bytes(3)|RAND_bytes(3)>, | 68 | L<RAND_bytes(3)|RAND_bytes(3)>, |
69 | L<RAND_set_rand_method(3)|RAND_set_rand_method(3)>, | 69 | L<RAND_set_rand_method(3)|RAND_set_rand_method(3)>, |
70 | L<RAND_cleanup(3)|RAND_cleanup(3)> | 70 | L<RAND_cleanup(3)|RAND_cleanup(3)> |
71 | 71 | ||
72 | =cut | 72 | =cut |
diff --git a/src/lib/libcrypto/doc/RIPEMD160.pod b/src/lib/libcrypto/doc/RIPEMD160.pod index 264bb99ae7..f66fb02ed2 100644 --- a/src/lib/libcrypto/doc/RIPEMD160.pod +++ b/src/lib/libcrypto/doc/RIPEMD160.pod | |||
@@ -45,7 +45,7 @@ hash functions directly. | |||
45 | 45 | ||
46 | =head1 RETURN VALUES | 46 | =head1 RETURN VALUES |
47 | 47 | ||
48 | RIPEMD160() returns a pointer to the hash value. | 48 | RIPEMD160() returns a pointer to the hash value. |
49 | 49 | ||
50 | RIPEMD160_Init(), RIPEMD160_Update() and RIPEMD160_Final() return 1 for | 50 | RIPEMD160_Init(), RIPEMD160_Update() and RIPEMD160_Final() return 1 for |
51 | success, 0 otherwise. | 51 | success, 0 otherwise. |
diff --git a/src/lib/libcrypto/doc/RSA_private_encrypt.pod b/src/lib/libcrypto/doc/RSA_private_encrypt.pod index 746a80c79e..4c4d131172 100644 --- a/src/lib/libcrypto/doc/RSA_private_encrypt.pod +++ b/src/lib/libcrypto/doc/RSA_private_encrypt.pod | |||
@@ -11,7 +11,7 @@ RSA_private_encrypt, RSA_public_decrypt - low level signature operations | |||
11 | int RSA_private_encrypt(int flen, unsigned char *from, | 11 | int RSA_private_encrypt(int flen, unsigned char *from, |
12 | unsigned char *to, RSA *rsa, int padding); | 12 | unsigned char *to, RSA *rsa, int padding); |
13 | 13 | ||
14 | int RSA_public_decrypt(int flen, unsigned char *from, | 14 | int RSA_public_decrypt(int flen, unsigned char *from, |
15 | unsigned char *to, RSA *rsa, int padding); | 15 | unsigned char *to, RSA *rsa, int padding); |
16 | 16 | ||
17 | =head1 DESCRIPTION | 17 | =head1 DESCRIPTION |
diff --git a/src/lib/libcrypto/doc/RSA_set_method.pod b/src/lib/libcrypto/doc/RSA_set_method.pod index 2c963d7e5b..eb0913c106 100644 --- a/src/lib/libcrypto/doc/RSA_set_method.pod +++ b/src/lib/libcrypto/doc/RSA_set_method.pod | |||
@@ -43,7 +43,7 @@ been set as a default for RSA, so this function is no longer recommended. | |||
43 | 43 | ||
44 | RSA_get_default_method() returns a pointer to the current default | 44 | RSA_get_default_method() returns a pointer to the current default |
45 | RSA_METHOD. However, the meaningfulness of this result is dependent on | 45 | RSA_METHOD. However, the meaningfulness of this result is dependent on |
46 | whether the ENGINE API is being used, so this function is no longer | 46 | whether the ENGINE API is being used, so this function is no longer |
47 | recommended. | 47 | recommended. |
48 | 48 | ||
49 | RSA_set_method() selects B<meth> to perform all operations using the key | 49 | RSA_set_method() selects B<meth> to perform all operations using the key |
diff --git a/src/lib/libcrypto/doc/RSA_sign.pod b/src/lib/libcrypto/doc/RSA_sign.pod index 8553be8e99..061c0e2437 100644 --- a/src/lib/libcrypto/doc/RSA_sign.pod +++ b/src/lib/libcrypto/doc/RSA_sign.pod | |||
@@ -52,7 +52,7 @@ SSL, PKCS #1 v2.0 | |||
52 | 52 | ||
53 | L<ERR_get_error(3)|ERR_get_error(3)>, L<objects(3)|objects(3)>, | 53 | L<ERR_get_error(3)|ERR_get_error(3)>, L<objects(3)|objects(3)>, |
54 | L<rsa(3)|rsa(3)>, L<RSA_private_encrypt(3)|RSA_private_encrypt(3)>, | 54 | L<rsa(3)|rsa(3)>, L<RSA_private_encrypt(3)|RSA_private_encrypt(3)>, |
55 | L<RSA_public_decrypt(3)|RSA_public_decrypt(3)> | 55 | L<RSA_public_decrypt(3)|RSA_public_decrypt(3)> |
56 | 56 | ||
57 | =head1 HISTORY | 57 | =head1 HISTORY |
58 | 58 | ||
diff --git a/src/lib/libcrypto/doc/SHA1.pod b/src/lib/libcrypto/doc/SHA1.pod index 94ab7bc724..232af9227e 100644 --- a/src/lib/libcrypto/doc/SHA1.pod +++ b/src/lib/libcrypto/doc/SHA1.pod | |||
@@ -46,7 +46,7 @@ used only when backward compatibility is required. | |||
46 | 46 | ||
47 | =head1 RETURN VALUES | 47 | =head1 RETURN VALUES |
48 | 48 | ||
49 | SHA1() returns a pointer to the hash value. | 49 | SHA1() returns a pointer to the hash value. |
50 | 50 | ||
51 | SHA1_Init(), SHA1_Update() and SHA1_Final() return 1 for success, 0 otherwise. | 51 | SHA1_Init(), SHA1_Update() and SHA1_Final() return 1 for success, 0 otherwise. |
52 | 52 | ||
diff --git a/src/lib/libcrypto/doc/X509_NAME_ENTRY_get_object.pod b/src/lib/libcrypto/doc/X509_NAME_ENTRY_get_object.pod index 41902c0d45..ad0d796535 100644 --- a/src/lib/libcrypto/doc/X509_NAME_ENTRY_get_object.pod +++ b/src/lib/libcrypto/doc/X509_NAME_ENTRY_get_object.pod | |||
@@ -35,17 +35,17 @@ X509_NAME_ENTRY_set_data() sets the field value of B<ne> to string type | |||
35 | B<type> and value determined by B<bytes> and B<len>. | 35 | B<type> and value determined by B<bytes> and B<len>. |
36 | 36 | ||
37 | X509_NAME_ENTRY_create_by_txt(), X509_NAME_ENTRY_create_by_NID() | 37 | X509_NAME_ENTRY_create_by_txt(), X509_NAME_ENTRY_create_by_NID() |
38 | and X509_NAME_ENTRY_create_by_OBJ() create and return an | 38 | and X509_NAME_ENTRY_create_by_OBJ() create and return an |
39 | B<X509_NAME_ENTRY> structure. | 39 | B<X509_NAME_ENTRY> structure. |
40 | 40 | ||
41 | =head1 NOTES | 41 | =head1 NOTES |
42 | 42 | ||
43 | X509_NAME_ENTRY_get_object() and X509_NAME_ENTRY_get_data() can be | 43 | X509_NAME_ENTRY_get_object() and X509_NAME_ENTRY_get_data() can be |
44 | used to examine an B<X509_NAME_ENTRY> function as returned by | 44 | used to examine an B<X509_NAME_ENTRY> function as returned by |
45 | X509_NAME_get_entry() for example. | 45 | X509_NAME_get_entry() for example. |
46 | 46 | ||
47 | X509_NAME_ENTRY_create_by_txt(), X509_NAME_ENTRY_create_by_NID(), | 47 | X509_NAME_ENTRY_create_by_txt(), X509_NAME_ENTRY_create_by_NID(), |
48 | and X509_NAME_ENTRY_create_by_OBJ() create and return an | 48 | and X509_NAME_ENTRY_create_by_OBJ() create and return an |
49 | 49 | ||
50 | X509_NAME_ENTRY_create_by_txt(), X509_NAME_ENTRY_create_by_OBJ(), | 50 | X509_NAME_ENTRY_create_by_txt(), X509_NAME_ENTRY_create_by_OBJ(), |
51 | X509_NAME_ENTRY_create_by_NID() and X509_NAME_ENTRY_set_data() | 51 | X509_NAME_ENTRY_create_by_NID() and X509_NAME_ENTRY_set_data() |
diff --git a/src/lib/libcrypto/doc/X509_NAME_add_entry_by_txt.pod b/src/lib/libcrypto/doc/X509_NAME_add_entry_by_txt.pod index 1afd008cb3..5b9e81b922 100644 --- a/src/lib/libcrypto/doc/X509_NAME_add_entry_by_txt.pod +++ b/src/lib/libcrypto/doc/X509_NAME_add_entry_by_txt.pod | |||
@@ -61,7 +61,7 @@ to 0. This adds a new entry to the end of B<name> as a single valued | |||
61 | RelativeDistinguishedName (RDN). | 61 | RelativeDistinguishedName (RDN). |
62 | 62 | ||
63 | B<loc> actually determines the index where the new entry is inserted: | 63 | B<loc> actually determines the index where the new entry is inserted: |
64 | if it is -1 it is appended. | 64 | if it is -1 it is appended. |
65 | 65 | ||
66 | B<set> determines how the new type is added. If it is zero a | 66 | B<set> determines how the new type is added. If it is zero a |
67 | new RDN is created. | 67 | new RDN is created. |
diff --git a/src/lib/libcrypto/doc/X509_NAME_get_index_by_NID.pod b/src/lib/libcrypto/doc/X509_NAME_get_index_by_NID.pod index 3b1f9ff43b..7da92617fb 100644 --- a/src/lib/libcrypto/doc/X509_NAME_get_index_by_NID.pod +++ b/src/lib/libcrypto/doc/X509_NAME_get_index_by_NID.pod | |||
@@ -43,7 +43,7 @@ B<obj>, if no such entry exists -1 is returned. At most B<len> bytes | |||
43 | will be written and the text written to B<buf> will be null | 43 | will be written and the text written to B<buf> will be null |
44 | terminated. The length of the output string written is returned | 44 | terminated. The length of the output string written is returned |
45 | excluding the terminating null. If B<buf> is <NULL> then the amount | 45 | excluding the terminating null. If B<buf> is <NULL> then the amount |
46 | of space needed in B<buf> (excluding the final null) is returned. | 46 | of space needed in B<buf> (excluding the final null) is returned. |
47 | 47 | ||
48 | =head1 NOTES | 48 | =head1 NOTES |
49 | 49 | ||
diff --git a/src/lib/libcrypto/doc/X509_NAME_print_ex.pod b/src/lib/libcrypto/doc/X509_NAME_print_ex.pod index 2579a5dc9d..b2d86d4ddb 100644 --- a/src/lib/libcrypto/doc/X509_NAME_print_ex.pod +++ b/src/lib/libcrypto/doc/X509_NAME_print_ex.pod | |||
@@ -27,7 +27,7 @@ X509_NAME_oneline() prints an ASCII version of B<a> to B<buf>. At most B<size> | |||
27 | bytes will be written. If B<buf> is B<NULL> then a buffer is dynamically allocated | 27 | bytes will be written. If B<buf> is B<NULL> then a buffer is dynamically allocated |
28 | and returned, otherwise B<buf> is returned. | 28 | and returned, otherwise B<buf> is returned. |
29 | 29 | ||
30 | X509_NAME_print() prints out B<name> to B<bp> indenting each line by B<obase> | 30 | X509_NAME_print() prints out B<name> to B<bp> indenting each line by B<obase> |
31 | characters. Multiple lines are used if the output (including indent) exceeds | 31 | characters. Multiple lines are used if the output (including indent) exceeds |
32 | 80 characters. | 32 | 80 characters. |
33 | 33 | ||
@@ -76,7 +76,7 @@ printed instead of the values. | |||
76 | If B<XN_FLAG_FN_ALIGN> is set then field names are padded to 20 characters: this | 76 | If B<XN_FLAG_FN_ALIGN> is set then field names are padded to 20 characters: this |
77 | is only of use for multiline format. | 77 | is only of use for multiline format. |
78 | 78 | ||
79 | Additionally all the options supported by ASN1_STRING_print_ex() can be used to | 79 | Additionally all the options supported by ASN1_STRING_print_ex() can be used to |
80 | control how each field value is displayed. | 80 | control how each field value is displayed. |
81 | 81 | ||
82 | In addition a number options can be set for commonly used formats. | 82 | In addition a number options can be set for commonly used formats. |
diff --git a/src/lib/libcrypto/doc/X509_STORE_CTX_get_ex_new_index.pod b/src/lib/libcrypto/doc/X509_STORE_CTX_get_ex_new_index.pod index 8d6b9dda47..1b75967ccd 100644 --- a/src/lib/libcrypto/doc/X509_STORE_CTX_get_ex_new_index.pod +++ b/src/lib/libcrypto/doc/X509_STORE_CTX_get_ex_new_index.pod | |||
@@ -27,7 +27,7 @@ and RSA_get_ex_data() as described in L<RSA_get_ex_new_index(3)>. | |||
27 | 27 | ||
28 | This mechanism is used internally by the B<ssl> library to store the B<SSL> | 28 | This mechanism is used internally by the B<ssl> library to store the B<SSL> |
29 | structure associated with a verification operation in an B<X509_STORE_CTX> | 29 | structure associated with a verification operation in an B<X509_STORE_CTX> |
30 | structure. | 30 | structure. |
31 | 31 | ||
32 | =head1 SEE ALSO | 32 | =head1 SEE ALSO |
33 | 33 | ||
diff --git a/src/lib/libcrypto/doc/X509_STORE_CTX_new.pod b/src/lib/libcrypto/doc/X509_STORE_CTX_new.pod index b17888f149..1c55236aa2 100644 --- a/src/lib/libcrypto/doc/X509_STORE_CTX_new.pod +++ b/src/lib/libcrypto/doc/X509_STORE_CTX_new.pod | |||
@@ -45,7 +45,7 @@ will be untrusted but may be used to build the chain) in B<chain>. Any or | |||
45 | all of the B<store>, B<x509> and B<chain> parameters can be B<NULL>. | 45 | all of the B<store>, B<x509> and B<chain> parameters can be B<NULL>. |
46 | 46 | ||
47 | X509_STORE_CTX_trusted_stack() sets the set of trusted certificates of B<ctx> | 47 | X509_STORE_CTX_trusted_stack() sets the set of trusted certificates of B<ctx> |
48 | to B<sk>. This is an alternative way of specifying trusted certificates | 48 | to B<sk>. This is an alternative way of specifying trusted certificates |
49 | instead of using an B<X509_STORE>. | 49 | instead of using an B<X509_STORE>. |
50 | 50 | ||
51 | X509_STORE_CTX_set_cert() sets the certificate to be vertified in B<ctx> to | 51 | X509_STORE_CTX_set_cert() sets the certificate to be vertified in B<ctx> to |
diff --git a/src/lib/libcrypto/doc/X509_STORE_CTX_set_verify_cb.pod b/src/lib/libcrypto/doc/X509_STORE_CTX_set_verify_cb.pod index b9787a6ca6..86d988eee0 100644 --- a/src/lib/libcrypto/doc/X509_STORE_CTX_set_verify_cb.pod +++ b/src/lib/libcrypto/doc/X509_STORE_CTX_set_verify_cb.pod | |||
@@ -94,7 +94,7 @@ expired just one specific case: | |||
94 | Full featured logging callback. In this case the B<bio_err> is assumed to be | 94 | Full featured logging callback. In this case the B<bio_err> is assumed to be |
95 | a global logging B<BIO>, an alternative would to store a BIO in B<ctx> using | 95 | a global logging B<BIO>, an alternative would to store a BIO in B<ctx> using |
96 | B<ex_data>. | 96 | B<ex_data>. |
97 | 97 | ||
98 | int verify_callback(int ok, X509_STORE_CTX *ctx) | 98 | int verify_callback(int ok, X509_STORE_CTX *ctx) |
99 | { | 99 | { |
100 | X509 *err_cert; | 100 | X509 *err_cert; |
diff --git a/src/lib/libcrypto/doc/X509_STORE_set_verify_cb_func.pod b/src/lib/libcrypto/doc/X509_STORE_set_verify_cb_func.pod index 29e3bbe3bc..012f2d2c75 100644 --- a/src/lib/libcrypto/doc/X509_STORE_set_verify_cb_func.pod +++ b/src/lib/libcrypto/doc/X509_STORE_set_verify_cb_func.pod | |||
@@ -24,14 +24,14 @@ is implemented as a macro. | |||
24 | 24 | ||
25 | =head1 NOTES | 25 | =head1 NOTES |
26 | 26 | ||
27 | The verification callback from an B<X509_STORE> is inherited by | 27 | The verification callback from an B<X509_STORE> is inherited by |
28 | the corresponding B<X509_STORE_CTX> structure when it is initialized. This can | 28 | the corresponding B<X509_STORE_CTX> structure when it is initialized. This can |
29 | be used to set the verification callback when the B<X509_STORE_CTX> is | 29 | be used to set the verification callback when the B<X509_STORE_CTX> is |
30 | otherwise inaccessible (for example during S/MIME verification). | 30 | otherwise inaccessible (for example during S/MIME verification). |
31 | 31 | ||
32 | =head1 BUGS | 32 | =head1 BUGS |
33 | 33 | ||
34 | The macro version of this function was the only one available before | 34 | The macro version of this function was the only one available before |
35 | OpenSSL 1.0.0. | 35 | OpenSSL 1.0.0. |
36 | 36 | ||
37 | =head1 RETURN VALUES | 37 | =head1 RETURN VALUES |
diff --git a/src/lib/libcrypto/doc/X509_VERIFY_PARAM_set_flags.pod b/src/lib/libcrypto/doc/X509_VERIFY_PARAM_set_flags.pod index 46cac2bea2..e5da5bec08 100644 --- a/src/lib/libcrypto/doc/X509_VERIFY_PARAM_set_flags.pod +++ b/src/lib/libcrypto/doc/X509_VERIFY_PARAM_set_flags.pod | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | =head1 NAME | 3 | =head1 NAME |
4 | 4 | ||
5 | X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_get_flags, X509_VERIFY_PARAM_set_purpose, X509_VERIFY_PARAM_set_trust, X509_VERIFY_PARAM_set_depth, X509_VERIFY_PARAM_get_depth, X509_VERIFY_PARAM_set_time, X509_VERIFY_PARAM_add0_policy, X509_VERIFY_PARAM_set1_policies - X509 verification parameters | 5 | X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_get_flags, X509_VERIFY_PARAM_set_purpose, X509_VERIFY_PARAM_set_trust, X509_VERIFY_PARAM_set_depth, X509_VERIFY_PARAM_get_depth, X509_VERIFY_PARAM_set_time, X509_VERIFY_PARAM_add0_policy, X509_VERIFY_PARAM_set1_policies - X509 verification parameters |
6 | 6 | ||
7 | =head1 SYNOPSIS | 7 | =head1 SYNOPSIS |
8 | 8 | ||
@@ -20,7 +20,7 @@ X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_ge | |||
20 | 20 | ||
21 | int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param, | 21 | int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param, |
22 | ASN1_OBJECT *policy); | 22 | ASN1_OBJECT *policy); |
23 | int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param, | 23 | int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param, |
24 | STACK_OF(ASN1_OBJECT) *policies); | 24 | STACK_OF(ASN1_OBJECT) *policies); |
25 | 25 | ||
26 | void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth); | 26 | void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth); |
@@ -29,7 +29,7 @@ X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_ge | |||
29 | =head1 DESCRIPTION | 29 | =head1 DESCRIPTION |
30 | 30 | ||
31 | These functions manipulate the B<X509_VERIFY_PARAM> structure associated with | 31 | These functions manipulate the B<X509_VERIFY_PARAM> structure associated with |
32 | a certificate verification operation. | 32 | a certificate verification operation. |
33 | 33 | ||
34 | The X509_VERIFY_PARAM_set_flags() function sets the flags in B<param> by oring | 34 | The X509_VERIFY_PARAM_set_flags() function sets the flags in B<param> by oring |
35 | it with B<flags>. See the B<VERIFICATION FLAGS> section for a complete | 35 | it with B<flags>. See the B<VERIFICATION FLAGS> section for a complete |
@@ -43,7 +43,7 @@ X509_VERIFY_PARAM_set_purpose() sets the verification purpose in B<param> | |||
43 | to B<purpose>. This determines the acceptable purpose of the certificate | 43 | to B<purpose>. This determines the acceptable purpose of the certificate |
44 | chain, for example SSL client or SSL server. | 44 | chain, for example SSL client or SSL server. |
45 | 45 | ||
46 | X509_VERIFY_PARAM_set_trust() sets the trust setting in B<param> to | 46 | X509_VERIFY_PARAM_set_trust() sets the trust setting in B<param> to |
47 | B<trust>. | 47 | B<trust>. |
48 | 48 | ||
49 | X509_VERIFY_PARAM_set_time() sets the verification time in B<param> to | 49 | X509_VERIFY_PARAM_set_time() sets the verification time in B<param> to |
@@ -63,10 +63,10 @@ chain. | |||
63 | 63 | ||
64 | =head1 RETURN VALUES | 64 | =head1 RETURN VALUES |
65 | 65 | ||
66 | X509_VERIFY_PARAM_set_flags(), X509_VERIFY_PARAM_clear_flags(), | 66 | X509_VERIFY_PARAM_set_flags(), X509_VERIFY_PARAM_clear_flags(), |
67 | X509_VERIFY_PARAM_set_purpose(), X509_VERIFY_PARAM_set_trust(), | 67 | X509_VERIFY_PARAM_set_purpose(), X509_VERIFY_PARAM_set_trust(), |
68 | X509_VERIFY_PARAM_add0_policy() and X509_VERIFY_PARAM_set1_policies() return 1 | 68 | X509_VERIFY_PARAM_add0_policy() and X509_VERIFY_PARAM_set1_policies() return 1 |
69 | for success and 0 for failure. | 69 | for success and 0 for failure. |
70 | 70 | ||
71 | X509_VERIFY_PARAM_get_flags() returns the current verification flags. | 71 | X509_VERIFY_PARAM_get_flags() returns the current verification flags. |
72 | 72 | ||
@@ -81,7 +81,7 @@ The verification flags consists of zero or more of the following flags | |||
81 | ored together. | 81 | ored together. |
82 | 82 | ||
83 | B<X509_V_FLAG_CRL_CHECK> enables CRL checking for the certificate chain leaf | 83 | B<X509_V_FLAG_CRL_CHECK> enables CRL checking for the certificate chain leaf |
84 | certificate. An error occurs if a suitable CRL cannot be found. | 84 | certificate. An error occurs if a suitable CRL cannot be found. |
85 | 85 | ||
86 | B<X509_V_FLAG_CRL_CHECK_ALL> enables CRL checking for the entire certificate | 86 | B<X509_V_FLAG_CRL_CHECK_ALL> enables CRL checking for the entire certificate |
87 | chain. | 87 | chain. |
@@ -99,7 +99,7 @@ certificates and makes the verification strictly apply B<X509> rules. | |||
99 | B<X509_V_FLAG_ALLOW_PROXY_CERTS> enables proxy certificate verification. | 99 | B<X509_V_FLAG_ALLOW_PROXY_CERTS> enables proxy certificate verification. |
100 | 100 | ||
101 | B<X509_V_FLAG_POLICY_CHECK> enables certificate policy checking, by default | 101 | B<X509_V_FLAG_POLICY_CHECK> enables certificate policy checking, by default |
102 | no policy checking is peformed. Additional information is sent to the | 102 | no policy checking is peformed. Additional information is sent to the |
103 | verification callback relating to policy checking. | 103 | verification callback relating to policy checking. |
104 | 104 | ||
105 | B<X509_V_FLAG_EXPLICIT_POLICY>, B<X509_V_FLAG_INHIBIT_ANY> and | 105 | B<X509_V_FLAG_EXPLICIT_POLICY>, B<X509_V_FLAG_INHIBIT_ANY> and |
@@ -142,7 +142,7 @@ X509_STORE_CTX_set_flags(). | |||
142 | =head1 BUGS | 142 | =head1 BUGS |
143 | 143 | ||
144 | Delta CRL checking is currently primitive. Only a single delta can be used and | 144 | Delta CRL checking is currently primitive. Only a single delta can be used and |
145 | (partly due to limitations of B<X509_STORE>) constructed CRLs are not | 145 | (partly due to limitations of B<X509_STORE>) constructed CRLs are not |
146 | maintained. | 146 | maintained. |
147 | 147 | ||
148 | If CRLs checking is enable CRLs are expected to be available in the | 148 | If CRLs checking is enable CRLs are expected to be available in the |
@@ -151,7 +151,7 @@ CRLs from the CRL distribution points extension. | |||
151 | 151 | ||
152 | =head1 EXAMPLE | 152 | =head1 EXAMPLE |
153 | 153 | ||
154 | Enable CRL checking when performing certificate verification during SSL | 154 | Enable CRL checking when performing certificate verification during SSL |
155 | connections associated with an B<SSL_CTX> structure B<ctx>: | 155 | connections associated with an B<SSL_CTX> structure B<ctx>: |
156 | 156 | ||
157 | X509_VERIFY_PARAM *param; | 157 | X509_VERIFY_PARAM *param; |
diff --git a/src/lib/libcrypto/doc/d2i_DSAPublicKey.pod b/src/lib/libcrypto/doc/d2i_DSAPublicKey.pod index 22c1b50f22..c80e311d04 100644 --- a/src/lib/libcrypto/doc/d2i_DSAPublicKey.pod +++ b/src/lib/libcrypto/doc/d2i_DSAPublicKey.pod | |||
@@ -56,7 +56,7 @@ i2d_X509() described in the L<d2i_X509(3)|d2i_X509(3)> manual page. | |||
56 | The B<DSA> structure passed to the private key encoding functions should have | 56 | The B<DSA> structure passed to the private key encoding functions should have |
57 | all the private key components present. | 57 | all the private key components present. |
58 | 58 | ||
59 | The data encoded by the private key functions is unencrypted and therefore | 59 | The data encoded by the private key functions is unencrypted and therefore |
60 | offers no private key security. | 60 | offers no private key security. |
61 | 61 | ||
62 | The B<DSA_PUBKEY> functions should be used in preference to the B<DSAPublicKey> | 62 | The B<DSA_PUBKEY> functions should be used in preference to the B<DSAPublicKey> |
diff --git a/src/lib/libcrypto/doc/d2i_RSAPublicKey.pod b/src/lib/libcrypto/doc/d2i_RSAPublicKey.pod index aa6078bcf6..1711dc038f 100644 --- a/src/lib/libcrypto/doc/d2i_RSAPublicKey.pod +++ b/src/lib/libcrypto/doc/d2i_RSAPublicKey.pod | |||
@@ -49,8 +49,8 @@ i2d_X509() described in the L<d2i_X509(3)|d2i_X509(3)> manual page. | |||
49 | The B<RSA> structure passed to the private key encoding functions should have | 49 | The B<RSA> structure passed to the private key encoding functions should have |
50 | all the PKCS#1 private key components present. | 50 | all the PKCS#1 private key components present. |
51 | 51 | ||
52 | The data encoded by the private key functions is unencrypted and therefore | 52 | The data encoded by the private key functions is unencrypted and therefore |
53 | offers no private key security. | 53 | offers no private key security. |
54 | 54 | ||
55 | The NET format functions are present to provide compatibility with certain very | 55 | The NET format functions are present to provide compatibility with certain very |
56 | old software. This format has some severe security weaknesses and should be | 56 | old software. This format has some severe security weaknesses and should be |
diff --git a/src/lib/libcrypto/doc/d2i_X509.pod b/src/lib/libcrypto/doc/d2i_X509.pod index 298ec54a4c..e212014ac8 100644 --- a/src/lib/libcrypto/doc/d2i_X509.pod +++ b/src/lib/libcrypto/doc/d2i_X509.pod | |||
@@ -23,7 +23,7 @@ i2d_X509_fp - X509 encode and decode functions | |||
23 | The X509 encode and decode routines encode and parse an | 23 | The X509 encode and decode routines encode and parse an |
24 | B<X509> structure, which represents an X509 certificate. | 24 | B<X509> structure, which represents an X509 certificate. |
25 | 25 | ||
26 | d2i_X509() attempts to decode B<len> bytes at B<*in>. If | 26 | d2i_X509() attempts to decode B<len> bytes at B<*in>. If |
27 | successful a pointer to the B<X509> structure is returned. If an error | 27 | successful a pointer to the B<X509> structure is returned. If an error |
28 | occurred then B<NULL> is returned. If B<px> is not B<NULL> then the | 28 | occurred then B<NULL> is returned. If B<px> is not B<NULL> then the |
29 | returned structure is written to B<*px>. If B<*px> is not B<NULL> | 29 | returned structure is written to B<*px>. If B<*px> is not B<NULL> |
@@ -36,7 +36,7 @@ i2d_X509() encodes the structure pointed to by B<x> into DER format. | |||
36 | If B<out> is not B<NULL> is writes the DER encoded data to the buffer | 36 | If B<out> is not B<NULL> is writes the DER encoded data to the buffer |
37 | at B<*out>, and increments it to point after the data just written. | 37 | at B<*out>, and increments it to point after the data just written. |
38 | If the return value is negative an error occurred, otherwise it | 38 | If the return value is negative an error occurred, otherwise it |
39 | returns the length of the encoded data. | 39 | returns the length of the encoded data. |
40 | 40 | ||
41 | For OpenSSL 0.9.7 and later if B<*out> is B<NULL> memory will be | 41 | For OpenSSL 0.9.7 and later if B<*out> is B<NULL> memory will be |
42 | allocated for a buffer and the encoded data written to it. In this | 42 | allocated for a buffer and the encoded data written to it. In this |
@@ -194,7 +194,7 @@ happen. | |||
194 | 194 | ||
195 | =head1 BUGS | 195 | =head1 BUGS |
196 | 196 | ||
197 | In some versions of OpenSSL the "reuse" behaviour of d2i_X509() when | 197 | In some versions of OpenSSL the "reuse" behaviour of d2i_X509() when |
198 | B<*px> is valid is broken and some parts of the reused structure may | 198 | B<*px> is valid is broken and some parts of the reused structure may |
199 | persist if they are not present in the new one. As a result the use | 199 | persist if they are not present in the new one. As a result the use |
200 | of this "reuse" behaviour is strongly discouraged. | 200 | of this "reuse" behaviour is strongly discouraged. |
@@ -210,14 +210,14 @@ always succeed. | |||
210 | 210 | ||
211 | d2i_X509(), d2i_X509_bio() and d2i_X509_fp() return a valid B<X509> structure | 211 | d2i_X509(), d2i_X509_bio() and d2i_X509_fp() return a valid B<X509> structure |
212 | or B<NULL> if an error occurs. The error code that can be obtained by | 212 | or B<NULL> if an error occurs. The error code that can be obtained by |
213 | L<ERR_get_error(3)|ERR_get_error(3)>. | 213 | L<ERR_get_error(3)|ERR_get_error(3)>. |
214 | 214 | ||
215 | i2d_X509() returns the number of bytes successfully encoded or a negative | 215 | i2d_X509() returns the number of bytes successfully encoded or a negative |
216 | value if an error occurs. The error code can be obtained by | 216 | value if an error occurs. The error code can be obtained by |
217 | L<ERR_get_error(3)|ERR_get_error(3)>. | 217 | L<ERR_get_error(3)|ERR_get_error(3)>. |
218 | 218 | ||
219 | i2d_X509_bio() and i2d_X509_fp() return 1 for success and 0 if an error | 219 | i2d_X509_bio() and i2d_X509_fp() return 1 for success and 0 if an error |
220 | occurs The error code can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. | 220 | occurs The error code can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. |
221 | 221 | ||
222 | =head1 SEE ALSO | 222 | =head1 SEE ALSO |
223 | 223 | ||
diff --git a/src/lib/libcrypto/doc/dh.pod b/src/lib/libcrypto/doc/dh.pod index c3ccd06207..97aaa75731 100644 --- a/src/lib/libcrypto/doc/dh.pod +++ b/src/lib/libcrypto/doc/dh.pod | |||
@@ -73,6 +73,6 @@ L<DH_set_method(3)|DH_set_method(3)>, L<DH_new(3)|DH_new(3)>, | |||
73 | L<DH_get_ex_new_index(3)|DH_get_ex_new_index(3)>, | 73 | L<DH_get_ex_new_index(3)|DH_get_ex_new_index(3)>, |
74 | L<DH_generate_parameters(3)|DH_generate_parameters(3)>, | 74 | L<DH_generate_parameters(3)|DH_generate_parameters(3)>, |
75 | L<DH_compute_key(3)|DH_compute_key(3)>, L<d2i_DHparams(3)|d2i_DHparams(3)>, | 75 | L<DH_compute_key(3)|DH_compute_key(3)>, L<d2i_DHparams(3)|d2i_DHparams(3)>, |
76 | L<RSA_print(3)|RSA_print(3)> | 76 | L<RSA_print(3)|RSA_print(3)> |
77 | 77 | ||
78 | =cut | 78 | =cut |
diff --git a/src/lib/libcrypto/doc/evp.pod b/src/lib/libcrypto/doc/evp.pod index 9faa349243..33ce7cb6d6 100644 --- a/src/lib/libcrypto/doc/evp.pod +++ b/src/lib/libcrypto/doc/evp.pod | |||
@@ -37,7 +37,7 @@ implementations. For more information, consult the engine(3) man page. | |||
37 | Although low level algorithm specific functions exist for many algorithms | 37 | Although low level algorithm specific functions exist for many algorithms |
38 | their use is discouraged. They cannot be used with an ENGINE and ENGINE | 38 | their use is discouraged. They cannot be used with an ENGINE and ENGINE |
39 | versions of new algorithms cannot be accessed using the low level functions. | 39 | versions of new algorithms cannot be accessed using the low level functions. |
40 | Also makes code harder to adapt to new algorithms and some options are not | 40 | Also makes code harder to adapt to new algorithms and some options are not |
41 | cleanly supported at the low level and some operations are more efficient | 41 | cleanly supported at the low level and some operations are more efficient |
42 | using the high level interface. | 42 | using the high level interface. |
43 | 43 | ||
diff --git a/src/lib/libcrypto/doc/rsa.pod b/src/lib/libcrypto/doc/rsa.pod index 45ac53ffc1..829ce24701 100644 --- a/src/lib/libcrypto/doc/rsa.pod +++ b/src/lib/libcrypto/doc/rsa.pod | |||
@@ -18,7 +18,7 @@ rsa - RSA public key cryptosystem | |||
18 | unsigned char *to, RSA *rsa, int padding); | 18 | unsigned char *to, RSA *rsa, int padding); |
19 | int RSA_private_encrypt(int flen, unsigned char *from, | 19 | int RSA_private_encrypt(int flen, unsigned char *from, |
20 | unsigned char *to, RSA *rsa,int padding); | 20 | unsigned char *to, RSA *rsa,int padding); |
21 | int RSA_public_decrypt(int flen, unsigned char *from, | 21 | int RSA_public_decrypt(int flen, unsigned char *from, |
22 | unsigned char *to, RSA *rsa,int padding); | 22 | unsigned char *to, RSA *rsa,int padding); |
23 | 23 | ||
24 | int RSA_sign(int type, unsigned char *m, unsigned int m_len, | 24 | int RSA_sign(int type, unsigned char *m, unsigned int m_len, |
@@ -118,6 +118,6 @@ L<RSA_set_method(3)|RSA_set_method(3)>, L<RSA_print(3)|RSA_print(3)>, | |||
118 | L<RSA_get_ex_new_index(3)|RSA_get_ex_new_index(3)>, | 118 | L<RSA_get_ex_new_index(3)|RSA_get_ex_new_index(3)>, |
119 | L<RSA_private_encrypt(3)|RSA_private_encrypt(3)>, | 119 | L<RSA_private_encrypt(3)|RSA_private_encrypt(3)>, |
120 | L<RSA_sign_ASN1_OCTET_STRING(3)|RSA_sign_ASN1_OCTET_STRING(3)>, | 120 | L<RSA_sign_ASN1_OCTET_STRING(3)|RSA_sign_ASN1_OCTET_STRING(3)>, |
121 | L<RSA_padding_add_PKCS1_type_1(3)|RSA_padding_add_PKCS1_type_1(3)> | 121 | L<RSA_padding_add_PKCS1_type_1(3)|RSA_padding_add_PKCS1_type_1(3)> |
122 | 122 | ||
123 | =cut | 123 | =cut |
diff --git a/src/lib/libssl/src/doc/crypto/ASN1_STRING_print_ex.pod b/src/lib/libssl/src/doc/crypto/ASN1_STRING_print_ex.pod index 3891b88791..70ac9b8488 100644 --- a/src/lib/libssl/src/doc/crypto/ASN1_STRING_print_ex.pod +++ b/src/lib/libssl/src/doc/crypto/ASN1_STRING_print_ex.pod | |||
@@ -30,7 +30,7 @@ with '.'. | |||
30 | 30 | ||
31 | ASN1_STRING_print() is a legacy function which should be avoided in new applications. | 31 | ASN1_STRING_print() is a legacy function which should be avoided in new applications. |
32 | 32 | ||
33 | Although there are a large number of options frequently B<ASN1_STRFLGS_RFC2253> is | 33 | Although there are a large number of options frequently B<ASN1_STRFLGS_RFC2253> is |
34 | suitable, or on UTF8 terminals B<ASN1_STRFLGS_RFC2253 & ~ASN1_STRFLGS_ESC_MSB>. | 34 | suitable, or on UTF8 terminals B<ASN1_STRFLGS_RFC2253 & ~ASN1_STRFLGS_ESC_MSB>. |
35 | 35 | ||
36 | The complete set of supported options for B<flags> is listed below. | 36 | The complete set of supported options for B<flags> is listed below. |
@@ -75,7 +75,7 @@ Normally non character string types (such as OCTET STRING) are assumed to be | |||
75 | one byte per character, if B<ASN1_STRFLGS_DUMP_UNKNOWN> is set then they will | 75 | one byte per character, if B<ASN1_STRFLGS_DUMP_UNKNOWN> is set then they will |
76 | be dumped instead. | 76 | be dumped instead. |
77 | 77 | ||
78 | When a type is dumped normally just the content octets are printed, if | 78 | When a type is dumped normally just the content octets are printed, if |
79 | B<ASN1_STRFLGS_DUMP_DER> is set then the complete encoding is dumped | 79 | B<ASN1_STRFLGS_DUMP_DER> is set then the complete encoding is dumped |
80 | instead (including tag and length octets). | 80 | instead (including tag and length octets). |
81 | 81 | ||
diff --git a/src/lib/libssl/src/doc/crypto/ASN1_generate_nconf.pod b/src/lib/libssl/src/doc/crypto/ASN1_generate_nconf.pod index 542fd1579a..fee7398bd4 100644 --- a/src/lib/libssl/src/doc/crypto/ASN1_generate_nconf.pod +++ b/src/lib/libssl/src/doc/crypto/ASN1_generate_nconf.pod | |||
@@ -52,7 +52,7 @@ only the B<ASCII> format is permissible. | |||
52 | This encodes a boolean type. The B<value> string is mandatory and | 52 | This encodes a boolean type. The B<value> string is mandatory and |
53 | should be B<TRUE> or B<FALSE>. Additionally B<TRUE>, B<true>, B<Y>, | 53 | should be B<TRUE> or B<FALSE>. Additionally B<TRUE>, B<true>, B<Y>, |
54 | B<y>, B<YES>, B<yes>, B<FALSE>, B<false>, B<N>, B<n>, B<NO> and B<no> | 54 | B<y>, B<YES>, B<yes>, B<FALSE>, B<false>, B<N>, B<n>, B<NO> and B<no> |
55 | are acceptable. | 55 | are acceptable. |
56 | 56 | ||
57 | =item B<NULL> | 57 | =item B<NULL> |
58 | 58 | ||
@@ -78,12 +78,12 @@ a short name, a long name or numerical format. | |||
78 | =item B<UTCTIME>, B<UTC> | 78 | =item B<UTCTIME>, B<UTC> |
79 | 79 | ||
80 | Encodes an ASN1 B<UTCTime> structure, the value should be in | 80 | Encodes an ASN1 B<UTCTime> structure, the value should be in |
81 | the format B<YYMMDDHHMMSSZ>. | 81 | the format B<YYMMDDHHMMSSZ>. |
82 | 82 | ||
83 | =item B<GENERALIZEDTIME>, B<GENTIME> | 83 | =item B<GENERALIZEDTIME>, B<GENTIME> |
84 | 84 | ||
85 | Encodes an ASN1 B<GeneralizedTime> structure, the value should be in | 85 | Encodes an ASN1 B<GeneralizedTime> structure, the value should be in |
86 | the format B<YYYYMMDDHHMMSSZ>. | 86 | the format B<YYYYMMDDHHMMSSZ>. |
87 | 87 | ||
88 | =item B<OCTETSTRING>, B<OCT> | 88 | =item B<OCTETSTRING>, B<OCT> |
89 | 89 | ||
diff --git a/src/lib/libssl/src/doc/crypto/BF_set_key.pod b/src/lib/libssl/src/doc/crypto/BF_set_key.pod index 5b2d274c15..08cba3e25c 100644 --- a/src/lib/libssl/src/doc/crypto/BF_set_key.pod +++ b/src/lib/libssl/src/doc/crypto/BF_set_key.pod | |||
@@ -52,7 +52,7 @@ everything after the first 64 bits is ignored. | |||
52 | 52 | ||
53 | The mode functions BF_cbc_encrypt(), BF_cfb64_encrypt() and BF_ofb64_encrypt() | 53 | The mode functions BF_cbc_encrypt(), BF_cfb64_encrypt() and BF_ofb64_encrypt() |
54 | all operate on variable length data. They all take an initialization vector | 54 | all operate on variable length data. They all take an initialization vector |
55 | B<ivec> which needs to be passed along into the next call of the same function | 55 | B<ivec> which needs to be passed along into the next call of the same function |
56 | for the same message. B<ivec> may be initialized with anything, but the | 56 | for the same message. B<ivec> may be initialized with anything, but the |
57 | recipient needs to know what it was initialized with, or it won't be able | 57 | recipient needs to know what it was initialized with, or it won't be able |
58 | to decrypt. Some programs and protocols simplify this, like SSH, where | 58 | to decrypt. Some programs and protocols simplify this, like SSH, where |
diff --git a/src/lib/libssl/src/doc/crypto/BIO_ctrl.pod b/src/lib/libssl/src/doc/crypto/BIO_ctrl.pod index 722e8b8f46..cf203eeb96 100644 --- a/src/lib/libssl/src/doc/crypto/BIO_ctrl.pod +++ b/src/lib/libssl/src/doc/crypto/BIO_ctrl.pod | |||
@@ -94,7 +94,7 @@ return the amount of pending data. | |||
94 | =head1 NOTES | 94 | =head1 NOTES |
95 | 95 | ||
96 | BIO_flush(), because it can write data may return 0 or -1 indicating | 96 | BIO_flush(), because it can write data may return 0 or -1 indicating |
97 | that the call should be retried later in a similar manner to BIO_write(). | 97 | that the call should be retried later in a similar manner to BIO_write(). |
98 | The BIO_should_retry() call should be used and appropriate action taken | 98 | The BIO_should_retry() call should be used and appropriate action taken |
99 | is the call fails. | 99 | is the call fails. |
100 | 100 | ||
@@ -121,7 +121,7 @@ operation. | |||
121 | Some of the return values are ambiguous and care should be taken. In | 121 | Some of the return values are ambiguous and care should be taken. In |
122 | particular a return value of 0 can be returned if an operation is not | 122 | particular a return value of 0 can be returned if an operation is not |
123 | supported, if an error occurred, if EOF has not been reached and in | 123 | supported, if an error occurred, if EOF has not been reached and in |
124 | the case of BIO_seek() on a file BIO for a successful operation. | 124 | the case of BIO_seek() on a file BIO for a successful operation. |
125 | 125 | ||
126 | =head1 SEE ALSO | 126 | =head1 SEE ALSO |
127 | 127 | ||
diff --git a/src/lib/libssl/src/doc/crypto/BIO_f_base64.pod b/src/lib/libssl/src/doc/crypto/BIO_f_base64.pod index 438af3b6b6..aee09bae58 100644 --- a/src/lib/libssl/src/doc/crypto/BIO_f_base64.pod +++ b/src/lib/libssl/src/doc/crypto/BIO_f_base64.pod | |||
@@ -17,7 +17,7 @@ BIO_f_base64() returns the base64 BIO method. This is a filter | |||
17 | BIO that base64 encodes any data written through it and decodes | 17 | BIO that base64 encodes any data written through it and decodes |
18 | any data read through it. | 18 | any data read through it. |
19 | 19 | ||
20 | Base64 BIOs do not support BIO_gets() or BIO_puts(). | 20 | Base64 BIOs do not support BIO_gets() or BIO_puts(). |
21 | 21 | ||
22 | BIO_flush() on a base64 BIO that is being written through is | 22 | BIO_flush() on a base64 BIO that is being written through is |
23 | used to signal that no more data is to be encoded: this is used | 23 | used to signal that no more data is to be encoded: this is used |
@@ -63,7 +63,7 @@ data to standard output: | |||
63 | bio = BIO_new_fp(stdin, BIO_NOCLOSE); | 63 | bio = BIO_new_fp(stdin, BIO_NOCLOSE); |
64 | bio_out = BIO_new_fp(stdout, BIO_NOCLOSE); | 64 | bio_out = BIO_new_fp(stdout, BIO_NOCLOSE); |
65 | bio = BIO_push(b64, bio); | 65 | bio = BIO_push(b64, bio); |
66 | while((inlen = BIO_read(bio, inbuf, 512)) > 0) | 66 | while((inlen = BIO_read(bio, inbuf, 512)) > 0) |
67 | BIO_write(bio_out, inbuf, inlen); | 67 | BIO_write(bio_out, inbuf, inlen); |
68 | 68 | ||
69 | BIO_free_all(bio); | 69 | BIO_free_all(bio); |
diff --git a/src/lib/libssl/src/doc/crypto/BIO_f_cipher.pod b/src/lib/libssl/src/doc/crypto/BIO_f_cipher.pod index 02439cea94..c0b23c680c 100644 --- a/src/lib/libssl/src/doc/crypto/BIO_f_cipher.pod +++ b/src/lib/libssl/src/doc/crypto/BIO_f_cipher.pod | |||
@@ -22,7 +22,7 @@ BIO that encrypts any data written through it, and decrypts any data | |||
22 | read from it. It is a BIO wrapper for the cipher routines | 22 | read from it. It is a BIO wrapper for the cipher routines |
23 | EVP_CipherInit(), EVP_CipherUpdate() and EVP_CipherFinal(). | 23 | EVP_CipherInit(), EVP_CipherUpdate() and EVP_CipherFinal(). |
24 | 24 | ||
25 | Cipher BIOs do not support BIO_gets() or BIO_puts(). | 25 | Cipher BIOs do not support BIO_gets() or BIO_puts(). |
26 | 26 | ||
27 | BIO_flush() on an encryption BIO that is being written through is | 27 | BIO_flush() on an encryption BIO that is being written through is |
28 | used to signal that no more data is to be encrypted: this is used | 28 | used to signal that no more data is to be encrypted: this is used |
diff --git a/src/lib/libssl/src/doc/crypto/BIO_s_accept.pod b/src/lib/libssl/src/doc/crypto/BIO_s_accept.pod index 7b63e4621b..2414559372 100644 --- a/src/lib/libssl/src/doc/crypto/BIO_s_accept.pod +++ b/src/lib/libssl/src/doc/crypto/BIO_s_accept.pod | |||
@@ -74,7 +74,7 @@ BIO_set_nbio_accept() sets the accept socket to blocking mode | |||
74 | 74 | ||
75 | BIO_set_accept_bios() can be used to set a chain of BIOs which | 75 | BIO_set_accept_bios() can be used to set a chain of BIOs which |
76 | will be duplicated and prepended to the chain when an incoming | 76 | will be duplicated and prepended to the chain when an incoming |
77 | connection is received. This is useful if, for example, a | 77 | connection is received. This is useful if, for example, a |
78 | buffering or SSL BIO is required for each connection. The | 78 | buffering or SSL BIO is required for each connection. The |
79 | chain of BIOs must not be freed after this call, they will | 79 | chain of BIOs must not be freed after this call, they will |
80 | be automatically freed when the accept BIO is freed. | 80 | be automatically freed when the accept BIO is freed. |
@@ -158,14 +158,14 @@ down each and finally closes both down. | |||
158 | if(BIO_do_accept(abio) <= 0) { | 158 | if(BIO_do_accept(abio) <= 0) { |
159 | fprintf(stderr, "Error setting up accept\n"); | 159 | fprintf(stderr, "Error setting up accept\n"); |
160 | ERR_print_errors_fp(stderr); | 160 | ERR_print_errors_fp(stderr); |
161 | exit(0); | 161 | exit(0); |
162 | } | 162 | } |
163 | 163 | ||
164 | /* Wait for incoming connection */ | 164 | /* Wait for incoming connection */ |
165 | if(BIO_do_accept(abio) <= 0) { | 165 | if(BIO_do_accept(abio) <= 0) { |
166 | fprintf(stderr, "Error accepting connection\n"); | 166 | fprintf(stderr, "Error accepting connection\n"); |
167 | ERR_print_errors_fp(stderr); | 167 | ERR_print_errors_fp(stderr); |
168 | exit(0); | 168 | exit(0); |
169 | } | 169 | } |
170 | fprintf(stderr, "Connection 1 established\n"); | 170 | fprintf(stderr, "Connection 1 established\n"); |
171 | /* Retrieve BIO for connection */ | 171 | /* Retrieve BIO for connection */ |
@@ -176,7 +176,7 @@ down each and finally closes both down. | |||
176 | if(BIO_do_accept(abio) <= 0) { | 176 | if(BIO_do_accept(abio) <= 0) { |
177 | fprintf(stderr, "Error accepting connection\n"); | 177 | fprintf(stderr, "Error accepting connection\n"); |
178 | ERR_print_errors_fp(stderr); | 178 | ERR_print_errors_fp(stderr); |
179 | exit(0); | 179 | exit(0); |
180 | } | 180 | } |
181 | fprintf(stderr, "Connection 2 established\n"); | 181 | fprintf(stderr, "Connection 2 established\n"); |
182 | /* Close accept BIO to refuse further connections */ | 182 | /* Close accept BIO to refuse further connections */ |
diff --git a/src/lib/libssl/src/doc/crypto/BIO_s_bio.pod b/src/lib/libssl/src/doc/crypto/BIO_s_bio.pod index 38271f3448..39ae79fd30 100644 --- a/src/lib/libssl/src/doc/crypto/BIO_s_bio.pod +++ b/src/lib/libssl/src/doc/crypto/BIO_s_bio.pod | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | =head1 NAME | 3 | =head1 NAME |
4 | 4 | ||
5 | BIO_s_bio, BIO_make_bio_pair, BIO_destroy_bio_pair, BIO_shutdown_wr, | 5 | BIO_s_bio, BIO_make_bio_pair, BIO_destroy_bio_pair, BIO_shutdown_wr, |
6 | BIO_set_write_buf_size, BIO_get_write_buf_size, BIO_new_bio_pair, | 6 | BIO_set_write_buf_size, BIO_get_write_buf_size, BIO_new_bio_pair, |
7 | BIO_get_write_guarantee, BIO_ctrl_get_write_guarantee, BIO_get_read_request, | 7 | BIO_get_write_guarantee, BIO_ctrl_get_write_guarantee, BIO_get_read_request, |
8 | BIO_ctrl_get_read_request, BIO_ctrl_reset_read_request - BIO pair BIO | 8 | BIO_ctrl_get_read_request, BIO_ctrl_reset_read_request - BIO pair BIO |
@@ -65,7 +65,7 @@ up any half of the pair will automatically destroy the association. | |||
65 | BIO_shutdown_wr() is used to close down a BIO B<b>. After this call no further | 65 | BIO_shutdown_wr() is used to close down a BIO B<b>. After this call no further |
66 | writes on BIO B<b> are allowed (they will return an error). Reads on the other | 66 | writes on BIO B<b> are allowed (they will return an error). Reads on the other |
67 | half of the pair will return any pending data or EOF when all pending data has | 67 | half of the pair will return any pending data or EOF when all pending data has |
68 | been read. | 68 | been read. |
69 | 69 | ||
70 | BIO_set_write_buf_size() sets the write buffer size of BIO B<b> to B<size>. | 70 | BIO_set_write_buf_size() sets the write buffer size of BIO B<b> to B<size>. |
71 | If the size is not initialized a default value is used. This is currently | 71 | If the size is not initialized a default value is used. This is currently |
diff --git a/src/lib/libssl/src/doc/crypto/BIO_s_connect.pod b/src/lib/libssl/src/doc/crypto/BIO_s_connect.pod index bcf7d8dcac..0743c8849f 100644 --- a/src/lib/libssl/src/doc/crypto/BIO_s_connect.pod +++ b/src/lib/libssl/src/doc/crypto/BIO_s_connect.pod | |||
@@ -86,7 +86,7 @@ BIO_get_conn_int_port() returns the port as an int. | |||
86 | BIO_set_nbio() sets the non blocking I/O flag to B<n>. If B<n> is | 86 | BIO_set_nbio() sets the non blocking I/O flag to B<n>. If B<n> is |
87 | zero then blocking I/O is set. If B<n> is 1 then non blocking I/O | 87 | zero then blocking I/O is set. If B<n> is 1 then non blocking I/O |
88 | is set. Blocking I/O is the default. The call to BIO_set_nbio() | 88 | is set. Blocking I/O is the default. The call to BIO_set_nbio() |
89 | should be made before the connection is established because | 89 | should be made before the connection is established because |
90 | non blocking I/O is set during the connect process. | 90 | non blocking I/O is set during the connect process. |
91 | 91 | ||
92 | BIO_new_connect() combines BIO_new() and BIO_set_conn_hostname() into | 92 | BIO_new_connect() combines BIO_new() and BIO_set_conn_hostname() into |
@@ -178,7 +178,7 @@ to retrieve a page and copy the result to standard output. | |||
178 | /* whatever ... */ | 178 | /* whatever ... */ |
179 | } | 179 | } |
180 | BIO_puts(cbio, "GET / HTTP/1.0\n\n"); | 180 | BIO_puts(cbio, "GET / HTTP/1.0\n\n"); |
181 | for(;;) { | 181 | for(;;) { |
182 | len = BIO_read(cbio, tmpbuf, 1024); | 182 | len = BIO_read(cbio, tmpbuf, 1024); |
183 | if(len <= 0) break; | 183 | if(len <= 0) break; |
184 | BIO_write(out, tmpbuf, len); | 184 | BIO_write(out, tmpbuf, len); |
diff --git a/src/lib/libssl/src/doc/crypto/BIO_s_fd.pod b/src/lib/libssl/src/doc/crypto/BIO_s_fd.pod index b1de1d1015..9bbac29f10 100644 --- a/src/lib/libssl/src/doc/crypto/BIO_s_fd.pod +++ b/src/lib/libssl/src/doc/crypto/BIO_s_fd.pod | |||
@@ -46,7 +46,7 @@ BIO_new_fd() returns a file descriptor BIO using B<fd> and B<close_flag>. | |||
46 | =head1 NOTES | 46 | =head1 NOTES |
47 | 47 | ||
48 | The behaviour of BIO_read() and BIO_write() depends on the behavior of the | 48 | The behaviour of BIO_read() and BIO_write() depends on the behavior of the |
49 | platforms read() and write() calls on the descriptor. If the underlying | 49 | platforms read() and write() calls on the descriptor. If the underlying |
50 | file descriptor is in a non blocking mode then the BIO will behave in the | 50 | file descriptor is in a non blocking mode then the BIO will behave in the |
51 | manner described in the L<BIO_read(3)|BIO_read(3)> and L<BIO_should_retry(3)|BIO_should_retry(3)> | 51 | manner described in the L<BIO_read(3)|BIO_read(3)> and L<BIO_should_retry(3)|BIO_should_retry(3)> |
52 | manual pages. | 52 | manual pages. |
diff --git a/src/lib/libssl/src/doc/crypto/BIO_s_mem.pod b/src/lib/libssl/src/doc/crypto/BIO_s_mem.pod index 8f85e0dcee..76f244caf1 100644 --- a/src/lib/libssl/src/doc/crypto/BIO_s_mem.pod +++ b/src/lib/libssl/src/doc/crypto/BIO_s_mem.pod | |||
@@ -20,7 +20,7 @@ BIO_get_mem_ptr, BIO_new_mem_buf - memory BIO | |||
20 | 20 | ||
21 | =head1 DESCRIPTION | 21 | =head1 DESCRIPTION |
22 | 22 | ||
23 | BIO_s_mem() return the memory BIO method function. | 23 | BIO_s_mem() return the memory BIO method function. |
24 | 24 | ||
25 | A memory BIO is a source/sink BIO which uses memory for its I/O. Data | 25 | A memory BIO is a source/sink BIO which uses memory for its I/O. Data |
26 | written to a memory BIO is stored in a BUF_MEM structure which is extended | 26 | written to a memory BIO is stored in a BUF_MEM structure which is extended |
@@ -94,7 +94,7 @@ to improve efficiency. | |||
94 | Create a memory BIO and write some data to it: | 94 | Create a memory BIO and write some data to it: |
95 | 95 | ||
96 | BIO *mem = BIO_new(BIO_s_mem()); | 96 | BIO *mem = BIO_new(BIO_s_mem()); |
97 | BIO_puts(mem, "Hello World\n"); | 97 | BIO_puts(mem, "Hello World\n"); |
98 | 98 | ||
99 | Create a read only memory BIO: | 99 | Create a read only memory BIO: |
100 | 100 | ||
@@ -108,7 +108,7 @@ Extract the BUF_MEM structure from a memory BIO and then free up the BIO: | |||
108 | BIO_get_mem_ptr(mem, &bptr); | 108 | BIO_get_mem_ptr(mem, &bptr); |
109 | BIO_set_close(mem, BIO_NOCLOSE); /* So BIO_free() leaves BUF_MEM alone */ | 109 | BIO_set_close(mem, BIO_NOCLOSE); /* So BIO_free() leaves BUF_MEM alone */ |
110 | BIO_free(mem); | 110 | BIO_free(mem); |
111 | 111 | ||
112 | 112 | ||
113 | =head1 SEE ALSO | 113 | =head1 SEE ALSO |
114 | 114 | ||
diff --git a/src/lib/libssl/src/doc/crypto/BIO_should_retry.pod b/src/lib/libssl/src/doc/crypto/BIO_should_retry.pod index b6d51f719d..143221ad33 100644 --- a/src/lib/libssl/src/doc/crypto/BIO_should_retry.pod +++ b/src/lib/libssl/src/doc/crypto/BIO_should_retry.pod | |||
@@ -51,7 +51,7 @@ B<BIO_FLAGS_IO_SPECIAL> though current BIO types will only set one of | |||
51 | these. | 51 | these. |
52 | 52 | ||
53 | BIO_get_retry_BIO() determines the precise reason for the special | 53 | BIO_get_retry_BIO() determines the precise reason for the special |
54 | condition, it returns the BIO that caused this condition and if | 54 | condition, it returns the BIO that caused this condition and if |
55 | B<reason> is not NULL it contains the reason code. The meaning of | 55 | B<reason> is not NULL it contains the reason code. The meaning of |
56 | the reason code and the action that should be taken depends on | 56 | the reason code and the action that should be taken depends on |
57 | the type of BIO that resulted in this condition. | 57 | the type of BIO that resulted in this condition. |
@@ -94,7 +94,7 @@ available and then retry the BIO operation. By combining the retry | |||
94 | conditions of several non blocking BIOs in a single select() call | 94 | conditions of several non blocking BIOs in a single select() call |
95 | it is possible to service several BIOs in a single thread, though | 95 | it is possible to service several BIOs in a single thread, though |
96 | the performance may be poor if SSL BIOs are present because long delays | 96 | the performance may be poor if SSL BIOs are present because long delays |
97 | can occur during the initial handshake process. | 97 | can occur during the initial handshake process. |
98 | 98 | ||
99 | It is possible for a BIO to block indefinitely if the underlying I/O | 99 | It is possible for a BIO to block indefinitely if the underlying I/O |
100 | structure cannot process or return any data. This depends on the behaviour of | 100 | structure cannot process or return any data. This depends on the behaviour of |
diff --git a/src/lib/libssl/src/doc/crypto/BN_BLINDING_new.pod b/src/lib/libssl/src/doc/crypto/BN_BLINDING_new.pod index da06e44461..3e783ff8ac 100644 --- a/src/lib/libssl/src/doc/crypto/BN_BLINDING_new.pod +++ b/src/lib/libssl/src/doc/crypto/BN_BLINDING_new.pod | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | =head1 NAME | 3 | =head1 NAME |
4 | 4 | ||
5 | BN_BLINDING_new, BN_BLINDING_free, BN_BLINDING_update, BN_BLINDING_convert, | 5 | BN_BLINDING_new, BN_BLINDING_free, BN_BLINDING_update, BN_BLINDING_convert, |
6 | BN_BLINDING_invert, BN_BLINDING_convert_ex, BN_BLINDING_invert_ex, | 6 | BN_BLINDING_invert, BN_BLINDING_convert_ex, BN_BLINDING_invert_ex, |
7 | BN_BLINDING_get_thread_id, BN_BLINDING_set_thread_id, BN_BLINDING_get_flags, | 7 | BN_BLINDING_get_thread_id, BN_BLINDING_set_thread_id, BN_BLINDING_get_flags, |
8 | BN_BLINDING_set_flags, BN_BLINDING_create_param - blinding related BIGNUM | 8 | BN_BLINDING_set_flags, BN_BLINDING_create_param - blinding related BIGNUM |
9 | functions. | 9 | functions. |
@@ -92,7 +92,7 @@ within a B<BN_BLINDING> object. | |||
92 | BN_BLINDING_get_flags() returns the currently set B<BN_BLINDING> flags | 92 | BN_BLINDING_get_flags() returns the currently set B<BN_BLINDING> flags |
93 | (a B<unsigned long> value). | 93 | (a B<unsigned long> value). |
94 | 94 | ||
95 | BN_BLINDING_create_param() returns the newly created B<BN_BLINDING> | 95 | BN_BLINDING_create_param() returns the newly created B<BN_BLINDING> |
96 | parameters or NULL on error. | 96 | parameters or NULL on error. |
97 | 97 | ||
98 | =head1 SEE ALSO | 98 | =head1 SEE ALSO |
diff --git a/src/lib/libssl/src/doc/crypto/BN_generate_prime.pod b/src/lib/libssl/src/doc/crypto/BN_generate_prime.pod index 7dccacbc1e..6f28a63517 100644 --- a/src/lib/libssl/src/doc/crypto/BN_generate_prime.pod +++ b/src/lib/libssl/src/doc/crypto/BN_generate_prime.pod | |||
@@ -11,7 +11,7 @@ BN_generate_prime, BN_is_prime, BN_is_prime_fasttest - generate primes and test | |||
11 | BIGNUM *BN_generate_prime(BIGNUM *ret, int num, int safe, BIGNUM *add, | 11 | BIGNUM *BN_generate_prime(BIGNUM *ret, int num, int safe, BIGNUM *add, |
12 | BIGNUM *rem, void (*callback)(int, int, void *), void *cb_arg); | 12 | BIGNUM *rem, void (*callback)(int, int, void *), void *cb_arg); |
13 | 13 | ||
14 | int BN_is_prime(const BIGNUM *a, int checks, void (*callback)(int, int, | 14 | int BN_is_prime(const BIGNUM *a, int checks, void (*callback)(int, int, |
15 | void *), BN_CTX *ctx, void *cb_arg); | 15 | void *), BN_CTX *ctx, void *cb_arg); |
16 | 16 | ||
17 | int BN_is_prime_fasttest(const BIGNUM *a, int checks, | 17 | int BN_is_prime_fasttest(const BIGNUM *a, int checks, |
diff --git a/src/lib/libssl/src/doc/crypto/CMS_add0_cert.pod b/src/lib/libssl/src/doc/crypto/CMS_add0_cert.pod index 9c13f488f6..78095948b9 100644 --- a/src/lib/libssl/src/doc/crypto/CMS_add0_cert.pod +++ b/src/lib/libssl/src/doc/crypto/CMS_add0_cert.pod | |||
@@ -20,7 +20,7 @@ | |||
20 | =head1 DESCRIPTION | 20 | =head1 DESCRIPTION |
21 | 21 | ||
22 | CMS_add0_cert() and CMS_add1_cert() add certificate B<cert> to B<cms>. | 22 | CMS_add0_cert() and CMS_add1_cert() add certificate B<cert> to B<cms>. |
23 | must be of type signed data or enveloped data. | 23 | must be of type signed data or enveloped data. |
24 | 24 | ||
25 | CMS_get1_certs() returns all certificates in B<cms>. | 25 | CMS_get1_certs() returns all certificates in B<cms>. |
26 | 26 | ||
@@ -46,7 +46,7 @@ than once. | |||
46 | =head1 RETURN VALUES | 46 | =head1 RETURN VALUES |
47 | 47 | ||
48 | CMS_add0_cert(), CMS_add1_cert() and CMS_add0_crl() and CMS_add1_crl() return | 48 | CMS_add0_cert(), CMS_add1_cert() and CMS_add0_crl() and CMS_add1_crl() return |
49 | 1 for success and 0 for failure. | 49 | 1 for success and 0 for failure. |
50 | 50 | ||
51 | CMS_get1_certs() and CMS_get1_crls() return the STACK of certificates or CRLs | 51 | CMS_get1_certs() and CMS_get1_crls() return the STACK of certificates or CRLs |
52 | or NULL if there are none or an error occurs. The only error which will occur | 52 | or NULL if there are none or an error occurs. The only error which will occur |
diff --git a/src/lib/libssl/src/doc/crypto/CMS_encrypt.pod b/src/lib/libssl/src/doc/crypto/CMS_encrypt.pod index 1ee5b275ec..01100a6df6 100644 --- a/src/lib/libssl/src/doc/crypto/CMS_encrypt.pod +++ b/src/lib/libssl/src/doc/crypto/CMS_encrypt.pod | |||
@@ -26,7 +26,7 @@ EVP_des_ede3_cbc() (triple DES) is the algorithm of choice for S/MIME use | |||
26 | because most clients will support it. | 26 | because most clients will support it. |
27 | 27 | ||
28 | The algorithm passed in the B<cipher> parameter must support ASN1 encoding of | 28 | The algorithm passed in the B<cipher> parameter must support ASN1 encoding of |
29 | its parameters. | 29 | its parameters. |
30 | 30 | ||
31 | Many browsers implement a "sign and encrypt" option which is simply an S/MIME | 31 | Many browsers implement a "sign and encrypt" option which is simply an S/MIME |
32 | envelopedData containing an S/MIME signed message. This can be readily produced | 32 | envelopedData containing an S/MIME signed message. This can be readily produced |
diff --git a/src/lib/libssl/src/doc/crypto/CMS_final.pod b/src/lib/libssl/src/doc/crypto/CMS_final.pod index 36cf96b8a0..beacc531ee 100644 --- a/src/lib/libssl/src/doc/crypto/CMS_final.pod +++ b/src/lib/libssl/src/doc/crypto/CMS_final.pod | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | CMS_final() finalises the structure B<cms>. It's purpose is to perform any | 15 | CMS_final() finalises the structure B<cms>. It's purpose is to perform any |
16 | operations necessary on B<cms> (digest computation for example) and set the | 16 | operations necessary on B<cms> (digest computation for example) and set the |
17 | appropriate fields. The parameter B<data> contains the content to be | 17 | appropriate fields. The parameter B<data> contains the content to be |
18 | processed. The B<dcont> parameter contains a BIO to write content to after | 18 | processed. The B<dcont> parameter contains a BIO to write content to after |
19 | processing: this is only used with detached data and will usually be set to | 19 | processing: this is only used with detached data and will usually be set to |
20 | NULL. | 20 | NULL. |
diff --git a/src/lib/libssl/src/doc/crypto/CMS_get0_RecipientInfos.pod b/src/lib/libssl/src/doc/crypto/CMS_get0_RecipientInfos.pod index e0355423e6..ba16e97b55 100644 --- a/src/lib/libssl/src/doc/crypto/CMS_get0_RecipientInfos.pod +++ b/src/lib/libssl/src/doc/crypto/CMS_get0_RecipientInfos.pod | |||
@@ -33,7 +33,7 @@ CMS_RECIPINFO_KEK, CMS_RECIPINFO_PASS, or CMS_RECIPINFO_OTHER. | |||
33 | CMS_RecipientInfo_ktri_get0_signer_id() retrieves the certificate recipient | 33 | CMS_RecipientInfo_ktri_get0_signer_id() retrieves the certificate recipient |
34 | identifier associated with a specific CMS_RecipientInfo structure B<ri>, which | 34 | identifier associated with a specific CMS_RecipientInfo structure B<ri>, which |
35 | must be of type CMS_RECIPINFO_TRANS. Either the keyidentifier will be set in | 35 | must be of type CMS_RECIPINFO_TRANS. Either the keyidentifier will be set in |
36 | B<keyid> or B<both> issuer name and serial number in B<issuer> and B<sno>. | 36 | B<keyid> or B<both> issuer name and serial number in B<issuer> and B<sno>. |
37 | 37 | ||
38 | CMS_RecipientInfo_ktri_cert_cmp() compares the certificate B<cert> against the | 38 | CMS_RecipientInfo_ktri_cert_cmp() compares the certificate B<cert> against the |
39 | CMS_RecipientInfo structure B<ri>, which must be of type CMS_RECIPINFO_TRANS. | 39 | CMS_RecipientInfo structure B<ri>, which must be of type CMS_RECIPINFO_TRANS. |
diff --git a/src/lib/libssl/src/doc/crypto/CMS_get1_ReceiptRequest.pod b/src/lib/libssl/src/doc/crypto/CMS_get1_ReceiptRequest.pod index f546376a1e..50c2b9b9ab 100644 --- a/src/lib/libssl/src/doc/crypto/CMS_get1_ReceiptRequest.pod +++ b/src/lib/libssl/src/doc/crypto/CMS_get1_ReceiptRequest.pod | |||
@@ -45,7 +45,7 @@ CMS_verify(). | |||
45 | 45 | ||
46 | =head1 RETURN VALUES | 46 | =head1 RETURN VALUES |
47 | 47 | ||
48 | CMS_ReceiptRequest_create0() returns a signed receipt request structure or | 48 | CMS_ReceiptRequest_create0() returns a signed receipt request structure or |
49 | NULL if an error occurred. | 49 | NULL if an error occurred. |
50 | 50 | ||
51 | CMS_add1_ReceiptRequest() returns 1 for success or 0 is an error occurred. | 51 | CMS_add1_ReceiptRequest() returns 1 for success or 0 is an error occurred. |
diff --git a/src/lib/libssl/src/doc/crypto/CMS_sign.pod b/src/lib/libssl/src/doc/crypto/CMS_sign.pod index 2cc72de327..6b58ba3bdd 100644 --- a/src/lib/libssl/src/doc/crypto/CMS_sign.pod +++ b/src/lib/libssl/src/doc/crypto/CMS_sign.pod | |||
@@ -96,7 +96,7 @@ B<certs>, B<signcert> and B<pkey> parameters can all be B<NULL> and the | |||
96 | B<CMS_PARTIAL> flag set. Then one or more signers can be added using the | 96 | B<CMS_PARTIAL> flag set. Then one or more signers can be added using the |
97 | function CMS_sign_add1_signer(), non default digests can be used and custom | 97 | function CMS_sign_add1_signer(), non default digests can be used and custom |
98 | attributes added. B<CMS_final()> must then be called to finalize the | 98 | attributes added. B<CMS_final()> must then be called to finalize the |
99 | structure if streaming is not enabled. | 99 | structure if streaming is not enabled. |
100 | 100 | ||
101 | =head1 BUGS | 101 | =head1 BUGS |
102 | 102 | ||
diff --git a/src/lib/libssl/src/doc/crypto/CMS_sign_add1_signer.pod b/src/lib/libssl/src/doc/crypto/CMS_sign_add1_signer.pod index bda3ca2adb..215e994b54 100644 --- a/src/lib/libssl/src/doc/crypto/CMS_sign_add1_signer.pod +++ b/src/lib/libssl/src/doc/crypto/CMS_sign_add1_signer.pod | |||
@@ -52,7 +52,7 @@ structure. An error occurs if a matching digest value cannot be found to copy. | |||
52 | The returned CMS_ContentInfo structure will be valid and finalized when this | 52 | The returned CMS_ContentInfo structure will be valid and finalized when this |
53 | flag is set. | 53 | flag is set. |
54 | 54 | ||
55 | If B<CMS_PARTIAL> is set in addition to B<CMS_REUSE_DIGEST> then the | 55 | If B<CMS_PARTIAL> is set in addition to B<CMS_REUSE_DIGEST> then the |
56 | CMS_SignerInfo structure will not be finalized so additional attributes | 56 | CMS_SignerInfo structure will not be finalized so additional attributes |
57 | can be added. In this case an explicit call to CMS_SignerInfo_sign() is | 57 | can be added. In this case an explicit call to CMS_SignerInfo_sign() is |
58 | needed to finalize it. | 58 | needed to finalize it. |
@@ -81,7 +81,7 @@ If any of these algorithms is not available then it will not be included: for ex | |||
81 | not loaded. | 81 | not loaded. |
82 | 82 | ||
83 | CMS_sign_add1_signer() returns an internal pointer to the CMS_SignerInfo | 83 | CMS_sign_add1_signer() returns an internal pointer to the CMS_SignerInfo |
84 | structure just added, this can be used to set additional attributes | 84 | structure just added, this can be used to set additional attributes |
85 | before it is finalized. | 85 | before it is finalized. |
86 | 86 | ||
87 | =head1 RETURN VALUES | 87 | =head1 RETURN VALUES |
diff --git a/src/lib/libssl/src/doc/crypto/CMS_verify.pod b/src/lib/libssl/src/doc/crypto/CMS_verify.pod index 8f26fdab09..4a6b3bfc97 100644 --- a/src/lib/libssl/src/doc/crypto/CMS_verify.pod +++ b/src/lib/libssl/src/doc/crypto/CMS_verify.pod | |||
@@ -67,7 +67,7 @@ returned. | |||
67 | If B<CMS_NO_SIGNER_CERT_VERIFY> is set the signing certificates are not | 67 | If B<CMS_NO_SIGNER_CERT_VERIFY> is set the signing certificates are not |
68 | verified. | 68 | verified. |
69 | 69 | ||
70 | If B<CMS_NO_ATTR_VERIFY> is set the signed attributes signature is not | 70 | If B<CMS_NO_ATTR_VERIFY> is set the signed attributes signature is not |
71 | verified. | 71 | verified. |
72 | 72 | ||
73 | If B<CMS_NO_CONTENT_VERIFY> is set then the content digest is not checked. | 73 | If B<CMS_NO_CONTENT_VERIFY> is set then the content digest is not checked. |
@@ -81,13 +81,13 @@ certificates supplied in B<certs> then the verify will fail because the | |||
81 | signer cannot be found. | 81 | signer cannot be found. |
82 | 82 | ||
83 | In some cases the standard techniques for looking up and validating | 83 | In some cases the standard techniques for looking up and validating |
84 | certificates are not appropriate: for example an application may wish to | 84 | certificates are not appropriate: for example an application may wish to |
85 | lookup certificates in a database or perform customised verification. This | 85 | lookup certificates in a database or perform customised verification. This |
86 | can be achieved by setting and verifying the signers certificates manually | 86 | can be achieved by setting and verifying the signers certificates manually |
87 | using the signed data utility functions. | 87 | using the signed data utility functions. |
88 | 88 | ||
89 | Care should be taken when modifying the default verify behaviour, for example | 89 | Care should be taken when modifying the default verify behaviour, for example |
90 | setting B<CMS_NO_CONTENT_VERIFY> will totally disable all content verification | 90 | setting B<CMS_NO_CONTENT_VERIFY> will totally disable all content verification |
91 | and any modified content will be considered valid. This combination is however | 91 | and any modified content will be considered valid. This combination is however |
92 | useful if one merely wishes to write the content to B<out> and its validity | 92 | useful if one merely wishes to write the content to B<out> and its validity |
93 | is not considered important. | 93 | is not considered important. |
diff --git a/src/lib/libssl/src/doc/crypto/CMS_verify_receipt.pod b/src/lib/libssl/src/doc/crypto/CMS_verify_receipt.pod index 9283e0e04b..573e725ec1 100644 --- a/src/lib/libssl/src/doc/crypto/CMS_verify_receipt.pod +++ b/src/lib/libssl/src/doc/crypto/CMS_verify_receipt.pod | |||
@@ -16,7 +16,7 @@ CMS_verify_receipt() verifies a CMS signed receipt. B<rcms> is the signed | |||
16 | receipt to verify. B<ocms> is the original SignedData structure containing the | 16 | receipt to verify. B<ocms> is the original SignedData structure containing the |
17 | receipt request. B<certs> is a set of certificates in which to search for the | 17 | receipt request. B<certs> is a set of certificates in which to search for the |
18 | signing certificate. B<store> is a trusted certificate store (used for chain | 18 | signing certificate. B<store> is a trusted certificate store (used for chain |
19 | verification). | 19 | verification). |
20 | 20 | ||
21 | B<flags> is an optional set of flags, which can be used to modify the verify | 21 | B<flags> is an optional set of flags, which can be used to modify the verify |
22 | operation. | 22 | operation. |
diff --git a/src/lib/libssl/src/doc/crypto/CONF_modules_load_file.pod b/src/lib/libssl/src/doc/crypto/CONF_modules_load_file.pod index 9965d69bf2..64e8127280 100644 --- a/src/lib/libssl/src/doc/crypto/CONF_modules_load_file.pod +++ b/src/lib/libssl/src/doc/crypto/CONF_modules_load_file.pod | |||
@@ -22,7 +22,7 @@ NULL the standard OpenSSL application name B<openssl_conf> is used. | |||
22 | The behaviour can be cutomized using B<flags>. | 22 | The behaviour can be cutomized using B<flags>. |
23 | 23 | ||
24 | CONF_modules_load() is idential to CONF_modules_load_file() except it | 24 | CONF_modules_load() is idential to CONF_modules_load_file() except it |
25 | read configuration information from B<cnf>. | 25 | read configuration information from B<cnf>. |
26 | 26 | ||
27 | =head1 NOTES | 27 | =head1 NOTES |
28 | 28 | ||
diff --git a/src/lib/libssl/src/doc/crypto/CRYPTO_set_locking_callback.pod b/src/lib/libssl/src/doc/crypto/CRYPTO_set_locking_callback.pod index dc0e9391dc..8f4cf4cb2d 100644 --- a/src/lib/libssl/src/doc/crypto/CRYPTO_set_locking_callback.pod +++ b/src/lib/libssl/src/doc/crypto/CRYPTO_set_locking_callback.pod | |||
@@ -68,7 +68,7 @@ that at least two callback functions are set, locking_function and | |||
68 | threadid_func. | 68 | threadid_func. |
69 | 69 | ||
70 | locking_function(int mode, int n, const char *file, int line) is | 70 | locking_function(int mode, int n, const char *file, int line) is |
71 | needed to perform locking on shared data structures. | 71 | needed to perform locking on shared data structures. |
72 | (Note that OpenSSL uses a number of global data structures that | 72 | (Note that OpenSSL uses a number of global data structures that |
73 | will be implicitly shared whenever multiple threads use OpenSSL.) | 73 | will be implicitly shared whenever multiple threads use OpenSSL.) |
74 | Multi-threaded applications will crash at random if it is not set. | 74 | Multi-threaded applications will crash at random if it is not set. |
diff --git a/src/lib/libssl/src/doc/crypto/DES_set_key.pod b/src/lib/libssl/src/doc/crypto/DES_set_key.pod index 6f0cf1cc5e..b49545877a 100644 --- a/src/lib/libssl/src/doc/crypto/DES_set_key.pod +++ b/src/lib/libssl/src/doc/crypto/DES_set_key.pod | |||
@@ -28,16 +28,16 @@ DES_fcrypt, DES_crypt, DES_enc_read, DES_enc_write - DES encryption | |||
28 | void DES_set_odd_parity(DES_cblock *key); | 28 | void DES_set_odd_parity(DES_cblock *key); |
29 | int DES_is_weak_key(const_DES_cblock *key); | 29 | int DES_is_weak_key(const_DES_cblock *key); |
30 | 30 | ||
31 | void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output, | 31 | void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output, |
32 | DES_key_schedule *ks, int enc); | 32 | DES_key_schedule *ks, int enc); |
33 | void DES_ecb2_encrypt(const_DES_cblock *input, DES_cblock *output, | 33 | void DES_ecb2_encrypt(const_DES_cblock *input, DES_cblock *output, |
34 | DES_key_schedule *ks1, DES_key_schedule *ks2, int enc); | 34 | DES_key_schedule *ks1, DES_key_schedule *ks2, int enc); |
35 | void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output, | 35 | void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output, |
36 | DES_key_schedule *ks1, DES_key_schedule *ks2, | 36 | DES_key_schedule *ks1, DES_key_schedule *ks2, |
37 | DES_key_schedule *ks3, int enc); | 37 | DES_key_schedule *ks3, int enc); |
38 | 38 | ||
39 | void DES_ncbc_encrypt(const unsigned char *input, unsigned char *output, | 39 | void DES_ncbc_encrypt(const unsigned char *input, unsigned char *output, |
40 | long length, DES_key_schedule *schedule, DES_cblock *ivec, | 40 | long length, DES_key_schedule *schedule, DES_cblock *ivec, |
41 | int enc); | 41 | int enc); |
42 | void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, | 42 | void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, |
43 | int numbits, long length, DES_key_schedule *schedule, | 43 | int numbits, long length, DES_key_schedule *schedule, |
@@ -45,8 +45,8 @@ DES_fcrypt, DES_crypt, DES_enc_read, DES_enc_write - DES encryption | |||
45 | void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, | 45 | void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, |
46 | int numbits, long length, DES_key_schedule *schedule, | 46 | int numbits, long length, DES_key_schedule *schedule, |
47 | DES_cblock *ivec); | 47 | DES_cblock *ivec); |
48 | void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output, | 48 | void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output, |
49 | long length, DES_key_schedule *schedule, DES_cblock *ivec, | 49 | long length, DES_key_schedule *schedule, DES_cblock *ivec, |
50 | int enc); | 50 | int enc); |
51 | void DES_cfb64_encrypt(const unsigned char *in, unsigned char *out, | 51 | void DES_cfb64_encrypt(const unsigned char *in, unsigned char *out, |
52 | long length, DES_key_schedule *schedule, DES_cblock *ivec, | 52 | long length, DES_key_schedule *schedule, DES_cblock *ivec, |
@@ -55,8 +55,8 @@ DES_fcrypt, DES_crypt, DES_enc_read, DES_enc_write - DES encryption | |||
55 | long length, DES_key_schedule *schedule, DES_cblock *ivec, | 55 | long length, DES_key_schedule *schedule, DES_cblock *ivec, |
56 | int *num); | 56 | int *num); |
57 | 57 | ||
58 | void DES_xcbc_encrypt(const unsigned char *input, unsigned char *output, | 58 | void DES_xcbc_encrypt(const unsigned char *input, unsigned char *output, |
59 | long length, DES_key_schedule *schedule, DES_cblock *ivec, | 59 | long length, DES_key_schedule *schedule, DES_cblock *ivec, |
60 | const_DES_cblock *inw, const_DES_cblock *outw, int enc); | 60 | const_DES_cblock *inw, const_DES_cblock *outw, int enc); |
61 | 61 | ||
62 | void DES_ede2_cbc_encrypt(const unsigned char *input, | 62 | void DES_ede2_cbc_encrypt(const unsigned char *input, |
@@ -73,22 +73,22 @@ DES_fcrypt, DES_crypt, DES_enc_read, DES_enc_write - DES encryption | |||
73 | unsigned char *output, long length, DES_key_schedule *ks1, | 73 | unsigned char *output, long length, DES_key_schedule *ks1, |
74 | DES_key_schedule *ks2, DES_key_schedule *ks3, DES_cblock *ivec, | 74 | DES_key_schedule *ks2, DES_key_schedule *ks3, DES_cblock *ivec, |
75 | int enc); | 75 | int enc); |
76 | void DES_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out, | 76 | void DES_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out, |
77 | long length, DES_key_schedule *ks1, DES_key_schedule *ks2, | 77 | long length, DES_key_schedule *ks1, DES_key_schedule *ks2, |
78 | DES_key_schedule *ks3, DES_cblock *ivec1, DES_cblock *ivec2, | 78 | DES_key_schedule *ks3, DES_cblock *ivec1, DES_cblock *ivec2, |
79 | int enc); | 79 | int enc); |
80 | void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out, | 80 | void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out, |
81 | long length, DES_key_schedule *ks1, DES_key_schedule *ks2, | 81 | long length, DES_key_schedule *ks1, DES_key_schedule *ks2, |
82 | DES_key_schedule *ks3, DES_cblock *ivec, int *num, int enc); | 82 | DES_key_schedule *ks3, DES_cblock *ivec, int *num, int enc); |
83 | void DES_ede3_ofb64_encrypt(const unsigned char *in, unsigned char *out, | 83 | void DES_ede3_ofb64_encrypt(const unsigned char *in, unsigned char *out, |
84 | long length, DES_key_schedule *ks1, | 84 | long length, DES_key_schedule *ks1, |
85 | DES_key_schedule *ks2, DES_key_schedule *ks3, | 85 | DES_key_schedule *ks2, DES_key_schedule *ks3, |
86 | DES_cblock *ivec, int *num); | 86 | DES_cblock *ivec, int *num); |
87 | 87 | ||
88 | DES_LONG DES_cbc_cksum(const unsigned char *input, DES_cblock *output, | 88 | DES_LONG DES_cbc_cksum(const unsigned char *input, DES_cblock *output, |
89 | long length, DES_key_schedule *schedule, | 89 | long length, DES_key_schedule *schedule, |
90 | const_DES_cblock *ivec); | 90 | const_DES_cblock *ivec); |
91 | DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[], | 91 | DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[], |
92 | long length, int out_count, DES_cblock *seed); | 92 | long length, int out_count, DES_cblock *seed); |
93 | void DES_string_to_key(const char *str, DES_cblock *key); | 93 | void DES_string_to_key(const char *str, DES_cblock *key); |
94 | void DES_string_to_2keys(const char *str, DES_cblock *key1, | 94 | void DES_string_to_2keys(const char *str, DES_cblock *key1, |
diff --git a/src/lib/libssl/src/doc/crypto/DH_generate_parameters.pod b/src/lib/libssl/src/doc/crypto/DH_generate_parameters.pod index 9081e9ea7c..862aa0c39a 100644 --- a/src/lib/libssl/src/doc/crypto/DH_generate_parameters.pod +++ b/src/lib/libssl/src/doc/crypto/DH_generate_parameters.pod | |||
@@ -21,7 +21,7 @@ allocated B<DH> structure. The pseudo-random number generator must be | |||
21 | seeded prior to calling DH_generate_parameters(). | 21 | seeded prior to calling DH_generate_parameters(). |
22 | 22 | ||
23 | B<prime_len> is the length in bits of the safe prime to be generated. | 23 | B<prime_len> is the length in bits of the safe prime to be generated. |
24 | B<generator> is a small number E<gt> 1, typically 2 or 5. | 24 | B<generator> is a small number E<gt> 1, typically 2 or 5. |
25 | 25 | ||
26 | A callback function may be used to provide feedback about the progress | 26 | A callback function may be used to provide feedback about the progress |
27 | of the key generation. If B<callback> is not B<NULL>, it will be | 27 | of the key generation. If B<callback> is not B<NULL>, it will be |
diff --git a/src/lib/libssl/src/doc/crypto/DSA_set_method.pod b/src/lib/libssl/src/doc/crypto/DSA_set_method.pod index 9c1434bd8d..5ad7362f58 100644 --- a/src/lib/libssl/src/doc/crypto/DSA_set_method.pod +++ b/src/lib/libssl/src/doc/crypto/DSA_set_method.pod | |||
@@ -37,7 +37,7 @@ been set as a default for DSA, so this function is no longer recommended. | |||
37 | 37 | ||
38 | DSA_get_default_method() returns a pointer to the current default | 38 | DSA_get_default_method() returns a pointer to the current default |
39 | DSA_METHOD. However, the meaningfulness of this result is dependent on | 39 | DSA_METHOD. However, the meaningfulness of this result is dependent on |
40 | whether the ENGINE API is being used, so this function is no longer | 40 | whether the ENGINE API is being used, so this function is no longer |
41 | recommended. | 41 | recommended. |
42 | 42 | ||
43 | DSA_set_method() selects B<meth> to perform all operations using the key | 43 | DSA_set_method() selects B<meth> to perform all operations using the key |
diff --git a/src/lib/libssl/src/doc/crypto/ERR_get_error.pod b/src/lib/libssl/src/doc/crypto/ERR_get_error.pod index 828ecf529b..1a765f7aff 100644 --- a/src/lib/libssl/src/doc/crypto/ERR_get_error.pod +++ b/src/lib/libssl/src/doc/crypto/ERR_get_error.pod | |||
@@ -52,7 +52,7 @@ ERR_get_error_line_data(), ERR_peek_error_line_data() and | |||
52 | ERR_get_last_error_line_data() store additional data and flags | 52 | ERR_get_last_error_line_data() store additional data and flags |
53 | associated with the error code in *B<data> | 53 | associated with the error code in *B<data> |
54 | and *B<flags>, unless these are B<NULL>. *B<data> contains a string | 54 | and *B<flags>, unless these are B<NULL>. *B<data> contains a string |
55 | if *B<flags>&B<ERR_TXT_STRING> is true. | 55 | if *B<flags>&B<ERR_TXT_STRING> is true. |
56 | 56 | ||
57 | An application B<MUST NOT> free the *B<data> pointer (or any other pointers | 57 | An application B<MUST NOT> free the *B<data> pointer (or any other pointers |
58 | returned by these functions) with OPENSSL_free() as freeing is handled | 58 | returned by these functions) with OPENSSL_free() as freeing is handled |
diff --git a/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod b/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod index 367691cc7a..dcc5d73f69 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod | |||
@@ -26,18 +26,18 @@ EVP digest routines | |||
26 | int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx); | 26 | int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx); |
27 | void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx); | 27 | void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx); |
28 | 28 | ||
29 | int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out,const EVP_MD_CTX *in); | 29 | int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out,const EVP_MD_CTX *in); |
30 | 30 | ||
31 | int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type); | 31 | int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type); |
32 | int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, | 32 | int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, |
33 | unsigned int *s); | 33 | unsigned int *s); |
34 | 34 | ||
35 | int EVP_MD_CTX_copy(EVP_MD_CTX *out,EVP_MD_CTX *in); | 35 | int EVP_MD_CTX_copy(EVP_MD_CTX *out,EVP_MD_CTX *in); |
36 | 36 | ||
37 | #define EVP_MAX_MD_SIZE 64 /* SHA512 */ | 37 | #define EVP_MAX_MD_SIZE 64 /* SHA512 */ |
38 | 38 | ||
39 | int EVP_MD_type(const EVP_MD *md); | 39 | int EVP_MD_type(const EVP_MD *md); |
40 | int EVP_MD_pkey_type(const EVP_MD *md); | 40 | int EVP_MD_pkey_type(const EVP_MD *md); |
41 | int EVP_MD_size(const EVP_MD *md); | 41 | int EVP_MD_size(const EVP_MD *md); |
42 | int EVP_MD_block_size(const EVP_MD *md); | 42 | int EVP_MD_block_size(const EVP_MD *md); |
43 | 43 | ||
@@ -136,10 +136,10 @@ reasons. | |||
136 | EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_sha224(), EVP_sha256(), | 136 | EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_sha224(), EVP_sha256(), |
137 | EVP_sha384(), EVP_sha512(), EVP_mdc2() and EVP_ripemd160() return B<EVP_MD> | 137 | EVP_sha384(), EVP_sha512(), EVP_mdc2() and EVP_ripemd160() return B<EVP_MD> |
138 | structures for the MD2, MD5, SHA, SHA1, SHA224, SHA256, SHA384, SHA512, MDC2 | 138 | structures for the MD2, MD5, SHA, SHA1, SHA224, SHA256, SHA384, SHA512, MDC2 |
139 | and RIPEMD160 digest algorithms respectively. | 139 | and RIPEMD160 digest algorithms respectively. |
140 | 140 | ||
141 | EVP_dss() and EVP_dss1() return B<EVP_MD> structures for SHA and SHA1 digest | 141 | EVP_dss() and EVP_dss1() return B<EVP_MD> structures for SHA and SHA1 digest |
142 | algorithms but using DSS (DSA) for the signature algorithm. Note: there is | 142 | algorithms but using DSS (DSA) for the signature algorithm. Note: there is |
143 | no need to use these pseudo-digests in OpenSSL 1.0.0 and later, they are | 143 | no need to use these pseudo-digests in OpenSSL 1.0.0 and later, they are |
144 | however retained for compatibility. | 144 | however retained for compatibility. |
145 | 145 | ||
@@ -178,21 +178,21 @@ The B<EVP> interface to message digests should almost always be used in | |||
178 | preference to the low level interfaces. This is because the code then becomes | 178 | preference to the low level interfaces. This is because the code then becomes |
179 | transparent to the digest used and much more flexible. | 179 | transparent to the digest used and much more flexible. |
180 | 180 | ||
181 | New applications should use the SHA2 digest algorithms such as SHA256. | 181 | New applications should use the SHA2 digest algorithms such as SHA256. |
182 | The other digest algorithms are still in common use. | 182 | The other digest algorithms are still in common use. |
183 | 183 | ||
184 | For most applications the B<impl> parameter to EVP_DigestInit_ex() will be | 184 | For most applications the B<impl> parameter to EVP_DigestInit_ex() will be |
185 | set to NULL to use the default digest implementation. | 185 | set to NULL to use the default digest implementation. |
186 | 186 | ||
187 | The functions EVP_DigestInit(), EVP_DigestFinal() and EVP_MD_CTX_copy() are | 187 | The functions EVP_DigestInit(), EVP_DigestFinal() and EVP_MD_CTX_copy() are |
188 | obsolete but are retained to maintain compatibility with existing code. New | 188 | obsolete but are retained to maintain compatibility with existing code. New |
189 | applications should use EVP_DigestInit_ex(), EVP_DigestFinal_ex() and | 189 | applications should use EVP_DigestInit_ex(), EVP_DigestFinal_ex() and |
190 | EVP_MD_CTX_copy_ex() because they can efficiently reuse a digest context | 190 | EVP_MD_CTX_copy_ex() because they can efficiently reuse a digest context |
191 | instead of initializing and cleaning it up on each call and allow non default | 191 | instead of initializing and cleaning it up on each call and allow non default |
192 | implementations of digests to be specified. | 192 | implementations of digests to be specified. |
193 | 193 | ||
194 | In OpenSSL 0.9.7 and later if digest contexts are not cleaned up after use | 194 | In OpenSSL 0.9.7 and later if digest contexts are not cleaned up after use |
195 | memory leaks will occur. | 195 | memory leaks will occur. |
196 | 196 | ||
197 | Stack allocation of EVP_MD_CTX structures is common, for example: | 197 | Stack allocation of EVP_MD_CTX structures is common, for example: |
198 | 198 | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_DigestSignInit.pod b/src/lib/libssl/src/doc/crypto/EVP_DigestSignInit.pod index 37d960e3b2..11e8f6f937 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_DigestSignInit.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_DigestSignInit.pod | |||
@@ -56,7 +56,7 @@ needed to be used to sign using SHA1 and DSA. This is no longer necessary and | |||
56 | the use of clone digest is now discouraged. | 56 | the use of clone digest is now discouraged. |
57 | 57 | ||
58 | For some key types and parameters the random number generator must be seeded | 58 | For some key types and parameters the random number generator must be seeded |
59 | or the operation will fail. | 59 | or the operation will fail. |
60 | 60 | ||
61 | The call to EVP_DigestSignFinal() internally finalizes a copy of the digest | 61 | The call to EVP_DigestSignFinal() internally finalizes a copy of the digest |
62 | context. This means that calls to EVP_DigestSignUpdate() and | 62 | context. This means that calls to EVP_DigestSignUpdate() and |
@@ -81,7 +81,7 @@ L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)> | |||
81 | 81 | ||
82 | =head1 HISTORY | 82 | =head1 HISTORY |
83 | 83 | ||
84 | EVP_DigestSignInit(), EVP_DigestSignUpdate() and EVP_DigestSignFinal() | 84 | EVP_DigestSignInit(), EVP_DigestSignUpdate() and EVP_DigestSignFinal() |
85 | were first added to OpenSSL 1.0.0. | 85 | were first added to OpenSSL 1.0.0. |
86 | 86 | ||
87 | =cut | 87 | =cut |
diff --git a/src/lib/libssl/src/doc/crypto/EVP_DigestVerifyInit.pod b/src/lib/libssl/src/doc/crypto/EVP_DigestVerifyInit.pod index f224488978..819e0d4b9f 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_DigestVerifyInit.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_DigestVerifyInit.pod | |||
@@ -56,7 +56,7 @@ needed to be used to sign using SHA1 and DSA. This is no longer necessary and | |||
56 | the use of clone digest is now discouraged. | 56 | the use of clone digest is now discouraged. |
57 | 57 | ||
58 | For some key types and parameters the random number generator must be seeded | 58 | For some key types and parameters the random number generator must be seeded |
59 | or the operation will fail. | 59 | or the operation will fail. |
60 | 60 | ||
61 | The call to EVP_DigestVerifyFinal() internally finalizes a copy of the digest | 61 | The call to EVP_DigestVerifyFinal() internally finalizes a copy of the digest |
62 | context. This means that calls to EVP_VerifyUpdate() and EVP_VerifyFinal() can | 62 | context. This means that calls to EVP_VerifyUpdate() and EVP_VerifyFinal() can |
@@ -76,7 +76,7 @@ L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)> | |||
76 | 76 | ||
77 | =head1 HISTORY | 77 | =head1 HISTORY |
78 | 78 | ||
79 | EVP_DigestVerifyInit(), EVP_DigestVerifyUpdate() and EVP_DigestVerifyFinal() | 79 | EVP_DigestVerifyInit(), EVP_DigestVerifyUpdate() and EVP_DigestVerifyFinal() |
80 | were first added to OpenSSL 1.0.0. | 80 | were first added to OpenSSL 1.0.0. |
81 | 81 | ||
82 | =cut | 82 | =cut |
diff --git a/src/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod b/src/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod index 1c4bf184a1..84875e0fe0 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod | |||
@@ -128,7 +128,7 @@ calls to EVP_EncryptUpdate() should be made. | |||
128 | 128 | ||
129 | If padding is disabled then EVP_EncryptFinal_ex() will not encrypt any more | 129 | If padding is disabled then EVP_EncryptFinal_ex() will not encrypt any more |
130 | data and it will return an error if any data remains in a partial block: | 130 | data and it will return an error if any data remains in a partial block: |
131 | that is if the total data length is not a multiple of the block size. | 131 | that is if the total data length is not a multiple of the block size. |
132 | 132 | ||
133 | EVP_DecryptInit_ex(), EVP_DecryptUpdate() and EVP_DecryptFinal_ex() are the | 133 | EVP_DecryptInit_ex(), EVP_DecryptUpdate() and EVP_DecryptFinal_ex() are the |
134 | corresponding decryption operations. EVP_DecryptFinal() will return an | 134 | corresponding decryption operations. EVP_DecryptFinal() will return an |
@@ -157,7 +157,7 @@ initialized and they always use the default cipher implementation. | |||
157 | 157 | ||
158 | EVP_EncryptFinal(), EVP_DecryptFinal() and EVP_CipherFinal() behave in a | 158 | EVP_EncryptFinal(), EVP_DecryptFinal() and EVP_CipherFinal() behave in a |
159 | similar way to EVP_EncryptFinal_ex(), EVP_DecryptFinal_ex() and | 159 | similar way to EVP_EncryptFinal_ex(), EVP_DecryptFinal_ex() and |
160 | EVP_CipherFinal_ex() except B<ctx> is automatically cleaned up | 160 | EVP_CipherFinal_ex() except B<ctx> is automatically cleaned up |
161 | after the call. | 161 | after the call. |
162 | 162 | ||
163 | EVP_get_cipherbyname(), EVP_get_cipherbynid() and EVP_get_cipherbyobj() | 163 | EVP_get_cipherbyname(), EVP_get_cipherbynid() and EVP_get_cipherbyobj() |
@@ -268,7 +268,7 @@ OBJECT IDENTIFIER or NID_undef if it has no defined OBJECT IDENTIFIER. | |||
268 | 268 | ||
269 | EVP_CIPHER_CTX_cipher() returns an B<EVP_CIPHER> structure. | 269 | EVP_CIPHER_CTX_cipher() returns an B<EVP_CIPHER> structure. |
270 | 270 | ||
271 | EVP_CIPHER_param_to_asn1() and EVP_CIPHER_asn1_to_param() return 1 for | 271 | EVP_CIPHER_param_to_asn1() and EVP_CIPHER_asn1_to_param() return 1 for |
272 | success or zero for failure. | 272 | success or zero for failure. |
273 | 273 | ||
274 | =head1 CIPHER LISTING | 274 | =head1 CIPHER LISTING |
@@ -283,7 +283,7 @@ Null cipher: does nothing. | |||
283 | 283 | ||
284 | =item EVP_des_cbc(void), EVP_des_ecb(void), EVP_des_cfb(void), EVP_des_ofb(void) | 284 | =item EVP_des_cbc(void), EVP_des_ecb(void), EVP_des_cfb(void), EVP_des_ofb(void) |
285 | 285 | ||
286 | DES in CBC, ECB, CFB and OFB modes respectively. | 286 | DES in CBC, ECB, CFB and OFB modes respectively. |
287 | 287 | ||
288 | =item EVP_des_ede_cbc(void), EVP_des_ede(), EVP_des_ede_ofb(void), EVP_des_ede_cfb(void) | 288 | =item EVP_des_ede_cbc(void), EVP_des_ede(), EVP_des_ede_ofb(void), EVP_des_ede_cfb(void) |
289 | 289 | ||
@@ -346,7 +346,7 @@ Where possible the B<EVP> interface to symmetric ciphers should be used in | |||
346 | preference to the low level interfaces. This is because the code then becomes | 346 | preference to the low level interfaces. This is because the code then becomes |
347 | transparent to the cipher used and much more flexible. | 347 | transparent to the cipher used and much more flexible. |
348 | 348 | ||
349 | PKCS padding works by adding B<n> padding bytes of value B<n> to make the total | 349 | PKCS padding works by adding B<n> padding bytes of value B<n> to make the total |
350 | length of the encrypted data a multiple of the block size. Padding is always | 350 | length of the encrypted data a multiple of the block size. Padding is always |
351 | added so if the data is already a multiple of the block size B<n> will equal | 351 | added so if the data is already a multiple of the block size B<n> will equal |
352 | the block size. For example if the block size is 8 and 11 bytes are to be | 352 | the block size. For example if the block size is 8 and 11 bytes are to be |
@@ -376,7 +376,7 @@ a limitation of the current RC5 code rather than the EVP interface. | |||
376 | 376 | ||
377 | EVP_MAX_KEY_LENGTH and EVP_MAX_IV_LENGTH only refer to the internal ciphers with | 377 | EVP_MAX_KEY_LENGTH and EVP_MAX_IV_LENGTH only refer to the internal ciphers with |
378 | default key lengths. If custom ciphers exceed these values the results are | 378 | default key lengths. If custom ciphers exceed these values the results are |
379 | unpredictable. This is because it has become standard practice to define a | 379 | unpredictable. This is because it has become standard practice to define a |
380 | generic key as a fixed unsigned char array containing EVP_MAX_KEY_LENGTH bytes. | 380 | generic key as a fixed unsigned char array containing EVP_MAX_KEY_LENGTH bytes. |
381 | 381 | ||
382 | The ASN1 code is incomplete (and sometimes inaccurate) it has only been tested | 382 | The ASN1 code is incomplete (and sometimes inaccurate) it has only been tested |
@@ -449,7 +449,7 @@ Encrypt a string using blowfish: | |||
449 | 449 | ||
450 | The ciphertext from the above example can be decrypted using the B<openssl> | 450 | The ciphertext from the above example can be decrypted using the B<openssl> |
451 | utility with the command line: | 451 | utility with the command line: |
452 | 452 | ||
453 | S<openssl bf -in cipher.bin -K 000102030405060708090A0B0C0D0E0F -iv 0102030405060708 -d> | 453 | S<openssl bf -in cipher.bin -K 000102030405060708090A0B0C0D0E0F -iv 0102030405060708 -d> |
454 | 454 | ||
455 | General encryption, decryption function example using FILE I/O and RC2 with an | 455 | General encryption, decryption function example using FILE I/O and RC2 with an |
@@ -472,7 +472,7 @@ General encryption, decryption function example using FILE I/O and RC2 with an | |||
472 | /* We finished modifying parameters so now we can set key and IV */ | 472 | /* We finished modifying parameters so now we can set key and IV */ |
473 | EVP_CipherInit_ex(&ctx, NULL, NULL, key, iv, do_encrypt); | 473 | EVP_CipherInit_ex(&ctx, NULL, NULL, key, iv, do_encrypt); |
474 | 474 | ||
475 | for(;;) | 475 | for(;;) |
476 | { | 476 | { |
477 | inlen = fread(inbuf, 1, 1024, in); | 477 | inlen = fread(inbuf, 1, 1024, in); |
478 | if(inlen <= 0) break; | 478 | if(inlen <= 0) break; |
diff --git a/src/lib/libssl/src/doc/crypto/EVP_OpenInit.pod b/src/lib/libssl/src/doc/crypto/EVP_OpenInit.pod index 2e710da945..1aa2a9cd6e 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_OpenInit.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_OpenInit.pod | |||
@@ -27,7 +27,7 @@ B<ekl> bytes passed in the B<ek> parameter using the private key B<priv>. | |||
27 | The IV is supplied in the B<iv> parameter. | 27 | The IV is supplied in the B<iv> parameter. |
28 | 28 | ||
29 | EVP_OpenUpdate() and EVP_OpenFinal() have exactly the same properties | 29 | EVP_OpenUpdate() and EVP_OpenFinal() have exactly the same properties |
30 | as the EVP_DecryptUpdate() and EVP_DecryptFinal() routines, as | 30 | as the EVP_DecryptUpdate() and EVP_DecryptFinal() routines, as |
31 | documented on the L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> manual | 31 | documented on the L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> manual |
32 | page. | 32 | page. |
33 | 33 | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_PKEY_CTX_ctrl.pod b/src/lib/libssl/src/doc/crypto/EVP_PKEY_CTX_ctrl.pod index 13b91f1e6e..e8d1ddda75 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_CTX_ctrl.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_CTX_ctrl.pod | |||
@@ -62,7 +62,7 @@ The macro EVP_PKEY_CTX_set_rsa_padding() sets the RSA padding mode for B<ctx>. | |||
62 | The B<pad> parameter can take the value RSA_PKCS1_PADDING for PKCS#1 padding, | 62 | The B<pad> parameter can take the value RSA_PKCS1_PADDING for PKCS#1 padding, |
63 | RSA_SSLV23_PADDING for SSLv23 padding, RSA_NO_PADDING for no padding, | 63 | RSA_SSLV23_PADDING for SSLv23 padding, RSA_NO_PADDING for no padding, |
64 | RSA_PKCS1_OAEP_PADDING for OAEP padding (encrypt and decrypt only), | 64 | RSA_PKCS1_OAEP_PADDING for OAEP padding (encrypt and decrypt only), |
65 | RSA_X931_PADDING for X9.31 padding (signature operations only) and | 65 | RSA_X931_PADDING for X9.31 padding (signature operations only) and |
66 | RSA_PKCS1_PSS_PADDING (sign and verify only). | 66 | RSA_PKCS1_PSS_PADDING (sign and verify only). |
67 | 67 | ||
68 | Two RSA padding modes behave differently if EVP_PKEY_CTX_set_signature_md() | 68 | Two RSA padding modes behave differently if EVP_PKEY_CTX_set_signature_md() |
@@ -87,7 +87,7 @@ RSA key genration to B<bits>. If not specified 1024 bits is used. | |||
87 | 87 | ||
88 | The EVP_PKEY_CTX_set_rsa_keygen_pubexp() macro sets the public exponent value | 88 | The EVP_PKEY_CTX_set_rsa_keygen_pubexp() macro sets the public exponent value |
89 | for RSA key generation to B<pubexp> currently it should be an odd integer. The | 89 | for RSA key generation to B<pubexp> currently it should be an odd integer. The |
90 | B<pubexp> pointer is used internally by this function so it should not be | 90 | B<pubexp> pointer is used internally by this function so it should not be |
91 | modified or free after the call. If this macro is not called then 65537 is used. | 91 | modified or free after the call. If this macro is not called then 65537 is used. |
92 | 92 | ||
93 | The macro EVP_PKEY_CTX_set_dsa_paramgen_bits() sets the number of bits used | 93 | The macro EVP_PKEY_CTX_set_dsa_paramgen_bits() sets the number of bits used |
@@ -118,8 +118,8 @@ L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, | |||
118 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, | 118 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, |
119 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, | 119 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, |
120 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, | 120 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, |
121 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> | 121 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> |
122 | L<EVP_PKEY_keygen(3)|EVP_PKEY_keygen(3)> | 122 | L<EVP_PKEY_keygen(3)|EVP_PKEY_keygen(3)> |
123 | 123 | ||
124 | =head1 HISTORY | 124 | =head1 HISTORY |
125 | 125 | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_PKEY_cmp.pod b/src/lib/libssl/src/doc/crypto/EVP_PKEY_cmp.pod index 4f8185e36c..4145245299 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_cmp.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_cmp.pod | |||
@@ -56,6 +56,6 @@ keys match, 0 if they don't match, -1 if the key types are different and | |||
56 | =head1 SEE ALSO | 56 | =head1 SEE ALSO |
57 | 57 | ||
58 | L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>, | 58 | L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>, |
59 | L<EVP_PKEY_keygen(3)|EVP_PKEY_keygen(3)> | 59 | L<EVP_PKEY_keygen(3)|EVP_PKEY_keygen(3)> |
60 | 60 | ||
61 | =cut | 61 | =cut |
diff --git a/src/lib/libssl/src/doc/crypto/EVP_PKEY_decrypt.pod b/src/lib/libssl/src/doc/crypto/EVP_PKEY_decrypt.pod index 847983237b..197878eff7 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_decrypt.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_decrypt.pod | |||
@@ -50,7 +50,7 @@ Decrypt data using OAEP (for RSA keys): | |||
50 | 50 | ||
51 | EVP_PKEY_CTX *ctx; | 51 | EVP_PKEY_CTX *ctx; |
52 | unsigned char *out, *in; | 52 | unsigned char *out, *in; |
53 | size_t outlen, inlen; | 53 | size_t outlen, inlen; |
54 | EVP_PKEY *key; | 54 | EVP_PKEY *key; |
55 | /* NB: assumes key in, inlen are already set up | 55 | /* NB: assumes key in, inlen are already set up |
56 | * and that key is an RSA private key | 56 | * and that key is an RSA private key |
@@ -71,7 +71,7 @@ Decrypt data using OAEP (for RSA keys): | |||
71 | 71 | ||
72 | if (!out) | 72 | if (!out) |
73 | /* malloc failure */ | 73 | /* malloc failure */ |
74 | 74 | ||
75 | if (EVP_PKEY_decrypt(ctx, out, &outlen, in, inlen) <= 0) | 75 | if (EVP_PKEY_decrypt(ctx, out, &outlen, in, inlen) <= 0) |
76 | /* Error */ | 76 | /* Error */ |
77 | 77 | ||
@@ -84,7 +84,7 @@ L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>, | |||
84 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, | 84 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, |
85 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, | 85 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, |
86 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, | 86 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, |
87 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> | 87 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> |
88 | 88 | ||
89 | =head1 HISTORY | 89 | =head1 HISTORY |
90 | 90 | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_PKEY_derive.pod b/src/lib/libssl/src/doc/crypto/EVP_PKEY_derive.pod index 27464be571..de877ead1a 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_derive.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_derive.pod | |||
@@ -71,7 +71,7 @@ Derive shared secret (for example DH or EC keys): | |||
71 | 71 | ||
72 | if (!skey) | 72 | if (!skey) |
73 | /* malloc failure */ | 73 | /* malloc failure */ |
74 | 74 | ||
75 | if (EVP_PKEY_derive(ctx, skey, &skeylen) <= 0) | 75 | if (EVP_PKEY_derive(ctx, skey, &skeylen) <= 0) |
76 | /* Error */ | 76 | /* Error */ |
77 | 77 | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_PKEY_encrypt.pod b/src/lib/libssl/src/doc/crypto/EVP_PKEY_encrypt.pod index e495a81242..f7969c296f 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_encrypt.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_encrypt.pod | |||
@@ -50,7 +50,7 @@ Encrypt data using OAEP (for RSA keys): | |||
50 | 50 | ||
51 | EVP_PKEY_CTX *ctx; | 51 | EVP_PKEY_CTX *ctx; |
52 | unsigned char *out, *in; | 52 | unsigned char *out, *in; |
53 | size_t outlen, inlen; | 53 | size_t outlen, inlen; |
54 | EVP_PKEY *key; | 54 | EVP_PKEY *key; |
55 | /* NB: assumes key in, inlen are already set up | 55 | /* NB: assumes key in, inlen are already set up |
56 | * and that key is an RSA public key | 56 | * and that key is an RSA public key |
@@ -71,7 +71,7 @@ Encrypt data using OAEP (for RSA keys): | |||
71 | 71 | ||
72 | if (!out) | 72 | if (!out) |
73 | /* malloc failure */ | 73 | /* malloc failure */ |
74 | 74 | ||
75 | if (EVP_PKEY_encrypt(ctx, out, &outlen, in, inlen) <= 0) | 75 | if (EVP_PKEY_encrypt(ctx, out, &outlen, in, inlen) <= 0) |
76 | /* Error */ | 76 | /* Error */ |
77 | 77 | ||
@@ -84,7 +84,7 @@ L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, | |||
84 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, | 84 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, |
85 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, | 85 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, |
86 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, | 86 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, |
87 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> | 87 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> |
88 | 88 | ||
89 | =head1 HISTORY | 89 | =head1 HISTORY |
90 | 90 | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod b/src/lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod index fd431ace6d..b6102da036 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod | |||
@@ -28,7 +28,7 @@ EVP_PKEY_keygen_init, EVP_PKEY_keygen, EVP_PKEY_paramgen_init, EVP_PKEY_paramgen | |||
28 | The EVP_PKEY_keygen_init() function initializes a public key algorithm | 28 | The EVP_PKEY_keygen_init() function initializes a public key algorithm |
29 | context using key B<pkey> for a key genration operation. | 29 | context using key B<pkey> for a key genration operation. |
30 | 30 | ||
31 | The EVP_PKEY_keygen() function performs a key generation operation, the | 31 | The EVP_PKEY_keygen() function performs a key generation operation, the |
32 | generated key is written to B<ppkey>. | 32 | generated key is written to B<ppkey>. |
33 | 33 | ||
34 | The functions EVP_PKEY_paramgen_init() and EVP_PKEY_paramgen() are similar | 34 | The functions EVP_PKEY_paramgen_init() and EVP_PKEY_paramgen() are similar |
@@ -152,7 +152,7 @@ L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, | |||
152 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, | 152 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, |
153 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, | 153 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, |
154 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, | 154 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, |
155 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> | 155 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> |
156 | 156 | ||
157 | =head1 HISTORY | 157 | =head1 HISTORY |
158 | 158 | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_PKEY_new.pod b/src/lib/libssl/src/doc/crypto/EVP_PKEY_new.pod index 10687e458d..11512249e4 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_new.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_new.pod | |||
@@ -14,7 +14,7 @@ EVP_PKEY_new, EVP_PKEY_free - private key allocation functions. | |||
14 | 14 | ||
15 | =head1 DESCRIPTION | 15 | =head1 DESCRIPTION |
16 | 16 | ||
17 | The EVP_PKEY_new() function allocates an empty B<EVP_PKEY> | 17 | The EVP_PKEY_new() function allocates an empty B<EVP_PKEY> |
18 | structure which is used by OpenSSL to store private keys. | 18 | structure which is used by OpenSSL to store private keys. |
19 | 19 | ||
20 | EVP_PKEY_free() frees up the private key B<key>. | 20 | EVP_PKEY_free() frees up the private key B<key>. |
diff --git a/src/lib/libssl/src/doc/crypto/EVP_PKEY_print_private.pod b/src/lib/libssl/src/doc/crypto/EVP_PKEY_print_private.pod index ce9d70d7a7..c9b7a89821 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_print_private.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_print_private.pod | |||
@@ -28,7 +28,7 @@ be used. | |||
28 | 28 | ||
29 | =head1 NOTES | 29 | =head1 NOTES |
30 | 30 | ||
31 | Currently no public key algorithms include any options in the B<pctx> parameter | 31 | Currently no public key algorithms include any options in the B<pctx> parameter |
32 | parameter. | 32 | parameter. |
33 | 33 | ||
34 | If the key does not include all the components indicated by the function then | 34 | If the key does not include all the components indicated by the function then |
@@ -44,7 +44,7 @@ the public key algorithm. | |||
44 | =head1 SEE ALSO | 44 | =head1 SEE ALSO |
45 | 45 | ||
46 | L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>, | 46 | L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>, |
47 | L<EVP_PKEY_keygen(3)|EVP_PKEY_keygen(3)> | 47 | L<EVP_PKEY_keygen(3)|EVP_PKEY_keygen(3)> |
48 | 48 | ||
49 | =head1 HISTORY | 49 | =head1 HISTORY |
50 | 50 | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_PKEY_set1_RSA.pod b/src/lib/libssl/src/doc/crypto/EVP_PKEY_set1_RSA.pod index 2db692e271..8afb1b22e1 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_set1_RSA.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_set1_RSA.pod | |||
@@ -63,7 +63,7 @@ EVP_PKEY_set1_RSA(), EVP_PKEY_set1_DSA(), EVP_PKEY_set1_DH() and | |||
63 | EVP_PKEY_set1_EC_KEY() return 1 for success or 0 for failure. | 63 | EVP_PKEY_set1_EC_KEY() return 1 for success or 0 for failure. |
64 | 64 | ||
65 | EVP_PKEY_get1_RSA(), EVP_PKEY_get1_DSA(), EVP_PKEY_get1_DH() and | 65 | EVP_PKEY_get1_RSA(), EVP_PKEY_get1_DSA(), EVP_PKEY_get1_DH() and |
66 | EVP_PKEY_get1_EC_KEY() return the referenced key or B<NULL> if | 66 | EVP_PKEY_get1_EC_KEY() return the referenced key or B<NULL> if |
67 | an error occurred. | 67 | an error occurred. |
68 | 68 | ||
69 | EVP_PKEY_assign_RSA() EVP_PKEY_assign_DSA(), EVP_PKEY_assign_DH() | 69 | EVP_PKEY_assign_RSA() EVP_PKEY_assign_DSA(), EVP_PKEY_assign_DH() |
diff --git a/src/lib/libssl/src/doc/crypto/EVP_PKEY_sign.pod b/src/lib/libssl/src/doc/crypto/EVP_PKEY_sign.pod index a044f2c131..fb8e61cf29 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_sign.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_sign.pod | |||
@@ -50,7 +50,7 @@ Sign data using RSA with PKCS#1 padding and SHA256 digest: | |||
50 | 50 | ||
51 | EVP_PKEY_CTX *ctx; | 51 | EVP_PKEY_CTX *ctx; |
52 | unsigned char *md, *sig; | 52 | unsigned char *md, *sig; |
53 | size_t mdlen, siglen; | 53 | size_t mdlen, siglen; |
54 | EVP_PKEY *signing_key; | 54 | EVP_PKEY *signing_key; |
55 | /* NB: assumes signing_key, md and mdlen are already set up | 55 | /* NB: assumes signing_key, md and mdlen are already set up |
56 | * and that signing_key is an RSA private key | 56 | * and that signing_key is an RSA private key |
@@ -73,7 +73,7 @@ Sign data using RSA with PKCS#1 padding and SHA256 digest: | |||
73 | 73 | ||
74 | if (!sig) | 74 | if (!sig) |
75 | /* malloc failure */ | 75 | /* malloc failure */ |
76 | 76 | ||
77 | if (EVP_PKEY_sign(ctx, sig, &siglen, md, mdlen) <= 0) | 77 | if (EVP_PKEY_sign(ctx, sig, &siglen, md, mdlen) <= 0) |
78 | /* Error */ | 78 | /* Error */ |
79 | 79 | ||
@@ -87,7 +87,7 @@ L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>, | |||
87 | L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, | 87 | L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, |
88 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, | 88 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, |
89 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, | 89 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, |
90 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> | 90 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> |
91 | 91 | ||
92 | =head1 HISTORY | 92 | =head1 HISTORY |
93 | 93 | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_PKEY_verify.pod b/src/lib/libssl/src/doc/crypto/EVP_PKEY_verify.pod index 90612ba2f0..f7ae4f9ebe 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_verify.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_verify.pod | |||
@@ -53,7 +53,7 @@ Verify signature using PKCS#1 and SHA256 digest: | |||
53 | 53 | ||
54 | EVP_PKEY_CTX *ctx; | 54 | EVP_PKEY_CTX *ctx; |
55 | unsigned char *md, *sig; | 55 | unsigned char *md, *sig; |
56 | size_t mdlen, siglen; | 56 | size_t mdlen, siglen; |
57 | EVP_PKEY *verify_key; | 57 | EVP_PKEY *verify_key; |
58 | /* NB: assumes verify_key, sig, siglen md and mdlen are already set up | 58 | /* NB: assumes verify_key, sig, siglen md and mdlen are already set up |
59 | * and that verify_key is an RSA public key | 59 | * and that verify_key is an RSA public key |
@@ -82,7 +82,7 @@ L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>, | |||
82 | L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, | 82 | L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, |
83 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, | 83 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, |
84 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, | 84 | L<EVP_PKEY_verify_recover(3)|EVP_PKEY_verify_recover(3)>, |
85 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> | 85 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> |
86 | 86 | ||
87 | =head1 HISTORY | 87 | =head1 HISTORY |
88 | 88 | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_PKEY_verify_recover.pod b/src/lib/libssl/src/doc/crypto/EVP_PKEY_verify_recover.pod index 23a28a9c43..00d53db783 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_verify_recover.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_verify_recover.pod | |||
@@ -29,7 +29,7 @@ B<rout> and the amount of data written to B<routlen>. | |||
29 | =head1 NOTES | 29 | =head1 NOTES |
30 | 30 | ||
31 | Normally an application is only interested in whether a signature verification | 31 | Normally an application is only interested in whether a signature verification |
32 | operation is successful in those cases the EVP_verify() function should be | 32 | operation is successful in those cases the EVP_verify() function should be |
33 | used. | 33 | used. |
34 | 34 | ||
35 | Sometimes however it is useful to obtain the data originally signed using a | 35 | Sometimes however it is useful to obtain the data originally signed using a |
@@ -58,7 +58,7 @@ Recover digest originally signed using PKCS#1 and SHA256 digest: | |||
58 | 58 | ||
59 | EVP_PKEY_CTX *ctx; | 59 | EVP_PKEY_CTX *ctx; |
60 | unsigned char *rout, *sig; | 60 | unsigned char *rout, *sig; |
61 | size_t routlen, siglen; | 61 | size_t routlen, siglen; |
62 | EVP_PKEY *verify_key; | 62 | EVP_PKEY *verify_key; |
63 | /* NB: assumes verify_key, sig and siglen are already set up | 63 | /* NB: assumes verify_key, sig and siglen are already set up |
64 | * and that verify_key is an RSA public key | 64 | * and that verify_key is an RSA public key |
@@ -81,7 +81,7 @@ Recover digest originally signed using PKCS#1 and SHA256 digest: | |||
81 | 81 | ||
82 | if (!rout) | 82 | if (!rout) |
83 | /* malloc failure */ | 83 | /* malloc failure */ |
84 | 84 | ||
85 | if (EVP_PKEY_verify_recover(ctx, rout, &routlen, sig, siglen) <= 0) | 85 | if (EVP_PKEY_verify_recover(ctx, rout, &routlen, sig, siglen) <= 0) |
86 | /* Error */ | 86 | /* Error */ |
87 | 87 | ||
@@ -94,7 +94,7 @@ L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>, | |||
94 | L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, | 94 | L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, |
95 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, | 95 | L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>, |
96 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, | 96 | L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, |
97 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> | 97 | L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)> |
98 | 98 | ||
99 | =head1 HISTORY | 99 | =head1 HISTORY |
100 | 100 | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_SealInit.pod b/src/lib/libssl/src/doc/crypto/EVP_SealInit.pod index 7d793e19ef..172f210c64 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_SealInit.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_SealInit.pod | |||
@@ -42,9 +42,9 @@ If the cipher does not require an IV then the B<iv> parameter is ignored | |||
42 | and can be B<NULL>. | 42 | and can be B<NULL>. |
43 | 43 | ||
44 | EVP_SealUpdate() and EVP_SealFinal() have exactly the same properties | 44 | EVP_SealUpdate() and EVP_SealFinal() have exactly the same properties |
45 | as the EVP_EncryptUpdate() and EVP_EncryptFinal() routines, as | 45 | as the EVP_EncryptUpdate() and EVP_EncryptFinal() routines, as |
46 | documented on the L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> manual | 46 | documented on the L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> manual |
47 | page. | 47 | page. |
48 | 48 | ||
49 | =head1 RETURN VALUES | 49 | =head1 RETURN VALUES |
50 | 50 | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_SignInit.pod b/src/lib/libssl/src/doc/crypto/EVP_SignInit.pod index 620a623ab6..682724b157 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_SignInit.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_SignInit.pod | |||
@@ -32,7 +32,7 @@ same B<ctx> to include additional data. | |||
32 | EVP_SignFinal() signs the data in B<ctx> using the private key B<pkey> and | 32 | EVP_SignFinal() signs the data in B<ctx> using the private key B<pkey> and |
33 | places the signature in B<sig>. The number of bytes of data written (i.e. the | 33 | places the signature in B<sig>. The number of bytes of data written (i.e. the |
34 | length of the signature) will be written to the integer at B<s>, at most | 34 | length of the signature) will be written to the integer at B<s>, at most |
35 | EVP_PKEY_size(pkey) bytes will be written. | 35 | EVP_PKEY_size(pkey) bytes will be written. |
36 | 36 | ||
37 | EVP_SignInit() initializes a signing context B<ctx> to use the default | 37 | EVP_SignInit() initializes a signing context B<ctx> to use the default |
38 | implementation of digest B<type>. | 38 | implementation of digest B<type>. |
@@ -57,7 +57,7 @@ transparent to the algorithm used and much more flexible. | |||
57 | 57 | ||
58 | Due to the link between message digests and public key algorithms the correct | 58 | Due to the link between message digests and public key algorithms the correct |
59 | digest algorithm must be used with the correct public key type. A list of | 59 | digest algorithm must be used with the correct public key type. A list of |
60 | algorithms and associated public key algorithms appears in | 60 | algorithms and associated public key algorithms appears in |
61 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>. | 61 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>. |
62 | 62 | ||
63 | When signing with DSA private keys the random number generator must be seeded | 63 | When signing with DSA private keys the random number generator must be seeded |
@@ -74,7 +74,7 @@ will occur. | |||
74 | 74 | ||
75 | =head1 BUGS | 75 | =head1 BUGS |
76 | 76 | ||
77 | Older versions of this documentation wrongly stated that calls to | 77 | Older versions of this documentation wrongly stated that calls to |
78 | EVP_SignUpdate() could not be made after calling EVP_SignFinal(). | 78 | EVP_SignUpdate() could not be made after calling EVP_SignFinal(). |
79 | 79 | ||
80 | Since the private key is passed in the call to EVP_SignFinal() any error | 80 | Since the private key is passed in the call to EVP_SignFinal() any error |
diff --git a/src/lib/libssl/src/doc/crypto/EVP_VerifyInit.pod b/src/lib/libssl/src/doc/crypto/EVP_VerifyInit.pod index 9097f09410..0ffb0a8077 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_VerifyInit.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_VerifyInit.pod | |||
@@ -51,7 +51,7 @@ transparent to the algorithm used and much more flexible. | |||
51 | 51 | ||
52 | Due to the link between message digests and public key algorithms the correct | 52 | Due to the link between message digests and public key algorithms the correct |
53 | digest algorithm must be used with the correct public key type. A list of | 53 | digest algorithm must be used with the correct public key type. A list of |
54 | algorithms and associated public key algorithms appears in | 54 | algorithms and associated public key algorithms appears in |
55 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>. | 55 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>. |
56 | 56 | ||
57 | The call to EVP_VerifyFinal() internally finalizes a copy of the digest context. | 57 | The call to EVP_VerifyFinal() internally finalizes a copy of the digest context. |
@@ -64,7 +64,7 @@ will occur. | |||
64 | 64 | ||
65 | =head1 BUGS | 65 | =head1 BUGS |
66 | 66 | ||
67 | Older versions of this documentation wrongly stated that calls to | 67 | Older versions of this documentation wrongly stated that calls to |
68 | EVP_VerifyUpdate() could not be made after calling EVP_VerifyFinal(). | 68 | EVP_VerifyUpdate() could not be made after calling EVP_VerifyFinal(). |
69 | 69 | ||
70 | Since the public key is passed in the call to EVP_SignFinal() any error | 70 | Since the public key is passed in the call to EVP_SignFinal() any error |
diff --git a/src/lib/libssl/src/doc/crypto/MD5.pod b/src/lib/libssl/src/doc/crypto/MD5.pod index d11d5c32cb..b0edd5416f 100644 --- a/src/lib/libssl/src/doc/crypto/MD5.pod +++ b/src/lib/libssl/src/doc/crypto/MD5.pod | |||
@@ -75,7 +75,7 @@ preferred. | |||
75 | 75 | ||
76 | =head1 RETURN VALUES | 76 | =head1 RETURN VALUES |
77 | 77 | ||
78 | MD2(), MD4(), and MD5() return pointers to the hash value. | 78 | MD2(), MD4(), and MD5() return pointers to the hash value. |
79 | 79 | ||
80 | MD2_Init(), MD2_Update(), MD2_Final(), MD4_Init(), MD4_Update(), | 80 | MD2_Init(), MD2_Update(), MD2_Final(), MD4_Init(), MD4_Update(), |
81 | MD4_Final(), MD5_Init(), MD5_Update(), and MD5_Final() return 1 for | 81 | MD4_Final(), MD5_Init(), MD5_Update(), and MD5_Final() return 1 for |
diff --git a/src/lib/libssl/src/doc/crypto/OBJ_nid2obj.pod b/src/lib/libssl/src/doc/crypto/OBJ_nid2obj.pod index 1e45dd40f6..458ef025f0 100644 --- a/src/lib/libssl/src/doc/crypto/OBJ_nid2obj.pod +++ b/src/lib/libssl/src/doc/crypto/OBJ_nid2obj.pod | |||
@@ -34,7 +34,7 @@ functions | |||
34 | The ASN1 object utility functions process ASN1_OBJECT structures which are | 34 | The ASN1 object utility functions process ASN1_OBJECT structures which are |
35 | a representation of the ASN1 OBJECT IDENTIFIER (OID) type. | 35 | a representation of the ASN1 OBJECT IDENTIFIER (OID) type. |
36 | 36 | ||
37 | OBJ_nid2obj(), OBJ_nid2ln() and OBJ_nid2sn() convert the NID B<n> to | 37 | OBJ_nid2obj(), OBJ_nid2ln() and OBJ_nid2sn() convert the NID B<n> to |
38 | an ASN1_OBJECT structure, its long name and its short name respectively, | 38 | an ASN1_OBJECT structure, its long name and its short name respectively, |
39 | or B<NULL> is an error occurred. | 39 | or B<NULL> is an error occurred. |
40 | 40 | ||
@@ -62,7 +62,7 @@ OBJ_cmp() compares B<a> to B<b>. If the two are identical 0 is returned. | |||
62 | 62 | ||
63 | OBJ_dup() returns a copy of B<o>. | 63 | OBJ_dup() returns a copy of B<o>. |
64 | 64 | ||
65 | OBJ_create() adds a new object to the internal table. B<oid> is the | 65 | OBJ_create() adds a new object to the internal table. B<oid> is the |
66 | numerical form of the object, B<sn> the short name and B<ln> the | 66 | numerical form of the object, B<sn> the short name and B<ln> the |
67 | long name. A new NID is returned for the created object. | 67 | long name. A new NID is returned for the created object. |
68 | 68 | ||
@@ -115,14 +115,14 @@ Create a new NID and initialize an object from it: | |||
115 | new_nid = OBJ_create("1.2.3.4", "NewOID", "New Object Identifier"); | 115 | new_nid = OBJ_create("1.2.3.4", "NewOID", "New Object Identifier"); |
116 | 116 | ||
117 | obj = OBJ_nid2obj(new_nid); | 117 | obj = OBJ_nid2obj(new_nid); |
118 | 118 | ||
119 | Create a new object directly: | 119 | Create a new object directly: |
120 | 120 | ||
121 | obj = OBJ_txt2obj("1.2.3.4", 1); | 121 | obj = OBJ_txt2obj("1.2.3.4", 1); |
122 | 122 | ||
123 | =head1 BUGS | 123 | =head1 BUGS |
124 | 124 | ||
125 | OBJ_obj2txt() is awkward and messy to use: it doesn't follow the | 125 | OBJ_obj2txt() is awkward and messy to use: it doesn't follow the |
126 | convention of other OpenSSL functions where the buffer can be set | 126 | convention of other OpenSSL functions where the buffer can be set |
127 | to B<NULL> to determine the amount of data that should be written. | 127 | to B<NULL> to determine the amount of data that should be written. |
128 | Instead B<buf> must point to a valid buffer and B<buf_len> should | 128 | Instead B<buf> must point to a valid buffer and B<buf_len> should |
diff --git a/src/lib/libssl/src/doc/crypto/OPENSSL_config.pod b/src/lib/libssl/src/doc/crypto/OPENSSL_config.pod index e7bba2aaca..552ed956ab 100644 --- a/src/lib/libssl/src/doc/crypto/OPENSSL_config.pod +++ b/src/lib/libssl/src/doc/crypto/OPENSSL_config.pod | |||
@@ -37,7 +37,7 @@ can be added without source changes. | |||
37 | 37 | ||
38 | The environment variable B<OPENSSL_CONF> can be set to specify the location | 38 | The environment variable B<OPENSSL_CONF> can be set to specify the location |
39 | of the configuration file. | 39 | of the configuration file. |
40 | 40 | ||
41 | Currently ASN1 OBJECTs and ENGINE configuration can be performed future | 41 | Currently ASN1 OBJECTs and ENGINE configuration can be performed future |
42 | versions of OpenSSL will add new configuration options. | 42 | versions of OpenSSL will add new configuration options. |
43 | 43 | ||
diff --git a/src/lib/libssl/src/doc/crypto/OPENSSL_load_builtin_modules.pod b/src/lib/libssl/src/doc/crypto/OPENSSL_load_builtin_modules.pod index f14dfaf005..6c99170197 100644 --- a/src/lib/libssl/src/doc/crypto/OPENSSL_load_builtin_modules.pod +++ b/src/lib/libssl/src/doc/crypto/OPENSSL_load_builtin_modules.pod | |||
@@ -24,15 +24,15 @@ ENGINE_add_conf_module() adds just the ENGINE configuration module. | |||
24 | 24 | ||
25 | =head1 NOTES | 25 | =head1 NOTES |
26 | 26 | ||
27 | If the simple configuration function OPENSSL_config() is called then | 27 | If the simple configuration function OPENSSL_config() is called then |
28 | OPENSSL_load_builtin_modules() is called automatically. | 28 | OPENSSL_load_builtin_modules() is called automatically. |
29 | 29 | ||
30 | Applications which use the configuration functions directly will need to | 30 | Applications which use the configuration functions directly will need to |
31 | call OPENSSL_load_builtin_modules() themselves I<before> any other | 31 | call OPENSSL_load_builtin_modules() themselves I<before> any other |
32 | configuration code. | 32 | configuration code. |
33 | 33 | ||
34 | Applications should call OPENSSL_load_builtin_modules() to load all | 34 | Applications should call OPENSSL_load_builtin_modules() to load all |
35 | configuration modules instead of adding modules selectively: otherwise | 35 | configuration modules instead of adding modules selectively: otherwise |
36 | functionality may be missing from the application if an when new | 36 | functionality may be missing from the application if an when new |
37 | modules are added. | 37 | modules are added. |
38 | 38 | ||
diff --git a/src/lib/libssl/src/doc/crypto/PEM_read_bio_PrivateKey.pod b/src/lib/libssl/src/doc/crypto/PEM_read_bio_PrivateKey.pod index 54414a3f6f..e196bf1498 100644 --- a/src/lib/libssl/src/doc/crypto/PEM_read_bio_PrivateKey.pod +++ b/src/lib/libssl/src/doc/crypto/PEM_read_bio_PrivateKey.pod | |||
@@ -250,7 +250,7 @@ structure. They will also process a trusted X509 certificate but | |||
250 | any trust settings are discarded. | 250 | any trust settings are discarded. |
251 | 251 | ||
252 | The B<X509_AUX> functions process a trusted X509 certificate using | 252 | The B<X509_AUX> functions process a trusted X509 certificate using |
253 | an X509 structure. | 253 | an X509 structure. |
254 | 254 | ||
255 | The B<X509_REQ> and B<X509_REQ_NEW> functions process a PKCS#10 | 255 | The B<X509_REQ> and B<X509_REQ_NEW> functions process a PKCS#10 |
256 | certificate request using an X509_REQ structure. The B<X509_REQ> | 256 | certificate request using an X509_REQ structure. The B<X509_REQ> |
@@ -435,7 +435,7 @@ which is an uninitialised pointer. | |||
435 | 435 | ||
436 | This old B<PrivateKey> routines use a non standard technique for encryption. | 436 | This old B<PrivateKey> routines use a non standard technique for encryption. |
437 | 437 | ||
438 | The private key (or other data) takes the following form: | 438 | The private key (or other data) takes the following form: |
439 | 439 | ||
440 | -----BEGIN RSA PRIVATE KEY----- | 440 | -----BEGIN RSA PRIVATE KEY----- |
441 | Proc-Type: 4,ENCRYPTED | 441 | Proc-Type: 4,ENCRYPTED |
@@ -461,7 +461,7 @@ an existing structure. Therefore the following: | |||
461 | 461 | ||
462 | PEM_read_bio_X509(bp, &x, 0, NULL); | 462 | PEM_read_bio_X509(bp, &x, 0, NULL); |
463 | 463 | ||
464 | where B<x> already contains a valid certificate, may not work, whereas: | 464 | where B<x> already contains a valid certificate, may not work, whereas: |
465 | 465 | ||
466 | X509_free(x); | 466 | X509_free(x); |
467 | x = PEM_read_bio_X509(bp, NULL, 0, NULL); | 467 | x = PEM_read_bio_X509(bp, NULL, 0, NULL); |
diff --git a/src/lib/libssl/src/doc/crypto/PKCS12_create.pod b/src/lib/libssl/src/doc/crypto/PKCS12_create.pod index de7cab2bdf..0a1e460cf1 100644 --- a/src/lib/libssl/src/doc/crypto/PKCS12_create.pod +++ b/src/lib/libssl/src/doc/crypto/PKCS12_create.pod | |||
@@ -60,7 +60,7 @@ certficate is required. In previous versions both had to be present or | |||
60 | a fatal error is returned. | 60 | a fatal error is returned. |
61 | 61 | ||
62 | B<nid_key> or B<nid_cert> can be set to -1 indicating that no encryption | 62 | B<nid_key> or B<nid_cert> can be set to -1 indicating that no encryption |
63 | should be used. | 63 | should be used. |
64 | 64 | ||
65 | B<mac_iter> can be set to -1 and the MAC will then be omitted entirely. | 65 | B<mac_iter> can be set to -1 and the MAC will then be omitted entirely. |
66 | 66 | ||
diff --git a/src/lib/libssl/src/doc/crypto/PKCS7_encrypt.pod b/src/lib/libssl/src/doc/crypto/PKCS7_encrypt.pod index 2cd925a7e0..e206684384 100644 --- a/src/lib/libssl/src/doc/crypto/PKCS7_encrypt.pod +++ b/src/lib/libssl/src/doc/crypto/PKCS7_encrypt.pod | |||
@@ -30,7 +30,7 @@ bit RC2. These can be used by passing EVP_rc2_40_cbc() and EVP_rc2_64_cbc() | |||
30 | respectively. | 30 | respectively. |
31 | 31 | ||
32 | The algorithm passed in the B<cipher> parameter must support ASN1 encoding of | 32 | The algorithm passed in the B<cipher> parameter must support ASN1 encoding of |
33 | its parameters. | 33 | its parameters. |
34 | 34 | ||
35 | Many browsers implement a "sign and encrypt" option which is simply an S/MIME | 35 | Many browsers implement a "sign and encrypt" option which is simply an S/MIME |
36 | envelopedData containing an S/MIME signed message. This can be readily produced | 36 | envelopedData containing an S/MIME signed message. This can be readily produced |
@@ -55,7 +55,7 @@ suitable for streaming I/O: no data is read from the BIO B<in>. | |||
55 | 55 | ||
56 | If the flag B<PKCS7_STREAM> is set the returned B<PKCS7> structure is B<not> | 56 | If the flag B<PKCS7_STREAM> is set the returned B<PKCS7> structure is B<not> |
57 | complete and outputting its contents via a function that does not | 57 | complete and outputting its contents via a function that does not |
58 | properly finalize the B<PKCS7> structure will give unpredictable | 58 | properly finalize the B<PKCS7> structure will give unpredictable |
59 | results. | 59 | results. |
60 | 60 | ||
61 | Several functions including SMIME_write_PKCS7(), i2d_PKCS7_bio_stream(), | 61 | Several functions including SMIME_write_PKCS7(), i2d_PKCS7_bio_stream(), |
diff --git a/src/lib/libssl/src/doc/crypto/PKCS7_sign.pod b/src/lib/libssl/src/doc/crypto/PKCS7_sign.pod index 64a35144f8..9a4f5b173e 100644 --- a/src/lib/libssl/src/doc/crypto/PKCS7_sign.pod +++ b/src/lib/libssl/src/doc/crypto/PKCS7_sign.pod | |||
@@ -15,7 +15,7 @@ PKCS7_sign - create a PKCS#7 signedData structure | |||
15 | PKCS7_sign() creates and returns a PKCS#7 signedData structure. B<signcert> is | 15 | PKCS7_sign() creates and returns a PKCS#7 signedData structure. B<signcert> is |
16 | the certificate to sign with, B<pkey> is the corresponsding private key. | 16 | the certificate to sign with, B<pkey> is the corresponsding private key. |
17 | B<certs> is an optional additional set of certificates to include in the PKCS#7 | 17 | B<certs> is an optional additional set of certificates to include in the PKCS#7 |
18 | structure (for example any intermediate CAs in the chain). | 18 | structure (for example any intermediate CAs in the chain). |
19 | 19 | ||
20 | The data to be signed is read from BIO B<data>. | 20 | The data to be signed is read from BIO B<data>. |
21 | 21 | ||
diff --git a/src/lib/libssl/src/doc/crypto/PKCS7_sign_add_signer.pod b/src/lib/libssl/src/doc/crypto/PKCS7_sign_add_signer.pod index ebec4d57de..afe8ad97cd 100644 --- a/src/lib/libssl/src/doc/crypto/PKCS7_sign_add_signer.pod +++ b/src/lib/libssl/src/doc/crypto/PKCS7_sign_add_signer.pod | |||
@@ -44,7 +44,7 @@ digest value from the PKCS7 struture: to add a signer to an existing structure. | |||
44 | An error occurs if a matching digest value cannot be found to copy. The | 44 | An error occurs if a matching digest value cannot be found to copy. The |
45 | returned PKCS7 structure will be valid and finalized when this flag is set. | 45 | returned PKCS7 structure will be valid and finalized when this flag is set. |
46 | 46 | ||
47 | If B<PKCS7_PARTIAL> is set in addition to B<PKCS7_REUSE_DIGEST> then the | 47 | If B<PKCS7_PARTIAL> is set in addition to B<PKCS7_REUSE_DIGEST> then the |
48 | B<PKCS7_SIGNER_INO> structure will not be finalized so additional attributes | 48 | B<PKCS7_SIGNER_INO> structure will not be finalized so additional attributes |
49 | can be added. In this case an explicit call to PKCS7_SIGNER_INFO_sign() is | 49 | can be added. In this case an explicit call to PKCS7_SIGNER_INFO_sign() is |
50 | needed to finalize it. | 50 | needed to finalize it. |
@@ -67,7 +67,7 @@ these algorithms is disabled then it will not be included. | |||
67 | 67 | ||
68 | 68 | ||
69 | PKCS7_sign_add_signers() returns an internal pointer to the PKCS7_SIGNER_INFO | 69 | PKCS7_sign_add_signers() returns an internal pointer to the PKCS7_SIGNER_INFO |
70 | structure just added, this can be used to set additional attributes | 70 | structure just added, this can be used to set additional attributes |
71 | before it is finalized. | 71 | before it is finalized. |
72 | 72 | ||
73 | =head1 RETURN VALUES | 73 | =head1 RETURN VALUES |
diff --git a/src/lib/libssl/src/doc/crypto/PKCS7_verify.pod b/src/lib/libssl/src/doc/crypto/PKCS7_verify.pod index 7c10a4cc3c..51ada03f2d 100644 --- a/src/lib/libssl/src/doc/crypto/PKCS7_verify.pod +++ b/src/lib/libssl/src/doc/crypto/PKCS7_verify.pod | |||
@@ -54,7 +54,7 @@ Any of the following flags (ored together) can be passed in the B<flags> paramet | |||
54 | to change the default verify behaviour. Only the flag B<PKCS7_NOINTERN> is | 54 | to change the default verify behaviour. Only the flag B<PKCS7_NOINTERN> is |
55 | meaningful to PKCS7_get0_signers(). | 55 | meaningful to PKCS7_get0_signers(). |
56 | 56 | ||
57 | If B<PKCS7_NOINTERN> is set the certificates in the message itself are not | 57 | If B<PKCS7_NOINTERN> is set the certificates in the message itself are not |
58 | searched when locating the signer's certificate. This means that all the signers | 58 | searched when locating the signer's certificate. This means that all the signers |
59 | certificates must be in the B<certs> parameter. | 59 | certificates must be in the B<certs> parameter. |
60 | 60 | ||
@@ -79,7 +79,7 @@ certificates supplied in B<certs> then the verify will fail because the | |||
79 | signer cannot be found. | 79 | signer cannot be found. |
80 | 80 | ||
81 | Care should be taken when modifying the default verify behaviour, for example | 81 | Care should be taken when modifying the default verify behaviour, for example |
82 | setting B<PKCS7_NOVERIFY|PKCS7_NOSIGS> will totally disable all verification | 82 | setting B<PKCS7_NOVERIFY|PKCS7_NOSIGS> will totally disable all verification |
83 | and any signed message will be considered valid. This combination is however | 83 | and any signed message will be considered valid. This combination is however |
84 | useful if one merely wishes to write the content to B<out> and its validity | 84 | useful if one merely wishes to write the content to B<out> and its validity |
85 | is not considered important. | 85 | is not considered important. |
diff --git a/src/lib/libssl/src/doc/crypto/RAND.pod b/src/lib/libssl/src/doc/crypto/RAND.pod index e460c1653e..8f803f33eb 100644 --- a/src/lib/libssl/src/doc/crypto/RAND.pod +++ b/src/lib/libssl/src/doc/crypto/RAND.pod | |||
@@ -54,7 +54,7 @@ described in L<RAND_add(3)|RAND_add(3)>. Its state can be saved in a seed file | |||
54 | seeding process whenever the application is started. | 54 | seeding process whenever the application is started. |
55 | 55 | ||
56 | L<RAND_bytes(3)|RAND_bytes(3)> describes how to obtain random data from the | 56 | L<RAND_bytes(3)|RAND_bytes(3)> describes how to obtain random data from the |
57 | PRNG. | 57 | PRNG. |
58 | 58 | ||
59 | =head1 INTERNALS | 59 | =head1 INTERNALS |
60 | 60 | ||
@@ -67,6 +67,6 @@ L<BN_rand(3)|BN_rand(3)>, L<RAND_add(3)|RAND_add(3)>, | |||
67 | L<RAND_load_file(3)|RAND_load_file(3)>, | 67 | L<RAND_load_file(3)|RAND_load_file(3)>, |
68 | L<RAND_bytes(3)|RAND_bytes(3)>, | 68 | L<RAND_bytes(3)|RAND_bytes(3)>, |
69 | L<RAND_set_rand_method(3)|RAND_set_rand_method(3)>, | 69 | L<RAND_set_rand_method(3)|RAND_set_rand_method(3)>, |
70 | L<RAND_cleanup(3)|RAND_cleanup(3)> | 70 | L<RAND_cleanup(3)|RAND_cleanup(3)> |
71 | 71 | ||
72 | =cut | 72 | =cut |
diff --git a/src/lib/libssl/src/doc/crypto/RIPEMD160.pod b/src/lib/libssl/src/doc/crypto/RIPEMD160.pod index 264bb99ae7..f66fb02ed2 100644 --- a/src/lib/libssl/src/doc/crypto/RIPEMD160.pod +++ b/src/lib/libssl/src/doc/crypto/RIPEMD160.pod | |||
@@ -45,7 +45,7 @@ hash functions directly. | |||
45 | 45 | ||
46 | =head1 RETURN VALUES | 46 | =head1 RETURN VALUES |
47 | 47 | ||
48 | RIPEMD160() returns a pointer to the hash value. | 48 | RIPEMD160() returns a pointer to the hash value. |
49 | 49 | ||
50 | RIPEMD160_Init(), RIPEMD160_Update() and RIPEMD160_Final() return 1 for | 50 | RIPEMD160_Init(), RIPEMD160_Update() and RIPEMD160_Final() return 1 for |
51 | success, 0 otherwise. | 51 | success, 0 otherwise. |
diff --git a/src/lib/libssl/src/doc/crypto/RSA_private_encrypt.pod b/src/lib/libssl/src/doc/crypto/RSA_private_encrypt.pod index 746a80c79e..4c4d131172 100644 --- a/src/lib/libssl/src/doc/crypto/RSA_private_encrypt.pod +++ b/src/lib/libssl/src/doc/crypto/RSA_private_encrypt.pod | |||
@@ -11,7 +11,7 @@ RSA_private_encrypt, RSA_public_decrypt - low level signature operations | |||
11 | int RSA_private_encrypt(int flen, unsigned char *from, | 11 | int RSA_private_encrypt(int flen, unsigned char *from, |
12 | unsigned char *to, RSA *rsa, int padding); | 12 | unsigned char *to, RSA *rsa, int padding); |
13 | 13 | ||
14 | int RSA_public_decrypt(int flen, unsigned char *from, | 14 | int RSA_public_decrypt(int flen, unsigned char *from, |
15 | unsigned char *to, RSA *rsa, int padding); | 15 | unsigned char *to, RSA *rsa, int padding); |
16 | 16 | ||
17 | =head1 DESCRIPTION | 17 | =head1 DESCRIPTION |
diff --git a/src/lib/libssl/src/doc/crypto/RSA_set_method.pod b/src/lib/libssl/src/doc/crypto/RSA_set_method.pod index 2c963d7e5b..eb0913c106 100644 --- a/src/lib/libssl/src/doc/crypto/RSA_set_method.pod +++ b/src/lib/libssl/src/doc/crypto/RSA_set_method.pod | |||
@@ -43,7 +43,7 @@ been set as a default for RSA, so this function is no longer recommended. | |||
43 | 43 | ||
44 | RSA_get_default_method() returns a pointer to the current default | 44 | RSA_get_default_method() returns a pointer to the current default |
45 | RSA_METHOD. However, the meaningfulness of this result is dependent on | 45 | RSA_METHOD. However, the meaningfulness of this result is dependent on |
46 | whether the ENGINE API is being used, so this function is no longer | 46 | whether the ENGINE API is being used, so this function is no longer |
47 | recommended. | 47 | recommended. |
48 | 48 | ||
49 | RSA_set_method() selects B<meth> to perform all operations using the key | 49 | RSA_set_method() selects B<meth> to perform all operations using the key |
diff --git a/src/lib/libssl/src/doc/crypto/RSA_sign.pod b/src/lib/libssl/src/doc/crypto/RSA_sign.pod index 8553be8e99..061c0e2437 100644 --- a/src/lib/libssl/src/doc/crypto/RSA_sign.pod +++ b/src/lib/libssl/src/doc/crypto/RSA_sign.pod | |||
@@ -52,7 +52,7 @@ SSL, PKCS #1 v2.0 | |||
52 | 52 | ||
53 | L<ERR_get_error(3)|ERR_get_error(3)>, L<objects(3)|objects(3)>, | 53 | L<ERR_get_error(3)|ERR_get_error(3)>, L<objects(3)|objects(3)>, |
54 | L<rsa(3)|rsa(3)>, L<RSA_private_encrypt(3)|RSA_private_encrypt(3)>, | 54 | L<rsa(3)|rsa(3)>, L<RSA_private_encrypt(3)|RSA_private_encrypt(3)>, |
55 | L<RSA_public_decrypt(3)|RSA_public_decrypt(3)> | 55 | L<RSA_public_decrypt(3)|RSA_public_decrypt(3)> |
56 | 56 | ||
57 | =head1 HISTORY | 57 | =head1 HISTORY |
58 | 58 | ||
diff --git a/src/lib/libssl/src/doc/crypto/SHA1.pod b/src/lib/libssl/src/doc/crypto/SHA1.pod index 94ab7bc724..232af9227e 100644 --- a/src/lib/libssl/src/doc/crypto/SHA1.pod +++ b/src/lib/libssl/src/doc/crypto/SHA1.pod | |||
@@ -46,7 +46,7 @@ used only when backward compatibility is required. | |||
46 | 46 | ||
47 | =head1 RETURN VALUES | 47 | =head1 RETURN VALUES |
48 | 48 | ||
49 | SHA1() returns a pointer to the hash value. | 49 | SHA1() returns a pointer to the hash value. |
50 | 50 | ||
51 | SHA1_Init(), SHA1_Update() and SHA1_Final() return 1 for success, 0 otherwise. | 51 | SHA1_Init(), SHA1_Update() and SHA1_Final() return 1 for success, 0 otherwise. |
52 | 52 | ||
diff --git a/src/lib/libssl/src/doc/crypto/X509_NAME_ENTRY_get_object.pod b/src/lib/libssl/src/doc/crypto/X509_NAME_ENTRY_get_object.pod index 41902c0d45..ad0d796535 100644 --- a/src/lib/libssl/src/doc/crypto/X509_NAME_ENTRY_get_object.pod +++ b/src/lib/libssl/src/doc/crypto/X509_NAME_ENTRY_get_object.pod | |||
@@ -35,17 +35,17 @@ X509_NAME_ENTRY_set_data() sets the field value of B<ne> to string type | |||
35 | B<type> and value determined by B<bytes> and B<len>. | 35 | B<type> and value determined by B<bytes> and B<len>. |
36 | 36 | ||
37 | X509_NAME_ENTRY_create_by_txt(), X509_NAME_ENTRY_create_by_NID() | 37 | X509_NAME_ENTRY_create_by_txt(), X509_NAME_ENTRY_create_by_NID() |
38 | and X509_NAME_ENTRY_create_by_OBJ() create and return an | 38 | and X509_NAME_ENTRY_create_by_OBJ() create and return an |
39 | B<X509_NAME_ENTRY> structure. | 39 | B<X509_NAME_ENTRY> structure. |
40 | 40 | ||
41 | =head1 NOTES | 41 | =head1 NOTES |
42 | 42 | ||
43 | X509_NAME_ENTRY_get_object() and X509_NAME_ENTRY_get_data() can be | 43 | X509_NAME_ENTRY_get_object() and X509_NAME_ENTRY_get_data() can be |
44 | used to examine an B<X509_NAME_ENTRY> function as returned by | 44 | used to examine an B<X509_NAME_ENTRY> function as returned by |
45 | X509_NAME_get_entry() for example. | 45 | X509_NAME_get_entry() for example. |
46 | 46 | ||
47 | X509_NAME_ENTRY_create_by_txt(), X509_NAME_ENTRY_create_by_NID(), | 47 | X509_NAME_ENTRY_create_by_txt(), X509_NAME_ENTRY_create_by_NID(), |
48 | and X509_NAME_ENTRY_create_by_OBJ() create and return an | 48 | and X509_NAME_ENTRY_create_by_OBJ() create and return an |
49 | 49 | ||
50 | X509_NAME_ENTRY_create_by_txt(), X509_NAME_ENTRY_create_by_OBJ(), | 50 | X509_NAME_ENTRY_create_by_txt(), X509_NAME_ENTRY_create_by_OBJ(), |
51 | X509_NAME_ENTRY_create_by_NID() and X509_NAME_ENTRY_set_data() | 51 | X509_NAME_ENTRY_create_by_NID() and X509_NAME_ENTRY_set_data() |
diff --git a/src/lib/libssl/src/doc/crypto/X509_NAME_add_entry_by_txt.pod b/src/lib/libssl/src/doc/crypto/X509_NAME_add_entry_by_txt.pod index 1afd008cb3..5b9e81b922 100644 --- a/src/lib/libssl/src/doc/crypto/X509_NAME_add_entry_by_txt.pod +++ b/src/lib/libssl/src/doc/crypto/X509_NAME_add_entry_by_txt.pod | |||
@@ -61,7 +61,7 @@ to 0. This adds a new entry to the end of B<name> as a single valued | |||
61 | RelativeDistinguishedName (RDN). | 61 | RelativeDistinguishedName (RDN). |
62 | 62 | ||
63 | B<loc> actually determines the index where the new entry is inserted: | 63 | B<loc> actually determines the index where the new entry is inserted: |
64 | if it is -1 it is appended. | 64 | if it is -1 it is appended. |
65 | 65 | ||
66 | B<set> determines how the new type is added. If it is zero a | 66 | B<set> determines how the new type is added. If it is zero a |
67 | new RDN is created. | 67 | new RDN is created. |
diff --git a/src/lib/libssl/src/doc/crypto/X509_NAME_get_index_by_NID.pod b/src/lib/libssl/src/doc/crypto/X509_NAME_get_index_by_NID.pod index 3b1f9ff43b..7da92617fb 100644 --- a/src/lib/libssl/src/doc/crypto/X509_NAME_get_index_by_NID.pod +++ b/src/lib/libssl/src/doc/crypto/X509_NAME_get_index_by_NID.pod | |||
@@ -43,7 +43,7 @@ B<obj>, if no such entry exists -1 is returned. At most B<len> bytes | |||
43 | will be written and the text written to B<buf> will be null | 43 | will be written and the text written to B<buf> will be null |
44 | terminated. The length of the output string written is returned | 44 | terminated. The length of the output string written is returned |
45 | excluding the terminating null. If B<buf> is <NULL> then the amount | 45 | excluding the terminating null. If B<buf> is <NULL> then the amount |
46 | of space needed in B<buf> (excluding the final null) is returned. | 46 | of space needed in B<buf> (excluding the final null) is returned. |
47 | 47 | ||
48 | =head1 NOTES | 48 | =head1 NOTES |
49 | 49 | ||
diff --git a/src/lib/libssl/src/doc/crypto/X509_NAME_print_ex.pod b/src/lib/libssl/src/doc/crypto/X509_NAME_print_ex.pod index 2579a5dc9d..b2d86d4ddb 100644 --- a/src/lib/libssl/src/doc/crypto/X509_NAME_print_ex.pod +++ b/src/lib/libssl/src/doc/crypto/X509_NAME_print_ex.pod | |||
@@ -27,7 +27,7 @@ X509_NAME_oneline() prints an ASCII version of B<a> to B<buf>. At most B<size> | |||
27 | bytes will be written. If B<buf> is B<NULL> then a buffer is dynamically allocated | 27 | bytes will be written. If B<buf> is B<NULL> then a buffer is dynamically allocated |
28 | and returned, otherwise B<buf> is returned. | 28 | and returned, otherwise B<buf> is returned. |
29 | 29 | ||
30 | X509_NAME_print() prints out B<name> to B<bp> indenting each line by B<obase> | 30 | X509_NAME_print() prints out B<name> to B<bp> indenting each line by B<obase> |
31 | characters. Multiple lines are used if the output (including indent) exceeds | 31 | characters. Multiple lines are used if the output (including indent) exceeds |
32 | 80 characters. | 32 | 80 characters. |
33 | 33 | ||
@@ -76,7 +76,7 @@ printed instead of the values. | |||
76 | If B<XN_FLAG_FN_ALIGN> is set then field names are padded to 20 characters: this | 76 | If B<XN_FLAG_FN_ALIGN> is set then field names are padded to 20 characters: this |
77 | is only of use for multiline format. | 77 | is only of use for multiline format. |
78 | 78 | ||
79 | Additionally all the options supported by ASN1_STRING_print_ex() can be used to | 79 | Additionally all the options supported by ASN1_STRING_print_ex() can be used to |
80 | control how each field value is displayed. | 80 | control how each field value is displayed. |
81 | 81 | ||
82 | In addition a number options can be set for commonly used formats. | 82 | In addition a number options can be set for commonly used formats. |
diff --git a/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_get_ex_new_index.pod b/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_get_ex_new_index.pod index 8d6b9dda47..1b75967ccd 100644 --- a/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_get_ex_new_index.pod +++ b/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_get_ex_new_index.pod | |||
@@ -27,7 +27,7 @@ and RSA_get_ex_data() as described in L<RSA_get_ex_new_index(3)>. | |||
27 | 27 | ||
28 | This mechanism is used internally by the B<ssl> library to store the B<SSL> | 28 | This mechanism is used internally by the B<ssl> library to store the B<SSL> |
29 | structure associated with a verification operation in an B<X509_STORE_CTX> | 29 | structure associated with a verification operation in an B<X509_STORE_CTX> |
30 | structure. | 30 | structure. |
31 | 31 | ||
32 | =head1 SEE ALSO | 32 | =head1 SEE ALSO |
33 | 33 | ||
diff --git a/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_new.pod b/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_new.pod index b17888f149..1c55236aa2 100644 --- a/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_new.pod +++ b/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_new.pod | |||
@@ -45,7 +45,7 @@ will be untrusted but may be used to build the chain) in B<chain>. Any or | |||
45 | all of the B<store>, B<x509> and B<chain> parameters can be B<NULL>. | 45 | all of the B<store>, B<x509> and B<chain> parameters can be B<NULL>. |
46 | 46 | ||
47 | X509_STORE_CTX_trusted_stack() sets the set of trusted certificates of B<ctx> | 47 | X509_STORE_CTX_trusted_stack() sets the set of trusted certificates of B<ctx> |
48 | to B<sk>. This is an alternative way of specifying trusted certificates | 48 | to B<sk>. This is an alternative way of specifying trusted certificates |
49 | instead of using an B<X509_STORE>. | 49 | instead of using an B<X509_STORE>. |
50 | 50 | ||
51 | X509_STORE_CTX_set_cert() sets the certificate to be vertified in B<ctx> to | 51 | X509_STORE_CTX_set_cert() sets the certificate to be vertified in B<ctx> to |
diff --git a/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_set_verify_cb.pod b/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_set_verify_cb.pod index b9787a6ca6..86d988eee0 100644 --- a/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_set_verify_cb.pod +++ b/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_set_verify_cb.pod | |||
@@ -94,7 +94,7 @@ expired just one specific case: | |||
94 | Full featured logging callback. In this case the B<bio_err> is assumed to be | 94 | Full featured logging callback. In this case the B<bio_err> is assumed to be |
95 | a global logging B<BIO>, an alternative would to store a BIO in B<ctx> using | 95 | a global logging B<BIO>, an alternative would to store a BIO in B<ctx> using |
96 | B<ex_data>. | 96 | B<ex_data>. |
97 | 97 | ||
98 | int verify_callback(int ok, X509_STORE_CTX *ctx) | 98 | int verify_callback(int ok, X509_STORE_CTX *ctx) |
99 | { | 99 | { |
100 | X509 *err_cert; | 100 | X509 *err_cert; |
diff --git a/src/lib/libssl/src/doc/crypto/X509_STORE_set_verify_cb_func.pod b/src/lib/libssl/src/doc/crypto/X509_STORE_set_verify_cb_func.pod index 29e3bbe3bc..012f2d2c75 100644 --- a/src/lib/libssl/src/doc/crypto/X509_STORE_set_verify_cb_func.pod +++ b/src/lib/libssl/src/doc/crypto/X509_STORE_set_verify_cb_func.pod | |||
@@ -24,14 +24,14 @@ is implemented as a macro. | |||
24 | 24 | ||
25 | =head1 NOTES | 25 | =head1 NOTES |
26 | 26 | ||
27 | The verification callback from an B<X509_STORE> is inherited by | 27 | The verification callback from an B<X509_STORE> is inherited by |
28 | the corresponding B<X509_STORE_CTX> structure when it is initialized. This can | 28 | the corresponding B<X509_STORE_CTX> structure when it is initialized. This can |
29 | be used to set the verification callback when the B<X509_STORE_CTX> is | 29 | be used to set the verification callback when the B<X509_STORE_CTX> is |
30 | otherwise inaccessible (for example during S/MIME verification). | 30 | otherwise inaccessible (for example during S/MIME verification). |
31 | 31 | ||
32 | =head1 BUGS | 32 | =head1 BUGS |
33 | 33 | ||
34 | The macro version of this function was the only one available before | 34 | The macro version of this function was the only one available before |
35 | OpenSSL 1.0.0. | 35 | OpenSSL 1.0.0. |
36 | 36 | ||
37 | =head1 RETURN VALUES | 37 | =head1 RETURN VALUES |
diff --git a/src/lib/libssl/src/doc/crypto/X509_VERIFY_PARAM_set_flags.pod b/src/lib/libssl/src/doc/crypto/X509_VERIFY_PARAM_set_flags.pod index 46cac2bea2..e5da5bec08 100644 --- a/src/lib/libssl/src/doc/crypto/X509_VERIFY_PARAM_set_flags.pod +++ b/src/lib/libssl/src/doc/crypto/X509_VERIFY_PARAM_set_flags.pod | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | =head1 NAME | 3 | =head1 NAME |
4 | 4 | ||
5 | X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_get_flags, X509_VERIFY_PARAM_set_purpose, X509_VERIFY_PARAM_set_trust, X509_VERIFY_PARAM_set_depth, X509_VERIFY_PARAM_get_depth, X509_VERIFY_PARAM_set_time, X509_VERIFY_PARAM_add0_policy, X509_VERIFY_PARAM_set1_policies - X509 verification parameters | 5 | X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_get_flags, X509_VERIFY_PARAM_set_purpose, X509_VERIFY_PARAM_set_trust, X509_VERIFY_PARAM_set_depth, X509_VERIFY_PARAM_get_depth, X509_VERIFY_PARAM_set_time, X509_VERIFY_PARAM_add0_policy, X509_VERIFY_PARAM_set1_policies - X509 verification parameters |
6 | 6 | ||
7 | =head1 SYNOPSIS | 7 | =head1 SYNOPSIS |
8 | 8 | ||
@@ -20,7 +20,7 @@ X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_ge | |||
20 | 20 | ||
21 | int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param, | 21 | int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param, |
22 | ASN1_OBJECT *policy); | 22 | ASN1_OBJECT *policy); |
23 | int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param, | 23 | int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param, |
24 | STACK_OF(ASN1_OBJECT) *policies); | 24 | STACK_OF(ASN1_OBJECT) *policies); |
25 | 25 | ||
26 | void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth); | 26 | void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth); |
@@ -29,7 +29,7 @@ X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_ge | |||
29 | =head1 DESCRIPTION | 29 | =head1 DESCRIPTION |
30 | 30 | ||
31 | These functions manipulate the B<X509_VERIFY_PARAM> structure associated with | 31 | These functions manipulate the B<X509_VERIFY_PARAM> structure associated with |
32 | a certificate verification operation. | 32 | a certificate verification operation. |
33 | 33 | ||
34 | The X509_VERIFY_PARAM_set_flags() function sets the flags in B<param> by oring | 34 | The X509_VERIFY_PARAM_set_flags() function sets the flags in B<param> by oring |
35 | it with B<flags>. See the B<VERIFICATION FLAGS> section for a complete | 35 | it with B<flags>. See the B<VERIFICATION FLAGS> section for a complete |
@@ -43,7 +43,7 @@ X509_VERIFY_PARAM_set_purpose() sets the verification purpose in B<param> | |||
43 | to B<purpose>. This determines the acceptable purpose of the certificate | 43 | to B<purpose>. This determines the acceptable purpose of the certificate |
44 | chain, for example SSL client or SSL server. | 44 | chain, for example SSL client or SSL server. |
45 | 45 | ||
46 | X509_VERIFY_PARAM_set_trust() sets the trust setting in B<param> to | 46 | X509_VERIFY_PARAM_set_trust() sets the trust setting in B<param> to |
47 | B<trust>. | 47 | B<trust>. |
48 | 48 | ||
49 | X509_VERIFY_PARAM_set_time() sets the verification time in B<param> to | 49 | X509_VERIFY_PARAM_set_time() sets the verification time in B<param> to |
@@ -63,10 +63,10 @@ chain. | |||
63 | 63 | ||
64 | =head1 RETURN VALUES | 64 | =head1 RETURN VALUES |
65 | 65 | ||
66 | X509_VERIFY_PARAM_set_flags(), X509_VERIFY_PARAM_clear_flags(), | 66 | X509_VERIFY_PARAM_set_flags(), X509_VERIFY_PARAM_clear_flags(), |
67 | X509_VERIFY_PARAM_set_purpose(), X509_VERIFY_PARAM_set_trust(), | 67 | X509_VERIFY_PARAM_set_purpose(), X509_VERIFY_PARAM_set_trust(), |
68 | X509_VERIFY_PARAM_add0_policy() and X509_VERIFY_PARAM_set1_policies() return 1 | 68 | X509_VERIFY_PARAM_add0_policy() and X509_VERIFY_PARAM_set1_policies() return 1 |
69 | for success and 0 for failure. | 69 | for success and 0 for failure. |
70 | 70 | ||
71 | X509_VERIFY_PARAM_get_flags() returns the current verification flags. | 71 | X509_VERIFY_PARAM_get_flags() returns the current verification flags. |
72 | 72 | ||
@@ -81,7 +81,7 @@ The verification flags consists of zero or more of the following flags | |||
81 | ored together. | 81 | ored together. |
82 | 82 | ||
83 | B<X509_V_FLAG_CRL_CHECK> enables CRL checking for the certificate chain leaf | 83 | B<X509_V_FLAG_CRL_CHECK> enables CRL checking for the certificate chain leaf |
84 | certificate. An error occurs if a suitable CRL cannot be found. | 84 | certificate. An error occurs if a suitable CRL cannot be found. |
85 | 85 | ||
86 | B<X509_V_FLAG_CRL_CHECK_ALL> enables CRL checking for the entire certificate | 86 | B<X509_V_FLAG_CRL_CHECK_ALL> enables CRL checking for the entire certificate |
87 | chain. | 87 | chain. |
@@ -99,7 +99,7 @@ certificates and makes the verification strictly apply B<X509> rules. | |||
99 | B<X509_V_FLAG_ALLOW_PROXY_CERTS> enables proxy certificate verification. | 99 | B<X509_V_FLAG_ALLOW_PROXY_CERTS> enables proxy certificate verification. |
100 | 100 | ||
101 | B<X509_V_FLAG_POLICY_CHECK> enables certificate policy checking, by default | 101 | B<X509_V_FLAG_POLICY_CHECK> enables certificate policy checking, by default |
102 | no policy checking is peformed. Additional information is sent to the | 102 | no policy checking is peformed. Additional information is sent to the |
103 | verification callback relating to policy checking. | 103 | verification callback relating to policy checking. |
104 | 104 | ||
105 | B<X509_V_FLAG_EXPLICIT_POLICY>, B<X509_V_FLAG_INHIBIT_ANY> and | 105 | B<X509_V_FLAG_EXPLICIT_POLICY>, B<X509_V_FLAG_INHIBIT_ANY> and |
@@ -142,7 +142,7 @@ X509_STORE_CTX_set_flags(). | |||
142 | =head1 BUGS | 142 | =head1 BUGS |
143 | 143 | ||
144 | Delta CRL checking is currently primitive. Only a single delta can be used and | 144 | Delta CRL checking is currently primitive. Only a single delta can be used and |
145 | (partly due to limitations of B<X509_STORE>) constructed CRLs are not | 145 | (partly due to limitations of B<X509_STORE>) constructed CRLs are not |
146 | maintained. | 146 | maintained. |
147 | 147 | ||
148 | If CRLs checking is enable CRLs are expected to be available in the | 148 | If CRLs checking is enable CRLs are expected to be available in the |
@@ -151,7 +151,7 @@ CRLs from the CRL distribution points extension. | |||
151 | 151 | ||
152 | =head1 EXAMPLE | 152 | =head1 EXAMPLE |
153 | 153 | ||
154 | Enable CRL checking when performing certificate verification during SSL | 154 | Enable CRL checking when performing certificate verification during SSL |
155 | connections associated with an B<SSL_CTX> structure B<ctx>: | 155 | connections associated with an B<SSL_CTX> structure B<ctx>: |
156 | 156 | ||
157 | X509_VERIFY_PARAM *param; | 157 | X509_VERIFY_PARAM *param; |
diff --git a/src/lib/libssl/src/doc/crypto/bn_internal.pod b/src/lib/libssl/src/doc/crypto/bn_internal.pod index 91840b0f0d..7d4dac9ccf 100644 --- a/src/lib/libssl/src/doc/crypto/bn_internal.pod +++ b/src/lib/libssl/src/doc/crypto/bn_internal.pod | |||
@@ -95,8 +95,8 @@ is the number of words being used, so for a value of 4, bn.d[0]=4 and | |||
95 | bn.top=1. B<neg> is 1 if the number is negative. When a B<BIGNUM> is | 95 | bn.top=1. B<neg> is 1 if the number is negative. When a B<BIGNUM> is |
96 | B<0>, the B<d> field can be B<NULL> and B<top> == B<0>. | 96 | B<0>, the B<d> field can be B<NULL> and B<top> == B<0>. |
97 | 97 | ||
98 | B<flags> is a bit field of flags which are defined in C<openssl/bn.h>. The | 98 | B<flags> is a bit field of flags which are defined in C<openssl/bn.h>. The |
99 | flags begin with B<BN_FLG_>. The macros BN_set_flags(b,n) and | 99 | flags begin with B<BN_FLG_>. The macros BN_set_flags(b,n) and |
100 | BN_get_flags(b,n) exist to enable or fetch flag(s) B<n> from B<BIGNUM> | 100 | BN_get_flags(b,n) exist to enable or fetch flag(s) B<n> from B<BIGNUM> |
101 | structure B<b>. | 101 | structure B<b>. |
102 | 102 | ||
diff --git a/src/lib/libssl/src/doc/crypto/crypto.pod b/src/lib/libssl/src/doc/crypto/crypto.pod index 7a527992bb..3c4a07d906 100644 --- a/src/lib/libssl/src/doc/crypto/crypto.pod +++ b/src/lib/libssl/src/doc/crypto/crypto.pod | |||
@@ -28,7 +28,7 @@ hash functions and a cryptographic pseudo-random number generator. | |||
28 | =item SYMMETRIC CIPHERS | 28 | =item SYMMETRIC CIPHERS |
29 | 29 | ||
30 | L<blowfish(3)|blowfish(3)>, L<cast(3)|cast(3)>, L<des(3)|des(3)>, | 30 | L<blowfish(3)|blowfish(3)>, L<cast(3)|cast(3)>, L<des(3)|des(3)>, |
31 | L<idea(3)|idea(3)>, L<rc2(3)|rc2(3)>, L<rc4(3)|rc4(3)>, L<rc5(3)|rc5(3)> | 31 | L<idea(3)|idea(3)>, L<rc2(3)|rc2(3)>, L<rc4(3)|rc4(3)>, L<rc5(3)|rc5(3)> |
32 | 32 | ||
33 | =item PUBLIC KEY CRYPTOGRAPHY AND KEY AGREEMENT | 33 | =item PUBLIC KEY CRYPTOGRAPHY AND KEY AGREEMENT |
34 | 34 | ||
@@ -52,13 +52,13 @@ L<OPENSSL_VERSION_NUMBER(3)|OPENSSL_VERSION_NUMBER(3)> | |||
52 | =item INPUT/OUTPUT, DATA ENCODING | 52 | =item INPUT/OUTPUT, DATA ENCODING |
53 | 53 | ||
54 | L<asn1(3)|asn1(3)>, L<bio(3)|bio(3)>, L<evp(3)|evp(3)>, L<pem(3)|pem(3)>, | 54 | L<asn1(3)|asn1(3)>, L<bio(3)|bio(3)>, L<evp(3)|evp(3)>, L<pem(3)|pem(3)>, |
55 | L<pkcs7(3)|pkcs7(3)>, L<pkcs12(3)|pkcs12(3)> | 55 | L<pkcs7(3)|pkcs7(3)>, L<pkcs12(3)|pkcs12(3)> |
56 | 56 | ||
57 | =item INTERNAL FUNCTIONS | 57 | =item INTERNAL FUNCTIONS |
58 | 58 | ||
59 | L<bn(3)|bn(3)>, L<buffer(3)|buffer(3)>, L<lhash(3)|lhash(3)>, | 59 | L<bn(3)|bn(3)>, L<buffer(3)|buffer(3)>, L<lhash(3)|lhash(3)>, |
60 | L<objects(3)|objects(3)>, L<stack(3)|stack(3)>, | 60 | L<objects(3)|objects(3)>, L<stack(3)|stack(3)>, |
61 | L<txt_db(3)|txt_db(3)> | 61 | L<txt_db(3)|txt_db(3)> |
62 | 62 | ||
63 | =back | 63 | =back |
64 | 64 | ||
diff --git a/src/lib/libssl/src/doc/crypto/d2i_DSAPublicKey.pod b/src/lib/libssl/src/doc/crypto/d2i_DSAPublicKey.pod index 22c1b50f22..c80e311d04 100644 --- a/src/lib/libssl/src/doc/crypto/d2i_DSAPublicKey.pod +++ b/src/lib/libssl/src/doc/crypto/d2i_DSAPublicKey.pod | |||
@@ -56,7 +56,7 @@ i2d_X509() described in the L<d2i_X509(3)|d2i_X509(3)> manual page. | |||
56 | The B<DSA> structure passed to the private key encoding functions should have | 56 | The B<DSA> structure passed to the private key encoding functions should have |
57 | all the private key components present. | 57 | all the private key components present. |
58 | 58 | ||
59 | The data encoded by the private key functions is unencrypted and therefore | 59 | The data encoded by the private key functions is unencrypted and therefore |
60 | offers no private key security. | 60 | offers no private key security. |
61 | 61 | ||
62 | The B<DSA_PUBKEY> functions should be used in preference to the B<DSAPublicKey> | 62 | The B<DSA_PUBKEY> functions should be used in preference to the B<DSAPublicKey> |
diff --git a/src/lib/libssl/src/doc/crypto/d2i_PKCS8PrivateKey.pod b/src/lib/libssl/src/doc/crypto/d2i_PKCS8PrivateKey.pod index a54b779088..466f99ab42 100644 --- a/src/lib/libssl/src/doc/crypto/d2i_PKCS8PrivateKey.pod +++ b/src/lib/libssl/src/doc/crypto/d2i_PKCS8PrivateKey.pod | |||
@@ -41,7 +41,7 @@ corresponding B<PEM> function as described in the L<pem(3)|pem(3)> manual page. | |||
41 | 41 | ||
42 | Before using these functions L<OpenSSL_add_all_algorithms(3)|OpenSSL_add_all_algorithms(3)> | 42 | Before using these functions L<OpenSSL_add_all_algorithms(3)|OpenSSL_add_all_algorithms(3)> |
43 | should be called to initialize the internal algorithm lookup tables otherwise errors about | 43 | should be called to initialize the internal algorithm lookup tables otherwise errors about |
44 | unknown algorithms will occur if an attempt is made to decrypt a private key. | 44 | unknown algorithms will occur if an attempt is made to decrypt a private key. |
45 | 45 | ||
46 | These functions are currently the only way to store encrypted private keys using DER format. | 46 | These functions are currently the only way to store encrypted private keys using DER format. |
47 | 47 | ||
diff --git a/src/lib/libssl/src/doc/crypto/d2i_RSAPublicKey.pod b/src/lib/libssl/src/doc/crypto/d2i_RSAPublicKey.pod index aa6078bcf6..1711dc038f 100644 --- a/src/lib/libssl/src/doc/crypto/d2i_RSAPublicKey.pod +++ b/src/lib/libssl/src/doc/crypto/d2i_RSAPublicKey.pod | |||
@@ -49,8 +49,8 @@ i2d_X509() described in the L<d2i_X509(3)|d2i_X509(3)> manual page. | |||
49 | The B<RSA> structure passed to the private key encoding functions should have | 49 | The B<RSA> structure passed to the private key encoding functions should have |
50 | all the PKCS#1 private key components present. | 50 | all the PKCS#1 private key components present. |
51 | 51 | ||
52 | The data encoded by the private key functions is unencrypted and therefore | 52 | The data encoded by the private key functions is unencrypted and therefore |
53 | offers no private key security. | 53 | offers no private key security. |
54 | 54 | ||
55 | The NET format functions are present to provide compatibility with certain very | 55 | The NET format functions are present to provide compatibility with certain very |
56 | old software. This format has some severe security weaknesses and should be | 56 | old software. This format has some severe security weaknesses and should be |
diff --git a/src/lib/libssl/src/doc/crypto/d2i_X509.pod b/src/lib/libssl/src/doc/crypto/d2i_X509.pod index 298ec54a4c..e212014ac8 100644 --- a/src/lib/libssl/src/doc/crypto/d2i_X509.pod +++ b/src/lib/libssl/src/doc/crypto/d2i_X509.pod | |||
@@ -23,7 +23,7 @@ i2d_X509_fp - X509 encode and decode functions | |||
23 | The X509 encode and decode routines encode and parse an | 23 | The X509 encode and decode routines encode and parse an |
24 | B<X509> structure, which represents an X509 certificate. | 24 | B<X509> structure, which represents an X509 certificate. |
25 | 25 | ||
26 | d2i_X509() attempts to decode B<len> bytes at B<*in>. If | 26 | d2i_X509() attempts to decode B<len> bytes at B<*in>. If |
27 | successful a pointer to the B<X509> structure is returned. If an error | 27 | successful a pointer to the B<X509> structure is returned. If an error |
28 | occurred then B<NULL> is returned. If B<px> is not B<NULL> then the | 28 | occurred then B<NULL> is returned. If B<px> is not B<NULL> then the |
29 | returned structure is written to B<*px>. If B<*px> is not B<NULL> | 29 | returned structure is written to B<*px>. If B<*px> is not B<NULL> |
@@ -36,7 +36,7 @@ i2d_X509() encodes the structure pointed to by B<x> into DER format. | |||
36 | If B<out> is not B<NULL> is writes the DER encoded data to the buffer | 36 | If B<out> is not B<NULL> is writes the DER encoded data to the buffer |
37 | at B<*out>, and increments it to point after the data just written. | 37 | at B<*out>, and increments it to point after the data just written. |
38 | If the return value is negative an error occurred, otherwise it | 38 | If the return value is negative an error occurred, otherwise it |
39 | returns the length of the encoded data. | 39 | returns the length of the encoded data. |
40 | 40 | ||
41 | For OpenSSL 0.9.7 and later if B<*out> is B<NULL> memory will be | 41 | For OpenSSL 0.9.7 and later if B<*out> is B<NULL> memory will be |
42 | allocated for a buffer and the encoded data written to it. In this | 42 | allocated for a buffer and the encoded data written to it. In this |
@@ -194,7 +194,7 @@ happen. | |||
194 | 194 | ||
195 | =head1 BUGS | 195 | =head1 BUGS |
196 | 196 | ||
197 | In some versions of OpenSSL the "reuse" behaviour of d2i_X509() when | 197 | In some versions of OpenSSL the "reuse" behaviour of d2i_X509() when |
198 | B<*px> is valid is broken and some parts of the reused structure may | 198 | B<*px> is valid is broken and some parts of the reused structure may |
199 | persist if they are not present in the new one. As a result the use | 199 | persist if they are not present in the new one. As a result the use |
200 | of this "reuse" behaviour is strongly discouraged. | 200 | of this "reuse" behaviour is strongly discouraged. |
@@ -210,14 +210,14 @@ always succeed. | |||
210 | 210 | ||
211 | d2i_X509(), d2i_X509_bio() and d2i_X509_fp() return a valid B<X509> structure | 211 | d2i_X509(), d2i_X509_bio() and d2i_X509_fp() return a valid B<X509> structure |
212 | or B<NULL> if an error occurs. The error code that can be obtained by | 212 | or B<NULL> if an error occurs. The error code that can be obtained by |
213 | L<ERR_get_error(3)|ERR_get_error(3)>. | 213 | L<ERR_get_error(3)|ERR_get_error(3)>. |
214 | 214 | ||
215 | i2d_X509() returns the number of bytes successfully encoded or a negative | 215 | i2d_X509() returns the number of bytes successfully encoded or a negative |
216 | value if an error occurs. The error code can be obtained by | 216 | value if an error occurs. The error code can be obtained by |
217 | L<ERR_get_error(3)|ERR_get_error(3)>. | 217 | L<ERR_get_error(3)|ERR_get_error(3)>. |
218 | 218 | ||
219 | i2d_X509_bio() and i2d_X509_fp() return 1 for success and 0 if an error | 219 | i2d_X509_bio() and i2d_X509_fp() return 1 for success and 0 if an error |
220 | occurs The error code can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. | 220 | occurs The error code can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. |
221 | 221 | ||
222 | =head1 SEE ALSO | 222 | =head1 SEE ALSO |
223 | 223 | ||
diff --git a/src/lib/libssl/src/doc/crypto/dh.pod b/src/lib/libssl/src/doc/crypto/dh.pod index c3ccd06207..97aaa75731 100644 --- a/src/lib/libssl/src/doc/crypto/dh.pod +++ b/src/lib/libssl/src/doc/crypto/dh.pod | |||
@@ -73,6 +73,6 @@ L<DH_set_method(3)|DH_set_method(3)>, L<DH_new(3)|DH_new(3)>, | |||
73 | L<DH_get_ex_new_index(3)|DH_get_ex_new_index(3)>, | 73 | L<DH_get_ex_new_index(3)|DH_get_ex_new_index(3)>, |
74 | L<DH_generate_parameters(3)|DH_generate_parameters(3)>, | 74 | L<DH_generate_parameters(3)|DH_generate_parameters(3)>, |
75 | L<DH_compute_key(3)|DH_compute_key(3)>, L<d2i_DHparams(3)|d2i_DHparams(3)>, | 75 | L<DH_compute_key(3)|DH_compute_key(3)>, L<d2i_DHparams(3)|d2i_DHparams(3)>, |
76 | L<RSA_print(3)|RSA_print(3)> | 76 | L<RSA_print(3)|RSA_print(3)> |
77 | 77 | ||
78 | =cut | 78 | =cut |
diff --git a/src/lib/libssl/src/doc/crypto/ecdsa.pod b/src/lib/libssl/src/doc/crypto/ecdsa.pod index 59a5916de1..92c3f4fa04 100644 --- a/src/lib/libssl/src/doc/crypto/ecdsa.pod +++ b/src/lib/libssl/src/doc/crypto/ecdsa.pod | |||
@@ -11,12 +11,12 @@ ecdsa - Elliptic Curve Digital Signature Algorithm | |||
11 | ECDSA_SIG* ECDSA_SIG_new(void); | 11 | ECDSA_SIG* ECDSA_SIG_new(void); |
12 | void ECDSA_SIG_free(ECDSA_SIG *sig); | 12 | void ECDSA_SIG_free(ECDSA_SIG *sig); |
13 | int i2d_ECDSA_SIG(const ECDSA_SIG *sig, unsigned char **pp); | 13 | int i2d_ECDSA_SIG(const ECDSA_SIG *sig, unsigned char **pp); |
14 | ECDSA_SIG* d2i_ECDSA_SIG(ECDSA_SIG **sig, const unsigned char **pp, | 14 | ECDSA_SIG* d2i_ECDSA_SIG(ECDSA_SIG **sig, const unsigned char **pp, |
15 | long len); | 15 | long len); |
16 | 16 | ||
17 | ECDSA_SIG* ECDSA_do_sign(const unsigned char *dgst, int dgst_len, | 17 | ECDSA_SIG* ECDSA_do_sign(const unsigned char *dgst, int dgst_len, |
18 | EC_KEY *eckey); | 18 | EC_KEY *eckey); |
19 | ECDSA_SIG* ECDSA_do_sign_ex(const unsigned char *dgst, int dgstlen, | 19 | ECDSA_SIG* ECDSA_do_sign_ex(const unsigned char *dgst, int dgstlen, |
20 | const BIGNUM *kinv, const BIGNUM *rp, | 20 | const BIGNUM *kinv, const BIGNUM *rp, |
21 | EC_KEY *eckey); | 21 | EC_KEY *eckey); |
22 | int ECDSA_do_verify(const unsigned char *dgst, int dgst_len, | 22 | int ECDSA_do_verify(const unsigned char *dgst, int dgst_len, |
@@ -28,7 +28,7 @@ ecdsa - Elliptic Curve Digital Signature Algorithm | |||
28 | unsigned int *siglen, EC_KEY *eckey); | 28 | unsigned int *siglen, EC_KEY *eckey); |
29 | int ECDSA_sign_ex(int type, const unsigned char *dgst, | 29 | int ECDSA_sign_ex(int type, const unsigned char *dgst, |
30 | int dgstlen, unsigned char *sig, | 30 | int dgstlen, unsigned char *sig, |
31 | unsigned int *siglen, const BIGNUM *kinv, | 31 | unsigned int *siglen, const BIGNUM *kinv, |
32 | const BIGNUM *rp, EC_KEY *eckey); | 32 | const BIGNUM *rp, EC_KEY *eckey); |
33 | int ECDSA_verify(int type, const unsigned char *dgst, | 33 | int ECDSA_verify(int type, const unsigned char *dgst, |
34 | int dgstlen, const unsigned char *sig, | 34 | int dgstlen, const unsigned char *sig, |
@@ -65,7 +65,7 @@ ECDSA_SIG_free() frees the B<ECDSA_SIG> structure B<sig>. | |||
65 | 65 | ||
66 | i2d_ECDSA_SIG() creates the DER encoding of the ECDSA signature | 66 | i2d_ECDSA_SIG() creates the DER encoding of the ECDSA signature |
67 | B<sig> and writes the encoded signature to B<*pp> (note: if B<pp> | 67 | B<sig> and writes the encoded signature to B<*pp> (note: if B<pp> |
68 | is NULL B<i2d_ECDSA_SIG> returns the expected length in bytes of | 68 | is NULL B<i2d_ECDSA_SIG> returns the expected length in bytes of |
69 | the DER encoded signature). B<i2d_ECDSA_SIG> returns the length | 69 | the DER encoded signature). B<i2d_ECDSA_SIG> returns the length |
70 | of the DER encoded signature (or 0 on error). | 70 | of the DER encoded signature (or 0 on error). |
71 | 71 | ||
@@ -142,8 +142,8 @@ specific) | |||
142 | /* error */ | 142 | /* error */ |
143 | } | 143 | } |
144 | 144 | ||
145 | Second step: compute the ECDSA signature of a SHA-1 hash value | 145 | Second step: compute the ECDSA signature of a SHA-1 hash value |
146 | using B<ECDSA_do_sign> | 146 | using B<ECDSA_do_sign> |
147 | 147 | ||
148 | sig = ECDSA_do_sign(digest, 20, eckey); | 148 | sig = ECDSA_do_sign(digest, 20, eckey); |
149 | if (sig == NULL) | 149 | if (sig == NULL) |
diff --git a/src/lib/libssl/src/doc/crypto/evp.pod b/src/lib/libssl/src/doc/crypto/evp.pod index 9faa349243..33ce7cb6d6 100644 --- a/src/lib/libssl/src/doc/crypto/evp.pod +++ b/src/lib/libssl/src/doc/crypto/evp.pod | |||
@@ -37,7 +37,7 @@ implementations. For more information, consult the engine(3) man page. | |||
37 | Although low level algorithm specific functions exist for many algorithms | 37 | Although low level algorithm specific functions exist for many algorithms |
38 | their use is discouraged. They cannot be used with an ENGINE and ENGINE | 38 | their use is discouraged. They cannot be used with an ENGINE and ENGINE |
39 | versions of new algorithms cannot be accessed using the low level functions. | 39 | versions of new algorithms cannot be accessed using the low level functions. |
40 | Also makes code harder to adapt to new algorithms and some options are not | 40 | Also makes code harder to adapt to new algorithms and some options are not |
41 | cleanly supported at the low level and some operations are more efficient | 41 | cleanly supported at the low level and some operations are more efficient |
42 | using the high level interface. | 42 | using the high level interface. |
43 | 43 | ||
diff --git a/src/lib/libssl/src/doc/crypto/lhash.pod b/src/lib/libssl/src/doc/crypto/lhash.pod index 73a19b6c7e..b5c8a10282 100644 --- a/src/lib/libssl/src/doc/crypto/lhash.pod +++ b/src/lib/libssl/src/doc/crypto/lhash.pod | |||
@@ -168,7 +168,7 @@ that is provided by the caller): | |||
168 | /* Print out the entire hashtable to a particular BIO */ | 168 | /* Print out the entire hashtable to a particular BIO */ |
169 | lh_STUFF_doall_arg(hashtable, LHASH_DOALL_ARG_FN(STUFF_print), BIO, | 169 | lh_STUFF_doall_arg(hashtable, LHASH_DOALL_ARG_FN(STUFF_print), BIO, |
170 | logging_bio); | 170 | logging_bio); |
171 | 171 | ||
172 | lh_<type>_error() can be used to determine if an error occurred in the last | 172 | lh_<type>_error() can be used to determine if an error occurred in the last |
173 | operation. lh_<type>_error() is a macro. | 173 | operation. lh_<type>_error() is a macro. |
174 | 174 | ||
@@ -293,7 +293,7 @@ This manpage is derived from the SSLeay documentation. | |||
293 | 293 | ||
294 | In OpenSSL 0.9.7, all lhash functions that were passed function pointers | 294 | In OpenSSL 0.9.7, all lhash functions that were passed function pointers |
295 | were changed for better type safety, and the function types LHASH_COMP_FN_TYPE, | 295 | were changed for better type safety, and the function types LHASH_COMP_FN_TYPE, |
296 | LHASH_HASH_FN_TYPE, LHASH_DOALL_FN_TYPE and LHASH_DOALL_ARG_FN_TYPE | 296 | LHASH_HASH_FN_TYPE, LHASH_DOALL_FN_TYPE and LHASH_DOALL_ARG_FN_TYPE |
297 | became available. | 297 | became available. |
298 | 298 | ||
299 | In OpenSSL 1.0.0, the lhash interface was revamped for even better | 299 | In OpenSSL 1.0.0, the lhash interface was revamped for even better |
diff --git a/src/lib/libssl/src/doc/crypto/rsa.pod b/src/lib/libssl/src/doc/crypto/rsa.pod index 45ac53ffc1..829ce24701 100644 --- a/src/lib/libssl/src/doc/crypto/rsa.pod +++ b/src/lib/libssl/src/doc/crypto/rsa.pod | |||
@@ -18,7 +18,7 @@ rsa - RSA public key cryptosystem | |||
18 | unsigned char *to, RSA *rsa, int padding); | 18 | unsigned char *to, RSA *rsa, int padding); |
19 | int RSA_private_encrypt(int flen, unsigned char *from, | 19 | int RSA_private_encrypt(int flen, unsigned char *from, |
20 | unsigned char *to, RSA *rsa,int padding); | 20 | unsigned char *to, RSA *rsa,int padding); |
21 | int RSA_public_decrypt(int flen, unsigned char *from, | 21 | int RSA_public_decrypt(int flen, unsigned char *from, |
22 | unsigned char *to, RSA *rsa,int padding); | 22 | unsigned char *to, RSA *rsa,int padding); |
23 | 23 | ||
24 | int RSA_sign(int type, unsigned char *m, unsigned int m_len, | 24 | int RSA_sign(int type, unsigned char *m, unsigned int m_len, |
@@ -118,6 +118,6 @@ L<RSA_set_method(3)|RSA_set_method(3)>, L<RSA_print(3)|RSA_print(3)>, | |||
118 | L<RSA_get_ex_new_index(3)|RSA_get_ex_new_index(3)>, | 118 | L<RSA_get_ex_new_index(3)|RSA_get_ex_new_index(3)>, |
119 | L<RSA_private_encrypt(3)|RSA_private_encrypt(3)>, | 119 | L<RSA_private_encrypt(3)|RSA_private_encrypt(3)>, |
120 | L<RSA_sign_ASN1_OCTET_STRING(3)|RSA_sign_ASN1_OCTET_STRING(3)>, | 120 | L<RSA_sign_ASN1_OCTET_STRING(3)|RSA_sign_ASN1_OCTET_STRING(3)>, |
121 | L<RSA_padding_add_PKCS1_type_1(3)|RSA_padding_add_PKCS1_type_1(3)> | 121 | L<RSA_padding_add_PKCS1_type_1(3)|RSA_padding_add_PKCS1_type_1(3)> |
122 | 122 | ||
123 | =cut | 123 | =cut |