diff options
author | sobrado <> | 2015-09-22 08:08:07 +0000 |
---|---|---|
committer | sobrado <> | 2015-09-22 08:08:07 +0000 |
commit | f087ce5ef830235035b12597598b8a15ef4d469b (patch) | |
tree | 44f72e5c66d08a8e69898fb02d0eff61ca84d533 /src/lib | |
parent | 8cd2e8a8ed69b1bd5763b94d2864fc4854e7deb4 (diff) | |
download | openbsd-f087ce5ef830235035b12597598b8a15ef4d469b.tar.gz openbsd-f087ce5ef830235035b12597598b8a15ef4d469b.tar.bz2 openbsd-f087ce5ef830235035b12597598b8a15ef4d469b.zip |
typos in documentation; better wording, suggested by jmc@libressl-v2.3.0
ok jmc@
Diffstat (limited to 'src/lib')
51 files changed, 88 insertions, 88 deletions
diff --git a/src/lib/libcrypto/doc/EC_GROUP_copy.pod b/src/lib/libcrypto/doc/EC_GROUP_copy.pod index 49dc01ced1..d4896af1d5 100644 --- a/src/lib/libcrypto/doc/EC_GROUP_copy.pod +++ b/src/lib/libcrypto/doc/EC_GROUP_copy.pod | |||
@@ -74,7 +74,7 @@ If the asn1_flag is 1 then this is a named curve with an associated ASN1 OID. If | |||
74 | EC_GROUP_get_asn1_flag and EC_GROUP_set_asn1_flag get and set the status of the asn1_flag for the curve. If set then | 74 | EC_GROUP_get_asn1_flag and EC_GROUP_set_asn1_flag get and set the status of the asn1_flag for the curve. If set then |
75 | the curve_name must also be set. | 75 | the curve_name must also be set. |
76 | 76 | ||
77 | The point_coversion_form for a curve controls how EC_POINT data is encoded as ASN1 as defined in X9.62 (ECDSA). | 77 | The point_conversion_form for a curve controls how EC_POINT data is encoded as ASN1 as defined in X9.62 (ECDSA). |
78 | point_conversion_form_t is an enum defined as follows: | 78 | point_conversion_form_t is an enum defined as follows: |
79 | 79 | ||
80 | typedef enum { | 80 | typedef enum { |
@@ -135,7 +135,7 @@ or a pentanomial of the form: | |||
135 | f(x) = x^m + x^k3 + x^k2 + x^k1 + 1 with m > k3 > k2 > k1 >= 1 | 135 | f(x) = x^m + x^k3 + x^k2 + x^k1 + 1 with m > k3 > k2 > k1 >= 1 |
136 | 136 | ||
137 | The function EC_GROUP_get_basis_type returns a NID identifying whether a trinomial or pentanomial is in use for the field. The | 137 | The function EC_GROUP_get_basis_type returns a NID identifying whether a trinomial or pentanomial is in use for the field. The |
138 | function EC_GROUP_get_trinomial_basis must only be called where f(x) is of the trinomial form, and returns the value of B<k>. Similary | 138 | function EC_GROUP_get_trinomial_basis must only be called where f(x) is of the trinomial form, and returns the value of B<k>. Similarly |
139 | the function EC_GROUP_get_pentanomial_basis must only be called where f(x) is of the pentanomial form, and returns the values of B<k1>, | 139 | the function EC_GROUP_get_pentanomial_basis must only be called where f(x) is of the pentanomial form, and returns the values of B<k1>, |
140 | B<k2> and B<k3> respectively. | 140 | B<k2> and B<k3> respectively. |
141 | 141 | ||
diff --git a/src/lib/libcrypto/doc/EC_GROUP_new.pod b/src/lib/libcrypto/doc/EC_GROUP_new.pod index ff55bf33a3..9ab3566e65 100644 --- a/src/lib/libcrypto/doc/EC_GROUP_new.pod +++ b/src/lib/libcrypto/doc/EC_GROUP_new.pod | |||
@@ -48,8 +48,8 @@ EC_GROUP_set_curve_GFp sets the curve parameters B<p>, B<a> and B<b> for a curve | |||
48 | EC_group_get_curve_GFp obtains the previously set curve parameters. | 48 | EC_group_get_curve_GFp obtains the previously set curve parameters. |
49 | 49 | ||
50 | EC_GROUP_set_curve_GF2m sets the equivalent curve parameters for a curve over F2^m. In this case B<p> represents | 50 | EC_GROUP_set_curve_GF2m sets the equivalent curve parameters for a curve over F2^m. In this case B<p> represents |
51 | the irreducible polybnomial - each bit represents a term in the polynomial. Therefore there will either be three | 51 | the irreducible polynomial - each bit represents a term in the polynomial. Therefore there will either be three |
52 | or five bits set dependant on whether the polynomial is a trinomial or a pentanomial. | 52 | or five bits set dependent on whether the polynomial is a trinomial or a pentanomial. |
53 | EC_group_get_curve_GF2m obtains the previously set curve parameters. | 53 | EC_group_get_curve_GF2m obtains the previously set curve parameters. |
54 | 54 | ||
55 | The functions EC_GROUP_new_curve_GFp and EC_GROUP_new_curve_GF2m are shortcuts for calling EC_GROUP_new and the | 55 | The functions EC_GROUP_new_curve_GFp and EC_GROUP_new_curve_GF2m are shortcuts for calling EC_GROUP_new and the |
diff --git a/src/lib/libcrypto/doc/EC_KEY_new.pod b/src/lib/libcrypto/doc/EC_KEY_new.pod index 7f8f991ac7..02d7bac82c 100644 --- a/src/lib/libcrypto/doc/EC_KEY_new.pod +++ b/src/lib/libcrypto/doc/EC_KEY_new.pod | |||
@@ -40,7 +40,7 @@ EC_KEY_new, EC_KEY_get_flags, EC_KEY_set_flags, EC_KEY_clear_flags, EC_KEY_new_b | |||
40 | 40 | ||
41 | =head1 DESCRIPTION | 41 | =head1 DESCRIPTION |
42 | 42 | ||
43 | An EC_KEY represents a public key and (optionaly) an associated private key. A new EC_KEY (with no associated curve) can be constructed by calling EC_KEY_new. | 43 | An EC_KEY represents a public key and (optionally) an associated private key. A new EC_KEY (with no associated curve) can be constructed by calling EC_KEY_new. |
44 | The reference count for the newly created EC_KEY is initially set to 1. A curve can be associated with the EC_KEY by calling | 44 | The reference count for the newly created EC_KEY is initially set to 1. A curve can be associated with the EC_KEY by calling |
45 | EC_KEY_set_group. | 45 | EC_KEY_set_group. |
46 | 46 | ||
@@ -77,7 +77,7 @@ along with the private key. If EC_PKEY_NO_PUBKEY is set then the public key is n | |||
77 | The functions EC_KEY_get_conv_form and EC_KEY_set_conv_form get and set the point_conversion_form for the B<key>. For a description | 77 | The functions EC_KEY_get_conv_form and EC_KEY_set_conv_form get and set the point_conversion_form for the B<key>. For a description |
78 | of point_conversion_forms please refer to L<EC_POINT_new(3)|EC_POINT_new(3)>. | 78 | of point_conversion_forms please refer to L<EC_POINT_new(3)|EC_POINT_new(3)>. |
79 | 79 | ||
80 | EC_KEY_insert_key_method_data and EC_KEY_get_key_method_data enable the caller to associate arbitary additional data specific to the | 80 | EC_KEY_insert_key_method_data and EC_KEY_get_key_method_data enable the caller to associate arbitrary additional data specific to the |
81 | elliptic curve scheme being used with the EC_KEY object. This data is treated as a "black box" by the ec library. The data to be stored by EC_KEY_insert_key_method_data is provided in the B<data> parameter, which must have associated functions for duplicating, freeing and "clear_freeing" the data item. If a subsequent EC_KEY_get_key_method_data call is issued, the functions for duplicating, freeing and "clear_freeing" the data item must be provided again, and they must be the same as they were when the data item was inserted. | 81 | elliptic curve scheme being used with the EC_KEY object. This data is treated as a "black box" by the ec library. The data to be stored by EC_KEY_insert_key_method_data is provided in the B<data> parameter, which must have associated functions for duplicating, freeing and "clear_freeing" the data item. If a subsequent EC_KEY_get_key_method_data call is issued, the functions for duplicating, freeing and "clear_freeing" the data item must be provided again, and they must be the same as they were when the data item was inserted. |
82 | 82 | ||
83 | EC_KEY_set_flags sets the flags in the B<flags> parameter on the EC_KEY object. Any flags that are already set are left set. The currently defined standard flags are EC_FLAG_NON_FIPS_ALLOW and EC_FLAG_FIPS_CHECKED. In addition there is the flag EC_FLAG_COFACTOR_ECDH which is specific to ECDH and is defined in ecdh.h. EC_KEY_get_flags returns the current flags that are set for this EC_KEY. EC_KEY_clear_flags clears the flags indicated by the B<flags> parameter. All other flags are left in their existing state. | 83 | EC_KEY_set_flags sets the flags in the B<flags> parameter on the EC_KEY object. Any flags that are already set are left set. The currently defined standard flags are EC_FLAG_NON_FIPS_ALLOW and EC_FLAG_FIPS_CHECKED. In addition there is the flag EC_FLAG_COFACTOR_ECDH which is specific to ECDH and is defined in ecdh.h. EC_KEY_get_flags returns the current flags that are set for this EC_KEY. EC_KEY_clear_flags clears the flags indicated by the B<flags> parameter. All other flags are left in their existing state. |
diff --git a/src/lib/libcrypto/doc/EVP_BytesToKey.pod b/src/lib/libcrypto/doc/EVP_BytesToKey.pod index a27146f5c9..2dffaa1efa 100644 --- a/src/lib/libcrypto/doc/EVP_BytesToKey.pod +++ b/src/lib/libcrypto/doc/EVP_BytesToKey.pod | |||
@@ -46,7 +46,7 @@ enough data is available for the key and IV. D_i is defined as: | |||
46 | 46 | ||
47 | D_i = HASH^count(D_(i-1) || data || salt) | 47 | D_i = HASH^count(D_(i-1) || data || salt) |
48 | 48 | ||
49 | where || denotes concatentaion, D_0 is empty, HASH is the digest | 49 | where || denotes concatenation, D_0 is empty, HASH is the digest |
50 | algorithm in use, HASH^1(data) is simply HASH(data), HASH^2(data) | 50 | algorithm in use, HASH^1(data) is simply HASH(data), HASH^2(data) |
51 | is HASH(HASH(data)) and so on. | 51 | is HASH(HASH(data)) and so on. |
52 | 52 | ||
diff --git a/src/lib/libcrypto/doc/EVP_DigestSignInit.pod b/src/lib/libcrypto/doc/EVP_DigestSignInit.pod index 7fd4c22e79..00205d2ae9 100644 --- a/src/lib/libcrypto/doc/EVP_DigestSignInit.pod +++ b/src/lib/libcrypto/doc/EVP_DigestSignInit.pod | |||
@@ -27,7 +27,7 @@ be used to set alternative signing options. | |||
27 | EVP_DigestSignUpdate() hashes B<cnt> bytes of data at B<d> into the | 27 | EVP_DigestSignUpdate() hashes B<cnt> bytes of data at B<d> into the |
28 | signature context B<ctx>. This function can be called several times on the | 28 | signature context B<ctx>. This function can be called several times on the |
29 | same B<ctx> to include additional data. This function is currently implemented | 29 | same B<ctx> to include additional data. This function is currently implemented |
30 | usig a macro. | 30 | using a macro. |
31 | 31 | ||
32 | EVP_DigestSignFinal() signs the data in B<ctx> places the signature in B<sig>. | 32 | EVP_DigestSignFinal() signs the data in B<ctx> places the signature in B<sig>. |
33 | If B<sig> is B<NULL> then the maximum size of the output buffer is written to | 33 | If B<sig> is B<NULL> then the maximum size of the output buffer is written to |
diff --git a/src/lib/libcrypto/doc/EVP_EncryptInit.pod b/src/lib/libcrypto/doc/EVP_EncryptInit.pod index a0a782e772..e9254de3d2 100644 --- a/src/lib/libcrypto/doc/EVP_EncryptInit.pod +++ b/src/lib/libcrypto/doc/EVP_EncryptInit.pod | |||
@@ -105,7 +105,7 @@ EVP_aes_192_ccm, EVP_aes_256_ccm - EVP cipher routines | |||
105 | The EVP cipher routines are a high level interface to certain | 105 | The EVP cipher routines are a high level interface to certain |
106 | symmetric ciphers. | 106 | symmetric ciphers. |
107 | 107 | ||
108 | EVP_CIPHER_CTX_init() initializes cipher contex B<ctx>. | 108 | EVP_CIPHER_CTX_init() initializes cipher context B<ctx>. |
109 | 109 | ||
110 | EVP_EncryptInit_ex() sets up cipher context B<ctx> for encryption | 110 | EVP_EncryptInit_ex() sets up cipher context B<ctx> for encryption |
111 | with cipher B<type> from ENGINE B<impl>. B<ctx> must be initialized | 111 | with cipher B<type> from ENGINE B<impl>. B<ctx> must be initialized |
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_CTX_ctrl.pod b/src/lib/libcrypto/doc/EVP_PKEY_CTX_ctrl.pod index 91125da62e..e8776e1e67 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_CTX_ctrl.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_CTX_ctrl.pod | |||
@@ -90,7 +90,7 @@ B<PSS> block structure. If this macro is not called a salt length value of -2 | |||
90 | is used by default. | 90 | is used by default. |
91 | 91 | ||
92 | The EVP_PKEY_CTX_set_rsa_rsa_keygen_bits() macro sets the RSA key length for | 92 | The EVP_PKEY_CTX_set_rsa_rsa_keygen_bits() macro sets the RSA key length for |
93 | RSA key genration to B<bits>. If not specified 1024 bits is used. | 93 | RSA key generation to B<bits>. If not specified 1024 bits is used. |
94 | 94 | ||
95 | The EVP_PKEY_CTX_set_rsa_keygen_pubexp() macro sets the public exponent value | 95 | The EVP_PKEY_CTX_set_rsa_keygen_pubexp() macro sets the public exponent value |
96 | for RSA key generation to B<pubexp> currently it should be an odd integer. The | 96 | for RSA key generation to B<pubexp> currently it should be an odd integer. The |
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_CTX_new.pod b/src/lib/libcrypto/doc/EVP_PKEY_CTX_new.pod index 9822d6806f..60ad61e853 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_CTX_new.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_CTX_new.pod | |||
@@ -22,7 +22,7 @@ the algorithm specified in B<pkey> and ENGINE B<e>. | |||
22 | The EVP_PKEY_CTX_new_id() function allocates public key algorithm context | 22 | The EVP_PKEY_CTX_new_id() function allocates public key algorithm context |
23 | using the algorithm specified by B<id> and ENGINE B<e>. It is normally used | 23 | using the algorithm specified by B<id> and ENGINE B<e>. It is normally used |
24 | when no B<EVP_PKEY> structure is associated with the operations, for example | 24 | when no B<EVP_PKEY> structure is associated with the operations, for example |
25 | during parameter generation of key genration for some algorithms. | 25 | during parameter generation of key generation for some algorithms. |
26 | 26 | ||
27 | EVP_PKEY_CTX_dup() duplicates the context B<ctx>. | 27 | EVP_PKEY_CTX_dup() duplicates the context B<ctx>. |
28 | 28 | ||
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_cmp.pod b/src/lib/libcrypto/doc/EVP_PKEY_cmp.pod index c389216086..7a690247bf 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_cmp.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_cmp.pod | |||
@@ -24,10 +24,10 @@ doesn't use parameters. | |||
24 | The function EVP_PKEY_copy_parameters() copies the parameters from key | 24 | The function EVP_PKEY_copy_parameters() copies the parameters from key |
25 | B<from> to key B<to>. | 25 | B<from> to key B<to>. |
26 | 26 | ||
27 | The funcion EVP_PKEY_cmp_parameters() compares the parameters of keys | 27 | The function EVP_PKEY_cmp_parameters() compares the parameters of keys |
28 | B<a> and B<b>. | 28 | B<a> and B<b>. |
29 | 29 | ||
30 | The funcion EVP_PKEY_cmp() compares the public key components and paramters | 30 | The function EVP_PKEY_cmp() compares the public key components and parameters |
31 | (if present) of keys B<a> and B<b>. | 31 | (if present) of keys B<a> and B<b>. |
32 | 32 | ||
33 | =head1 NOTES | 33 | =head1 NOTES |
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_keygen.pod b/src/lib/libcrypto/doc/EVP_PKEY_keygen.pod index 05ea04be11..463c44170e 100644 --- a/src/lib/libcrypto/doc/EVP_PKEY_keygen.pod +++ b/src/lib/libcrypto/doc/EVP_PKEY_keygen.pod | |||
@@ -29,7 +29,7 @@ EVP_PKEY_CTX_get_app_data - key and parameter generation functions | |||
29 | =head1 DESCRIPTION | 29 | =head1 DESCRIPTION |
30 | 30 | ||
31 | The EVP_PKEY_keygen_init() function initializes a public key algorithm | 31 | The EVP_PKEY_keygen_init() function initializes a public key algorithm |
32 | context using key B<pkey> for a key genration operation. | 32 | context using key B<pkey> for a key generation operation. |
33 | 33 | ||
34 | The EVP_PKEY_keygen() function performs a key generation operation, the | 34 | The EVP_PKEY_keygen() function performs a key generation operation, the |
35 | generated key is written to B<ppkey>. | 35 | generated key is written to B<ppkey>. |
@@ -47,7 +47,7 @@ parameters available is returned. Any non negative value returns the value of | |||
47 | that parameter. EVP_PKEY_CTX_gen_keygen_info() with a non-negative value for | 47 | that parameter. EVP_PKEY_CTX_gen_keygen_info() with a non-negative value for |
48 | B<idx> should only be called within the generation callback. | 48 | B<idx> should only be called within the generation callback. |
49 | 49 | ||
50 | If the callback returns 0 then the key genration operation is aborted and an | 50 | If the callback returns 0 then the key generation operation is aborted and an |
51 | error occurs. This might occur during a time consuming operation where | 51 | error occurs. This might occur during a time consuming operation where |
52 | a user clicks on a "cancel" button. | 52 | a user clicks on a "cancel" button. |
53 | 53 | ||
@@ -67,7 +67,7 @@ once on the same context if several operations are performed using the same | |||
67 | parameters. | 67 | parameters. |
68 | 68 | ||
69 | The meaning of the parameters passed to the callback will depend on the | 69 | The meaning of the parameters passed to the callback will depend on the |
70 | algorithm and the specifiic implementation of the algorithm. Some might not | 70 | algorithm and the specific implementation of the algorithm. Some might not |
71 | give any useful information at all during key or parameter generation. Others | 71 | give any useful information at all during key or parameter generation. Others |
72 | might not even call the callback. | 72 | might not even call the callback. |
73 | 73 | ||
diff --git a/src/lib/libcrypto/doc/OBJ_nid2obj.pod b/src/lib/libcrypto/doc/OBJ_nid2obj.pod index 3656390ead..95949ac091 100644 --- a/src/lib/libcrypto/doc/OBJ_nid2obj.pod +++ b/src/lib/libcrypto/doc/OBJ_nid2obj.pod | |||
@@ -43,7 +43,7 @@ for the object B<o>, the long name <ln> or the short name <sn> respectively | |||
43 | or NID_undef if an error occurred. | 43 | or NID_undef if an error occurred. |
44 | 44 | ||
45 | OBJ_txt2nid() returns NID corresponding to text string <s>. B<s> can be | 45 | OBJ_txt2nid() returns NID corresponding to text string <s>. B<s> can be |
46 | a long name, a short name or the numerical respresentation of an object. | 46 | a long name, a short name or the numerical representation of an object. |
47 | 47 | ||
48 | OBJ_txt2obj() converts the text string B<s> into an ASN1_OBJECT structure. | 48 | OBJ_txt2obj() converts the text string B<s> into an ASN1_OBJECT structure. |
49 | If B<no_name> is 0 then long names and short names will be interpreted | 49 | If B<no_name> is 0 then long names and short names will be interpreted |
diff --git a/src/lib/libcrypto/doc/PKCS12_create.pod b/src/lib/libcrypto/doc/PKCS12_create.pod index 12fbd20b8a..3b27c11a10 100644 --- a/src/lib/libcrypto/doc/PKCS12_create.pod +++ b/src/lib/libcrypto/doc/PKCS12_create.pod | |||
@@ -17,11 +17,11 @@ PKCS12_create - create a PKCS#12 structure | |||
17 | PKCS12_create() creates a PKCS#12 structure. | 17 | PKCS12_create() creates a PKCS#12 structure. |
18 | 18 | ||
19 | B<pass> is the passphrase to use. B<name> is the B<friendlyName> to use for | 19 | B<pass> is the passphrase to use. B<name> is the B<friendlyName> to use for |
20 | the supplied certifictate and key. B<pkey> is the private key to include in | 20 | the supplied certificate and key. B<pkey> is the private key to include in |
21 | the structure and B<cert> its corresponding certificates. B<ca> is an optional | 21 | the structure and B<cert> its corresponding certificates. B<ca> is an optional |
22 | set of certificates to also include in the structure. | 22 | set of certificates to also include in the structure. |
23 | Either B<pkey>, B<cert> or both can be B<NULL> to indicate that no key or | 23 | Either B<pkey>, B<cert> or both can be B<NULL> to indicate that no key or |
24 | certficate is required. | 24 | certificate is required. |
25 | 25 | ||
26 | B<nid_key> and B<nid_cert> are the encryption algorithms that should be used | 26 | B<nid_key> and B<nid_cert> are the encryption algorithms that should be used |
27 | for the key and certificate respectively. If either B<nid_key> or B<nid_cert> | 27 | for the key and certificate respectively. If either B<nid_key> or B<nid_cert> |
diff --git a/src/lib/libcrypto/doc/PKCS7_sign.pod b/src/lib/libcrypto/doc/PKCS7_sign.pod index 9a4f5b173e..64a3036c0a 100644 --- a/src/lib/libcrypto/doc/PKCS7_sign.pod +++ b/src/lib/libcrypto/doc/PKCS7_sign.pod | |||
@@ -13,7 +13,7 @@ PKCS7_sign - create a PKCS#7 signedData structure | |||
13 | =head1 DESCRIPTION | 13 | =head1 DESCRIPTION |
14 | 14 | ||
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 corresponding 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 | ||
@@ -46,7 +46,7 @@ required by the S/MIME specifications) if B<PKCS7_BINARY> is set no translation | |||
46 | occurs. This option should be used if the supplied data is in binary format | 46 | occurs. This option should be used if the supplied data is in binary format |
47 | otherwise the translation will corrupt it. | 47 | otherwise the translation will corrupt it. |
48 | 48 | ||
49 | The signedData structure includes several PKCS#7 autenticatedAttributes | 49 | The signedData structure includes several PKCS#7 authenticatedAttributes |
50 | including the signing time, the PKCS#7 content type and the supported list of | 50 | including the signing time, the PKCS#7 content type and the supported list of |
51 | ciphers in an SMIMECapabilities attribute. If B<PKCS7_NOATTR> is set then no | 51 | ciphers in an SMIMECapabilities attribute. If B<PKCS7_NOATTR> is set then no |
52 | authenticatedAttributes will be used. If B<PKCS7_NOSMIMECAP> is set then just | 52 | authenticatedAttributes will be used. If B<PKCS7_NOSMIMECAP> is set then just |
diff --git a/src/lib/libcrypto/doc/PKCS7_sign_add_signer.pod b/src/lib/libcrypto/doc/PKCS7_sign_add_signer.pod index afe8ad97cd..280455d476 100644 --- a/src/lib/libcrypto/doc/PKCS7_sign_add_signer.pod +++ b/src/lib/libcrypto/doc/PKCS7_sign_add_signer.pod | |||
@@ -40,7 +40,7 @@ Any of the following flags (ored together) can be passed in the B<flags> | |||
40 | parameter. | 40 | parameter. |
41 | 41 | ||
42 | If B<PKCS7_REUSE_DIGEST> is set then an attempt is made to copy the content | 42 | If B<PKCS7_REUSE_DIGEST> is set then an attempt is made to copy the content |
43 | digest value from the PKCS7 struture: to add a signer to an existing structure. | 43 | digest value from the PKCS7 structure: 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 | ||
@@ -55,7 +55,7 @@ B<signcert> parameter though. This can reduce the size of the signature if the | |||
55 | signers certificate can be obtained by other means: for example a previously | 55 | signers certificate can be obtained by other means: for example a previously |
56 | signed message. | 56 | signed message. |
57 | 57 | ||
58 | The signedData structure includes several PKCS#7 autenticatedAttributes | 58 | The signedData structure includes several PKCS#7 authenticatedAttributes |
59 | including the signing time, the PKCS#7 content type and the supported list of | 59 | including the signing time, the PKCS#7 content type and the supported list of |
60 | ciphers in an SMIMECapabilities attribute. If B<PKCS7_NOATTR> is set then no | 60 | ciphers in an SMIMECapabilities attribute. If B<PKCS7_NOATTR> is set then no |
61 | authenticatedAttributes will be used. If B<PKCS7_NOSMIMECAP> is set then just | 61 | authenticatedAttributes will be used. If B<PKCS7_NOSMIMECAP> is set then just |
diff --git a/src/lib/libcrypto/doc/PKCS7_verify.pod b/src/lib/libcrypto/doc/PKCS7_verify.pod index 781c6108a9..059fbff8e9 100644 --- a/src/lib/libcrypto/doc/PKCS7_verify.pod +++ b/src/lib/libcrypto/doc/PKCS7_verify.pod | |||
@@ -16,7 +16,7 @@ PKCS7_verify, PKCS7_get0_signers - verify a PKCS#7 signedData structure | |||
16 | 16 | ||
17 | PKCS7_verify() verifies a PKCS#7 signedData structure. B<p7> is the PKCS7 | 17 | PKCS7_verify() verifies a PKCS#7 signedData structure. B<p7> is the PKCS7 |
18 | structure to verify. B<certs> is a set of certificates in which to search for | 18 | structure to verify. B<certs> is a set of certificates in which to search for |
19 | the signer's certificate. B<store> is a trusted certficate store (used for | 19 | the signer's certificate. B<store> is a trusted certificate store (used for |
20 | chain verification). B<indata> is the signed data if the content is not | 20 | chain verification). B<indata> is the signed data if the content is not |
21 | present in B<p7> (that is it is detached). The content is written to B<out> | 21 | present in B<p7> (that is it is detached). The content is written to B<out> |
22 | if it is not NULL. | 22 | if it is not NULL. |
diff --git a/src/lib/libcrypto/doc/SMIME_write_PKCS7.pod b/src/lib/libcrypto/doc/SMIME_write_PKCS7.pod index ca6bd02763..4a7cd08c42 100644 --- a/src/lib/libcrypto/doc/SMIME_write_PKCS7.pod +++ b/src/lib/libcrypto/doc/SMIME_write_PKCS7.pod | |||
@@ -40,7 +40,7 @@ the data must be read twice: once to compute the signature in PKCS7_sign() | |||
40 | and once to output the S/MIME message. | 40 | and once to output the S/MIME message. |
41 | 41 | ||
42 | If streaming is performed the content is output in BER format using indefinite | 42 | If streaming is performed the content is output in BER format using indefinite |
43 | length constructuted encoding except in the case of signed data with detached | 43 | length constructed encoding except in the case of signed data with detached |
44 | content where the content is absent and DER format is used. | 44 | content where the content is absent and DER format is used. |
45 | 45 | ||
46 | =head1 BUGS | 46 | =head1 BUGS |
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 c6442b947f..f97e05e683 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 | |||
@@ -45,7 +45,7 @@ B<loc>. The deleted entry is returned and must be freed up. | |||
45 | =head1 NOTES | 45 | =head1 NOTES |
46 | 46 | ||
47 | The use of string types such as B<MBSTRING_ASC> or B<MBSTRING_UTF8> | 47 | The use of string types such as B<MBSTRING_ASC> or B<MBSTRING_UTF8> |
48 | is strongly recommened for the B<type> parameter. This allows the | 48 | is strongly recommended for the B<type> parameter. This allows the |
49 | internal code to correctly determine the type of the field and to | 49 | internal code to correctly determine the type of the field and to |
50 | apply length checks according to the relevant standards. This is | 50 | apply length checks according to the relevant standards. This is |
51 | done using ASN1_STRING_set_by_NID(). | 51 | done using ASN1_STRING_set_by_NID(). |
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 988fd7bdaf..48510890e8 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 | |||
@@ -51,7 +51,7 @@ X509_NAME_get_text_by_NID() and X509_NAME_get_text_by_OBJ() are | |||
51 | legacy functions which have various limitations which make them | 51 | legacy functions which have various limitations which make them |
52 | of minimal use in practice. They can only find the first matching | 52 | of minimal use in practice. They can only find the first matching |
53 | entry and will copy the contents of the field verbatim: this can | 53 | entry and will copy the contents of the field verbatim: this can |
54 | be highly confusing if the target is a muticharacter string type | 54 | be highly confusing if the target is a multicharacter string type |
55 | like a BMPString or a UTF8String. | 55 | like a BMPString or a UTF8String. |
56 | 56 | ||
57 | For a more general solution X509_NAME_get_index_by_NID() or | 57 | For a more general solution X509_NAME_get_index_by_NID() or |
diff --git a/src/lib/libcrypto/doc/X509_STORE_CTX_get_error.pod b/src/lib/libcrypto/doc/X509_STORE_CTX_get_error.pod index e4339dc28f..270b265ce5 100644 --- a/src/lib/libcrypto/doc/X509_STORE_CTX_get_error.pod +++ b/src/lib/libcrypto/doc/X509_STORE_CTX_get_error.pod | |||
@@ -35,7 +35,7 @@ checks. | |||
35 | 35 | ||
36 | X509_STORE_CTX_get_error_depth() returns the B<depth> of the error. This is a | 36 | X509_STORE_CTX_get_error_depth() returns the B<depth> of the error. This is a |
37 | non-negative integer representing where in the certificate chain the error | 37 | non-negative integer representing where in the certificate chain the error |
38 | occurred. If it is zero it occured in the end entity certificate, one if | 38 | occurred. If it is zero it occurred in the end entity certificate, one if |
39 | it is the certificate which signed the end entity certificate and so on. | 39 | it is the certificate which signed the end entity certificate and so on. |
40 | 40 | ||
41 | X509_STORE_CTX_get_current_cert() returns the certificate in B<ctx> which | 41 | X509_STORE_CTX_get_current_cert() returns the certificate in B<ctx> which |
@@ -58,7 +58,7 @@ X509_STORE_CTX_get_error() returns B<X509_V_OK> or an error code. | |||
58 | 58 | ||
59 | X509_STORE_CTX_get_error_depth() returns a non-negative error depth. | 59 | X509_STORE_CTX_get_error_depth() returns a non-negative error depth. |
60 | 60 | ||
61 | X509_STORE_CTX_get_current_cert() returns the cerificate which caused the | 61 | X509_STORE_CTX_get_current_cert() returns the certificate which caused the |
62 | error or B<NULL> if no certificate is relevant to the error. | 62 | error or B<NULL> if no certificate is relevant to the error. |
63 | 63 | ||
64 | X509_verify_cert_error_string() returns a human readable error string for | 64 | X509_verify_cert_error_string() returns a human readable error string for |
@@ -265,11 +265,11 @@ Some feature of a certificate extension is not supported. Unused. | |||
265 | 265 | ||
266 | =item B<X509_V_ERR_PERMITTED_VIOLATION: permitted subtree violation> | 266 | =item B<X509_V_ERR_PERMITTED_VIOLATION: permitted subtree violation> |
267 | 267 | ||
268 | A name constraint violation occured in the permitted subtrees. | 268 | A name constraint violation occurred in the permitted subtrees. |
269 | 269 | ||
270 | =item B<X509_V_ERR_EXCLUDED_VIOLATION: excluded subtree violation> | 270 | =item B<X509_V_ERR_EXCLUDED_VIOLATION: excluded subtree violation> |
271 | 271 | ||
272 | A name constraint violation occured in the excluded subtrees. | 272 | A name constraint violation occurred in the excluded subtrees. |
273 | 273 | ||
274 | =item B<X509_V_ERR_SUBTREE_MINMAX: name constraints minimum and maximum not | 274 | =item B<X509_V_ERR_SUBTREE_MINMAX: name constraints minimum and maximum not |
275 | supported> | 275 | supported> |
@@ -292,7 +292,7 @@ a garbage extension or some new feature not currently supported. | |||
292 | 292 | ||
293 | =item B<X509_V_ERR_CRL_PATH_VALIDATION_ERROR: CRL path validation error> | 293 | =item B<X509_V_ERR_CRL_PATH_VALIDATION_ERROR: CRL path validation error> |
294 | 294 | ||
295 | An error occured when attempting to verify the CRL path. This error can only | 295 | An error occurred when attempting to verify the CRL path. This error can only |
296 | happen if extended CRL checking is enabled. | 296 | happen if extended CRL checking is enabled. |
297 | 297 | ||
298 | =item B<X509_V_ERR_APPLICATION_VERIFICATION: application verification failure> | 298 | =item B<X509_V_ERR_APPLICATION_VERIFICATION: application verification failure> |
diff --git a/src/lib/libcrypto/doc/X509_STORE_CTX_new.pod b/src/lib/libcrypto/doc/X509_STORE_CTX_new.pod index 8f602274ee..66c0da04d2 100644 --- a/src/lib/libcrypto/doc/X509_STORE_CTX_new.pod +++ b/src/lib/libcrypto/doc/X509_STORE_CTX_new.pod | |||
@@ -52,7 +52,7 @@ X509_STORE_CTX_trusted_stack() sets the set of trusted certificates of B<ctx> | |||
52 | to B<sk>. This is an alternative way of specifying trusted certificates | 52 | to B<sk>. This is an alternative way of specifying trusted certificates |
53 | instead of using an B<X509_STORE>. | 53 | instead of using an B<X509_STORE>. |
54 | 54 | ||
55 | X509_STORE_CTX_set_cert() sets the certificate to be vertified in B<ctx> to | 55 | X509_STORE_CTX_set_cert() sets the certificate to be verified in B<ctx> to |
56 | B<x>. | 56 | B<x>. |
57 | 57 | ||
58 | X509_STORE_CTX_set_chain() sets the additional certificate chain used by B<ctx> | 58 | X509_STORE_CTX_set_chain() sets the additional certificate chain used by B<ctx> |
@@ -64,10 +64,10 @@ enabled in the associated B<X509_VERIFY_PARAM> structure. This might be | |||
64 | used where additional "useful" CRLs are supplied as part of a protocol, | 64 | used where additional "useful" CRLs are supplied as part of a protocol, |
65 | for example in a PKCS#7 structure. | 65 | for example in a PKCS#7 structure. |
66 | 66 | ||
67 | X509_VERIFY_PARAM *X509_STORE_CTX_get0_param() retrieves an intenal pointer | 67 | X509_VERIFY_PARAM *X509_STORE_CTX_get0_param() retrieves an internal pointer |
68 | to the verification parameters associated with B<ctx>. | 68 | to the verification parameters associated with B<ctx>. |
69 | 69 | ||
70 | X509_STORE_CTX_set0_param() sets the intenal verification parameter pointer | 70 | X509_STORE_CTX_set0_param() sets the internal verification parameter pointer |
71 | to B<param>. After this call B<param> should not be used. | 71 | to B<param>. After this call B<param> should not be used. |
72 | 72 | ||
73 | X509_STORE_CTX_set_default() looks up and sets the default verification | 73 | X509_STORE_CTX_set_default() looks up and sets the default verification |
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 6acdd71e72..6c88aec49e 100644 --- a/src/lib/libcrypto/doc/X509_VERIFY_PARAM_set_flags.pod +++ b/src/lib/libcrypto/doc/X509_VERIFY_PARAM_set_flags.pod | |||
@@ -126,7 +126,7 @@ If B<X509_V_FLAG_USE_DELTAS> ise set delta CRLs (if present) are used to | |||
126 | determine certificate status. If not set deltas are ignored. | 126 | determine certificate status. If not set deltas are ignored. |
127 | 127 | ||
128 | B<X509_V_FLAG_CHECK_SS_SIGNATURE> enables checking of the root CA self signed | 128 | B<X509_V_FLAG_CHECK_SS_SIGNATURE> enables checking of the root CA self signed |
129 | cerificate signature. By default this check is disabled because it doesn't | 129 | certificate signature. By default this check is disabled because it doesn't |
130 | add any additional security but in some cases applications might want to | 130 | add any additional security but in some cases applications might want to |
131 | check the signature anyway. A side effect of not checking the root CA | 131 | check the signature anyway. A side effect of not checking the root CA |
132 | signature is that disabled or unsupported message digests on the root CA | 132 | signature is that disabled or unsupported message digests on the root CA |
diff --git a/src/lib/libcrypto/doc/X509_verify_cert.pod b/src/lib/libcrypto/doc/X509_verify_cert.pod index 5253bdcd70..f05edd8333 100644 --- a/src/lib/libcrypto/doc/X509_verify_cert.pod +++ b/src/lib/libcrypto/doc/X509_verify_cert.pod | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | =head1 NAME | 3 | =head1 NAME |
4 | 4 | ||
5 | X509_verify_cert - discover and verify X509 certificte chain | 5 | X509_verify_cert - discover and verify X509 certificate chain |
6 | 6 | ||
7 | =head1 SYNOPSIS | 7 | =head1 SYNOPSIS |
8 | 8 | ||
@@ -40,7 +40,7 @@ for <= 0 return value on error. | |||
40 | =head1 BUGS | 40 | =head1 BUGS |
41 | 41 | ||
42 | This function uses the header B<x509.h> as opposed to most chain verification | 42 | This function uses the header B<x509.h> as opposed to most chain verification |
43 | functiosn which use B<x509_vfy.h>. | 43 | functions which use B<x509_vfy.h>. |
44 | 44 | ||
45 | =head1 SEE ALSO | 45 | =head1 SEE ALSO |
46 | 46 | ||
diff --git a/src/lib/libcrypto/doc/d2i_DSAPublicKey.pod b/src/lib/libcrypto/doc/d2i_DSAPublicKey.pod index eeb96c485f..10c49e3ad2 100644 --- a/src/lib/libcrypto/doc/d2i_DSAPublicKey.pod +++ b/src/lib/libcrypto/doc/d2i_DSAPublicKey.pod | |||
@@ -68,7 +68,7 @@ If B<write_params> is zero then only the B<pub_key> field is encoded as an | |||
68 | B<INTEGER>. If B<write_params> is 1 then a B<SEQUENCE> consisting of the | 68 | B<INTEGER>. If B<write_params> is 1 then a B<SEQUENCE> consisting of the |
69 | B<p>, B<q>, B<g> and B<pub_key> respectively fields are encoded. | 69 | B<p>, B<q>, B<g> and B<pub_key> respectively fields are encoded. |
70 | 70 | ||
71 | The B<DSAPrivateKey> functions also use a non standard structure consiting | 71 | The B<DSAPrivateKey> functions also use a non standard structure consisting |
72 | consisting of a SEQUENCE containing the B<p>, B<q>, B<g> and B<pub_key> and | 72 | consisting of a SEQUENCE containing the B<p>, B<q>, B<g> and B<pub_key> and |
73 | B<priv_key> fields respectively. | 73 | B<priv_key> fields respectively. |
74 | 74 | ||
diff --git a/src/lib/libcrypto/doc/engine.pod b/src/lib/libcrypto/doc/engine.pod index 8020112835..e305a73271 100644 --- a/src/lib/libcrypto/doc/engine.pod +++ b/src/lib/libcrypto/doc/engine.pod | |||
@@ -181,7 +181,7 @@ to use the pointer value at all, as this kind of reference is a guarantee | |||
181 | that the structure can not be deallocated until the reference is released. | 181 | that the structure can not be deallocated until the reference is released. |
182 | 182 | ||
183 | However, a structural reference provides no guarantee that the ENGINE is | 183 | However, a structural reference provides no guarantee that the ENGINE is |
184 | initiliased and able to use any of its cryptographic | 184 | initialised and able to use any of its cryptographic |
185 | implementations. Indeed it's quite possible that most ENGINEs will not | 185 | implementations. Indeed it's quite possible that most ENGINEs will not |
186 | initialise at all in typical environments, as ENGINEs are typically used to | 186 | initialise at all in typical environments, as ENGINEs are typically used to |
187 | support specialised hardware. To use an ENGINE's functionality, you need a | 187 | support specialised hardware. To use an ENGINE's functionality, you need a |
@@ -573,7 +573,7 @@ for any higher-level ENGINE functions such as ENGINE_ctrl_cmd_string(). | |||
573 | by applications, administrations, users, etc. These can support arbitrary | 573 | by applications, administrations, users, etc. These can support arbitrary |
574 | operations via ENGINE_ctrl(), including passing to and/or from the control | 574 | operations via ENGINE_ctrl(), including passing to and/or from the control |
575 | commands data of any arbitrary type. These commands are supported in the | 575 | commands data of any arbitrary type. These commands are supported in the |
576 | discovery mechanisms simply to allow applications determinie if an ENGINE | 576 | discovery mechanisms simply allow applications to determine if an ENGINE |
577 | supports certain specific commands it might want to use (eg. application "foo" | 577 | supports certain specific commands it might want to use (eg. application "foo" |
578 | might query various ENGINEs to see if they implement "FOO_GET_VENDOR_LOGO_GIF" - | 578 | might query various ENGINEs to see if they implement "FOO_GET_VENDOR_LOGO_GIF" - |
579 | and ENGINE could therefore decide whether or not to support this "foo"-specific | 579 | and ENGINE could therefore decide whether or not to support this "foo"-specific |
diff --git a/src/lib/libcrypto/man/ASN1_generate_nconf.3 b/src/lib/libcrypto/man/ASN1_generate_nconf.3 index af5b1c8a5d..abea69c056 100644 --- a/src/lib/libcrypto/man/ASN1_generate_nconf.3 +++ b/src/lib/libcrypto/man/ASN1_generate_nconf.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .Dd $Mdocdate: September 9 2015 $ | 1 | .Dd $Mdocdate: September 22 2015 $ |
2 | .Dt ASN1_GENERATE_NCONF 3 | 2 | .Dt ASN1_GENERATE_NCONF 3 |
3 | .Os | 3 | .Os |
4 | .Sh NAME | 4 | .Sh NAME |
@@ -251,7 +251,7 @@ A BITSTRING with bits 1 and 5 set and all others zero: | |||
251 | .Dl FORMAT:BITLIST,BITSTRING:1,5 | 251 | .Dl FORMAT:BITLIST,BITSTRING:1,5 |
252 | .Pp | 252 | .Pp |
253 | A more complex example using a config file to produce a | 253 | A more complex example using a config file to produce a |
254 | SEQUENCE consiting of a BOOL an OID and a UTF8String: | 254 | SEQUENCE consisting of a BOOL an OID and a UTF8String: |
255 | .Bd -literal -offset indent | 255 | .Bd -literal -offset indent |
256 | asn1 = SEQUENCE:seq_section | 256 | asn1 = SEQUENCE:seq_section |
257 | 257 | ||
diff --git a/src/lib/libcrypto/man/BUF_MEM_new.3 b/src/lib/libcrypto/man/BUF_MEM_new.3 index a423d4e0bc..f87e4f8257 100644 --- a/src/lib/libcrypto/man/BUF_MEM_new.3 +++ b/src/lib/libcrypto/man/BUF_MEM_new.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .Dd $Mdocdate: May 24 2015 $ | 1 | .Dd $Mdocdate: September 22 2015 $ |
2 | .Dt BUF_MEM_NEW 3 | 2 | .Dt BUF_MEM_NEW 3 |
3 | .Os | 3 | .Os |
4 | .Sh NAME | 4 | .Sh NAME |
@@ -76,7 +76,7 @@ will accept a | |||
76 | argument and will return | 76 | argument and will return |
77 | .Dv NULL | 77 | .Dv NULL |
78 | in that case. | 78 | in that case. |
79 | Its use in new programes is discouraged. | 79 | Its use in new programs is discouraged. |
80 | .Pp | 80 | .Pp |
81 | The memory allocated from | 81 | The memory allocated from |
82 | .Fn BUF_strdup | 82 | .Fn BUF_strdup |
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 c7994560c0..e663ac5bc9 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 | |||
@@ -19,9 +19,9 @@ The function CONF_modules_load_file() configures OpenSSL using file | |||
19 | B<filename> and application name B<appname>. If B<filename> is NULL | 19 | B<filename> and application name B<appname>. If B<filename> is NULL |
20 | the standard OpenSSL configuration file is used. If B<appname> is | 20 | the standard OpenSSL configuration file is used. If B<appname> is |
21 | NULL the standard OpenSSL application name B<openssl_conf> is used. | 21 | 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 customized using B<flags>. |
23 | 23 | ||
24 | CONF_modules_load() is idential to CONF_modules_load_file() except it | 24 | CONF_modules_load() is identical 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 |
diff --git a/src/lib/libssl/src/doc/crypto/EC_GROUP_copy.pod b/src/lib/libssl/src/doc/crypto/EC_GROUP_copy.pod index 49dc01ced1..d4896af1d5 100644 --- a/src/lib/libssl/src/doc/crypto/EC_GROUP_copy.pod +++ b/src/lib/libssl/src/doc/crypto/EC_GROUP_copy.pod | |||
@@ -74,7 +74,7 @@ If the asn1_flag is 1 then this is a named curve with an associated ASN1 OID. If | |||
74 | EC_GROUP_get_asn1_flag and EC_GROUP_set_asn1_flag get and set the status of the asn1_flag for the curve. If set then | 74 | EC_GROUP_get_asn1_flag and EC_GROUP_set_asn1_flag get and set the status of the asn1_flag for the curve. If set then |
75 | the curve_name must also be set. | 75 | the curve_name must also be set. |
76 | 76 | ||
77 | The point_coversion_form for a curve controls how EC_POINT data is encoded as ASN1 as defined in X9.62 (ECDSA). | 77 | The point_conversion_form for a curve controls how EC_POINT data is encoded as ASN1 as defined in X9.62 (ECDSA). |
78 | point_conversion_form_t is an enum defined as follows: | 78 | point_conversion_form_t is an enum defined as follows: |
79 | 79 | ||
80 | typedef enum { | 80 | typedef enum { |
@@ -135,7 +135,7 @@ or a pentanomial of the form: | |||
135 | f(x) = x^m + x^k3 + x^k2 + x^k1 + 1 with m > k3 > k2 > k1 >= 1 | 135 | f(x) = x^m + x^k3 + x^k2 + x^k1 + 1 with m > k3 > k2 > k1 >= 1 |
136 | 136 | ||
137 | The function EC_GROUP_get_basis_type returns a NID identifying whether a trinomial or pentanomial is in use for the field. The | 137 | The function EC_GROUP_get_basis_type returns a NID identifying whether a trinomial or pentanomial is in use for the field. The |
138 | function EC_GROUP_get_trinomial_basis must only be called where f(x) is of the trinomial form, and returns the value of B<k>. Similary | 138 | function EC_GROUP_get_trinomial_basis must only be called where f(x) is of the trinomial form, and returns the value of B<k>. Similarly |
139 | the function EC_GROUP_get_pentanomial_basis must only be called where f(x) is of the pentanomial form, and returns the values of B<k1>, | 139 | the function EC_GROUP_get_pentanomial_basis must only be called where f(x) is of the pentanomial form, and returns the values of B<k1>, |
140 | B<k2> and B<k3> respectively. | 140 | B<k2> and B<k3> respectively. |
141 | 141 | ||
diff --git a/src/lib/libssl/src/doc/crypto/EC_GROUP_new.pod b/src/lib/libssl/src/doc/crypto/EC_GROUP_new.pod index ff55bf33a3..9ab3566e65 100644 --- a/src/lib/libssl/src/doc/crypto/EC_GROUP_new.pod +++ b/src/lib/libssl/src/doc/crypto/EC_GROUP_new.pod | |||
@@ -48,8 +48,8 @@ EC_GROUP_set_curve_GFp sets the curve parameters B<p>, B<a> and B<b> for a curve | |||
48 | EC_group_get_curve_GFp obtains the previously set curve parameters. | 48 | EC_group_get_curve_GFp obtains the previously set curve parameters. |
49 | 49 | ||
50 | EC_GROUP_set_curve_GF2m sets the equivalent curve parameters for a curve over F2^m. In this case B<p> represents | 50 | EC_GROUP_set_curve_GF2m sets the equivalent curve parameters for a curve over F2^m. In this case B<p> represents |
51 | the irreducible polybnomial - each bit represents a term in the polynomial. Therefore there will either be three | 51 | the irreducible polynomial - each bit represents a term in the polynomial. Therefore there will either be three |
52 | or five bits set dependant on whether the polynomial is a trinomial or a pentanomial. | 52 | or five bits set dependent on whether the polynomial is a trinomial or a pentanomial. |
53 | EC_group_get_curve_GF2m obtains the previously set curve parameters. | 53 | EC_group_get_curve_GF2m obtains the previously set curve parameters. |
54 | 54 | ||
55 | The functions EC_GROUP_new_curve_GFp and EC_GROUP_new_curve_GF2m are shortcuts for calling EC_GROUP_new and the | 55 | The functions EC_GROUP_new_curve_GFp and EC_GROUP_new_curve_GF2m are shortcuts for calling EC_GROUP_new and the |
diff --git a/src/lib/libssl/src/doc/crypto/EC_KEY_new.pod b/src/lib/libssl/src/doc/crypto/EC_KEY_new.pod index 7f8f991ac7..02d7bac82c 100644 --- a/src/lib/libssl/src/doc/crypto/EC_KEY_new.pod +++ b/src/lib/libssl/src/doc/crypto/EC_KEY_new.pod | |||
@@ -40,7 +40,7 @@ EC_KEY_new, EC_KEY_get_flags, EC_KEY_set_flags, EC_KEY_clear_flags, EC_KEY_new_b | |||
40 | 40 | ||
41 | =head1 DESCRIPTION | 41 | =head1 DESCRIPTION |
42 | 42 | ||
43 | An EC_KEY represents a public key and (optionaly) an associated private key. A new EC_KEY (with no associated curve) can be constructed by calling EC_KEY_new. | 43 | An EC_KEY represents a public key and (optionally) an associated private key. A new EC_KEY (with no associated curve) can be constructed by calling EC_KEY_new. |
44 | The reference count for the newly created EC_KEY is initially set to 1. A curve can be associated with the EC_KEY by calling | 44 | The reference count for the newly created EC_KEY is initially set to 1. A curve can be associated with the EC_KEY by calling |
45 | EC_KEY_set_group. | 45 | EC_KEY_set_group. |
46 | 46 | ||
@@ -77,7 +77,7 @@ along with the private key. If EC_PKEY_NO_PUBKEY is set then the public key is n | |||
77 | The functions EC_KEY_get_conv_form and EC_KEY_set_conv_form get and set the point_conversion_form for the B<key>. For a description | 77 | The functions EC_KEY_get_conv_form and EC_KEY_set_conv_form get and set the point_conversion_form for the B<key>. For a description |
78 | of point_conversion_forms please refer to L<EC_POINT_new(3)|EC_POINT_new(3)>. | 78 | of point_conversion_forms please refer to L<EC_POINT_new(3)|EC_POINT_new(3)>. |
79 | 79 | ||
80 | EC_KEY_insert_key_method_data and EC_KEY_get_key_method_data enable the caller to associate arbitary additional data specific to the | 80 | EC_KEY_insert_key_method_data and EC_KEY_get_key_method_data enable the caller to associate arbitrary additional data specific to the |
81 | elliptic curve scheme being used with the EC_KEY object. This data is treated as a "black box" by the ec library. The data to be stored by EC_KEY_insert_key_method_data is provided in the B<data> parameter, which must have associated functions for duplicating, freeing and "clear_freeing" the data item. If a subsequent EC_KEY_get_key_method_data call is issued, the functions for duplicating, freeing and "clear_freeing" the data item must be provided again, and they must be the same as they were when the data item was inserted. | 81 | elliptic curve scheme being used with the EC_KEY object. This data is treated as a "black box" by the ec library. The data to be stored by EC_KEY_insert_key_method_data is provided in the B<data> parameter, which must have associated functions for duplicating, freeing and "clear_freeing" the data item. If a subsequent EC_KEY_get_key_method_data call is issued, the functions for duplicating, freeing and "clear_freeing" the data item must be provided again, and they must be the same as they were when the data item was inserted. |
82 | 82 | ||
83 | EC_KEY_set_flags sets the flags in the B<flags> parameter on the EC_KEY object. Any flags that are already set are left set. The currently defined standard flags are EC_FLAG_NON_FIPS_ALLOW and EC_FLAG_FIPS_CHECKED. In addition there is the flag EC_FLAG_COFACTOR_ECDH which is specific to ECDH and is defined in ecdh.h. EC_KEY_get_flags returns the current flags that are set for this EC_KEY. EC_KEY_clear_flags clears the flags indicated by the B<flags> parameter. All other flags are left in their existing state. | 83 | EC_KEY_set_flags sets the flags in the B<flags> parameter on the EC_KEY object. Any flags that are already set are left set. The currently defined standard flags are EC_FLAG_NON_FIPS_ALLOW and EC_FLAG_FIPS_CHECKED. In addition there is the flag EC_FLAG_COFACTOR_ECDH which is specific to ECDH and is defined in ecdh.h. EC_KEY_get_flags returns the current flags that are set for this EC_KEY. EC_KEY_clear_flags clears the flags indicated by the B<flags> parameter. All other flags are left in their existing state. |
diff --git a/src/lib/libssl/src/doc/crypto/EVP_BytesToKey.pod b/src/lib/libssl/src/doc/crypto/EVP_BytesToKey.pod index a27146f5c9..2dffaa1efa 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_BytesToKey.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_BytesToKey.pod | |||
@@ -46,7 +46,7 @@ enough data is available for the key and IV. D_i is defined as: | |||
46 | 46 | ||
47 | D_i = HASH^count(D_(i-1) || data || salt) | 47 | D_i = HASH^count(D_(i-1) || data || salt) |
48 | 48 | ||
49 | where || denotes concatentaion, D_0 is empty, HASH is the digest | 49 | where || denotes concatenation, D_0 is empty, HASH is the digest |
50 | algorithm in use, HASH^1(data) is simply HASH(data), HASH^2(data) | 50 | algorithm in use, HASH^1(data) is simply HASH(data), HASH^2(data) |
51 | is HASH(HASH(data)) and so on. | 51 | is HASH(HASH(data)) and so on. |
52 | 52 | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_DigestSignInit.pod b/src/lib/libssl/src/doc/crypto/EVP_DigestSignInit.pod index 7fd4c22e79..00205d2ae9 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_DigestSignInit.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_DigestSignInit.pod | |||
@@ -27,7 +27,7 @@ be used to set alternative signing options. | |||
27 | EVP_DigestSignUpdate() hashes B<cnt> bytes of data at B<d> into the | 27 | EVP_DigestSignUpdate() hashes B<cnt> bytes of data at B<d> into the |
28 | signature context B<ctx>. This function can be called several times on the | 28 | signature context B<ctx>. This function can be called several times on the |
29 | same B<ctx> to include additional data. This function is currently implemented | 29 | same B<ctx> to include additional data. This function is currently implemented |
30 | usig a macro. | 30 | using a macro. |
31 | 31 | ||
32 | EVP_DigestSignFinal() signs the data in B<ctx> places the signature in B<sig>. | 32 | EVP_DigestSignFinal() signs the data in B<ctx> places the signature in B<sig>. |
33 | If B<sig> is B<NULL> then the maximum size of the output buffer is written to | 33 | If B<sig> is B<NULL> then the maximum size of the output buffer is written to |
diff --git a/src/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod b/src/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod index a0a782e772..e9254de3d2 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod | |||
@@ -105,7 +105,7 @@ EVP_aes_192_ccm, EVP_aes_256_ccm - EVP cipher routines | |||
105 | The EVP cipher routines are a high level interface to certain | 105 | The EVP cipher routines are a high level interface to certain |
106 | symmetric ciphers. | 106 | symmetric ciphers. |
107 | 107 | ||
108 | EVP_CIPHER_CTX_init() initializes cipher contex B<ctx>. | 108 | EVP_CIPHER_CTX_init() initializes cipher context B<ctx>. |
109 | 109 | ||
110 | EVP_EncryptInit_ex() sets up cipher context B<ctx> for encryption | 110 | EVP_EncryptInit_ex() sets up cipher context B<ctx> for encryption |
111 | with cipher B<type> from ENGINE B<impl>. B<ctx> must be initialized | 111 | with cipher B<type> from ENGINE B<impl>. B<ctx> must be initialized |
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 91125da62e..e8776e1e67 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 | |||
@@ -90,7 +90,7 @@ B<PSS> block structure. If this macro is not called a salt length value of -2 | |||
90 | is used by default. | 90 | is used by default. |
91 | 91 | ||
92 | The EVP_PKEY_CTX_set_rsa_rsa_keygen_bits() macro sets the RSA key length for | 92 | The EVP_PKEY_CTX_set_rsa_rsa_keygen_bits() macro sets the RSA key length for |
93 | RSA key genration to B<bits>. If not specified 1024 bits is used. | 93 | RSA key generation to B<bits>. If not specified 1024 bits is used. |
94 | 94 | ||
95 | The EVP_PKEY_CTX_set_rsa_keygen_pubexp() macro sets the public exponent value | 95 | The EVP_PKEY_CTX_set_rsa_keygen_pubexp() macro sets the public exponent value |
96 | for RSA key generation to B<pubexp> currently it should be an odd integer. The | 96 | for RSA key generation to B<pubexp> currently it should be an odd integer. The |
diff --git a/src/lib/libssl/src/doc/crypto/EVP_PKEY_CTX_new.pod b/src/lib/libssl/src/doc/crypto/EVP_PKEY_CTX_new.pod index 9822d6806f..60ad61e853 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_CTX_new.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_CTX_new.pod | |||
@@ -22,7 +22,7 @@ the algorithm specified in B<pkey> and ENGINE B<e>. | |||
22 | The EVP_PKEY_CTX_new_id() function allocates public key algorithm context | 22 | The EVP_PKEY_CTX_new_id() function allocates public key algorithm context |
23 | using the algorithm specified by B<id> and ENGINE B<e>. It is normally used | 23 | using the algorithm specified by B<id> and ENGINE B<e>. It is normally used |
24 | when no B<EVP_PKEY> structure is associated with the operations, for example | 24 | when no B<EVP_PKEY> structure is associated with the operations, for example |
25 | during parameter generation of key genration for some algorithms. | 25 | during parameter generation of key generation for some algorithms. |
26 | 26 | ||
27 | EVP_PKEY_CTX_dup() duplicates the context B<ctx>. | 27 | EVP_PKEY_CTX_dup() duplicates the context B<ctx>. |
28 | 28 | ||
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 c389216086..7a690247bf 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_cmp.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_cmp.pod | |||
@@ -24,10 +24,10 @@ doesn't use parameters. | |||
24 | The function EVP_PKEY_copy_parameters() copies the parameters from key | 24 | The function EVP_PKEY_copy_parameters() copies the parameters from key |
25 | B<from> to key B<to>. | 25 | B<from> to key B<to>. |
26 | 26 | ||
27 | The funcion EVP_PKEY_cmp_parameters() compares the parameters of keys | 27 | The function EVP_PKEY_cmp_parameters() compares the parameters of keys |
28 | B<a> and B<b>. | 28 | B<a> and B<b>. |
29 | 29 | ||
30 | The funcion EVP_PKEY_cmp() compares the public key components and paramters | 30 | The function EVP_PKEY_cmp() compares the public key components and parameters |
31 | (if present) of keys B<a> and B<b>. | 31 | (if present) of keys B<a> and B<b>. |
32 | 32 | ||
33 | =head1 NOTES | 33 | =head1 NOTES |
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 05ea04be11..463c44170e 100644 --- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod +++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod | |||
@@ -29,7 +29,7 @@ EVP_PKEY_CTX_get_app_data - key and parameter generation functions | |||
29 | =head1 DESCRIPTION | 29 | =head1 DESCRIPTION |
30 | 30 | ||
31 | The EVP_PKEY_keygen_init() function initializes a public key algorithm | 31 | The EVP_PKEY_keygen_init() function initializes a public key algorithm |
32 | context using key B<pkey> for a key genration operation. | 32 | context using key B<pkey> for a key generation operation. |
33 | 33 | ||
34 | The EVP_PKEY_keygen() function performs a key generation operation, the | 34 | The EVP_PKEY_keygen() function performs a key generation operation, the |
35 | generated key is written to B<ppkey>. | 35 | generated key is written to B<ppkey>. |
@@ -47,7 +47,7 @@ parameters available is returned. Any non negative value returns the value of | |||
47 | that parameter. EVP_PKEY_CTX_gen_keygen_info() with a non-negative value for | 47 | that parameter. EVP_PKEY_CTX_gen_keygen_info() with a non-negative value for |
48 | B<idx> should only be called within the generation callback. | 48 | B<idx> should only be called within the generation callback. |
49 | 49 | ||
50 | If the callback returns 0 then the key genration operation is aborted and an | 50 | If the callback returns 0 then the key generation operation is aborted and an |
51 | error occurs. This might occur during a time consuming operation where | 51 | error occurs. This might occur during a time consuming operation where |
52 | a user clicks on a "cancel" button. | 52 | a user clicks on a "cancel" button. |
53 | 53 | ||
@@ -67,7 +67,7 @@ once on the same context if several operations are performed using the same | |||
67 | parameters. | 67 | parameters. |
68 | 68 | ||
69 | The meaning of the parameters passed to the callback will depend on the | 69 | The meaning of the parameters passed to the callback will depend on the |
70 | algorithm and the specifiic implementation of the algorithm. Some might not | 70 | algorithm and the specific implementation of the algorithm. Some might not |
71 | give any useful information at all during key or parameter generation. Others | 71 | give any useful information at all during key or parameter generation. Others |
72 | might not even call the callback. | 72 | might not even call the callback. |
73 | 73 | ||
diff --git a/src/lib/libssl/src/doc/crypto/OBJ_nid2obj.pod b/src/lib/libssl/src/doc/crypto/OBJ_nid2obj.pod index 3656390ead..95949ac091 100644 --- a/src/lib/libssl/src/doc/crypto/OBJ_nid2obj.pod +++ b/src/lib/libssl/src/doc/crypto/OBJ_nid2obj.pod | |||
@@ -43,7 +43,7 @@ for the object B<o>, the long name <ln> or the short name <sn> respectively | |||
43 | or NID_undef if an error occurred. | 43 | or NID_undef if an error occurred. |
44 | 44 | ||
45 | OBJ_txt2nid() returns NID corresponding to text string <s>. B<s> can be | 45 | OBJ_txt2nid() returns NID corresponding to text string <s>. B<s> can be |
46 | a long name, a short name or the numerical respresentation of an object. | 46 | a long name, a short name or the numerical representation of an object. |
47 | 47 | ||
48 | OBJ_txt2obj() converts the text string B<s> into an ASN1_OBJECT structure. | 48 | OBJ_txt2obj() converts the text string B<s> into an ASN1_OBJECT structure. |
49 | If B<no_name> is 0 then long names and short names will be interpreted | 49 | If B<no_name> is 0 then long names and short names will be interpreted |
diff --git a/src/lib/libssl/src/doc/crypto/PKCS12_create.pod b/src/lib/libssl/src/doc/crypto/PKCS12_create.pod index 12fbd20b8a..3b27c11a10 100644 --- a/src/lib/libssl/src/doc/crypto/PKCS12_create.pod +++ b/src/lib/libssl/src/doc/crypto/PKCS12_create.pod | |||
@@ -17,11 +17,11 @@ PKCS12_create - create a PKCS#12 structure | |||
17 | PKCS12_create() creates a PKCS#12 structure. | 17 | PKCS12_create() creates a PKCS#12 structure. |
18 | 18 | ||
19 | B<pass> is the passphrase to use. B<name> is the B<friendlyName> to use for | 19 | B<pass> is the passphrase to use. B<name> is the B<friendlyName> to use for |
20 | the supplied certifictate and key. B<pkey> is the private key to include in | 20 | the supplied certificate and key. B<pkey> is the private key to include in |
21 | the structure and B<cert> its corresponding certificates. B<ca> is an optional | 21 | the structure and B<cert> its corresponding certificates. B<ca> is an optional |
22 | set of certificates to also include in the structure. | 22 | set of certificates to also include in the structure. |
23 | Either B<pkey>, B<cert> or both can be B<NULL> to indicate that no key or | 23 | Either B<pkey>, B<cert> or both can be B<NULL> to indicate that no key or |
24 | certficate is required. | 24 | certificate is required. |
25 | 25 | ||
26 | B<nid_key> and B<nid_cert> are the encryption algorithms that should be used | 26 | B<nid_key> and B<nid_cert> are the encryption algorithms that should be used |
27 | for the key and certificate respectively. If either B<nid_key> or B<nid_cert> | 27 | for the key and certificate respectively. If either B<nid_key> or B<nid_cert> |
diff --git a/src/lib/libssl/src/doc/crypto/PKCS7_sign.pod b/src/lib/libssl/src/doc/crypto/PKCS7_sign.pod index 9a4f5b173e..64a3036c0a 100644 --- a/src/lib/libssl/src/doc/crypto/PKCS7_sign.pod +++ b/src/lib/libssl/src/doc/crypto/PKCS7_sign.pod | |||
@@ -13,7 +13,7 @@ PKCS7_sign - create a PKCS#7 signedData structure | |||
13 | =head1 DESCRIPTION | 13 | =head1 DESCRIPTION |
14 | 14 | ||
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 corresponding 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 | ||
@@ -46,7 +46,7 @@ required by the S/MIME specifications) if B<PKCS7_BINARY> is set no translation | |||
46 | occurs. This option should be used if the supplied data is in binary format | 46 | occurs. This option should be used if the supplied data is in binary format |
47 | otherwise the translation will corrupt it. | 47 | otherwise the translation will corrupt it. |
48 | 48 | ||
49 | The signedData structure includes several PKCS#7 autenticatedAttributes | 49 | The signedData structure includes several PKCS#7 authenticatedAttributes |
50 | including the signing time, the PKCS#7 content type and the supported list of | 50 | including the signing time, the PKCS#7 content type and the supported list of |
51 | ciphers in an SMIMECapabilities attribute. If B<PKCS7_NOATTR> is set then no | 51 | ciphers in an SMIMECapabilities attribute. If B<PKCS7_NOATTR> is set then no |
52 | authenticatedAttributes will be used. If B<PKCS7_NOSMIMECAP> is set then just | 52 | authenticatedAttributes will be used. If B<PKCS7_NOSMIMECAP> is set then just |
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 afe8ad97cd..280455d476 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 | |||
@@ -40,7 +40,7 @@ Any of the following flags (ored together) can be passed in the B<flags> | |||
40 | parameter. | 40 | parameter. |
41 | 41 | ||
42 | If B<PKCS7_REUSE_DIGEST> is set then an attempt is made to copy the content | 42 | If B<PKCS7_REUSE_DIGEST> is set then an attempt is made to copy the content |
43 | digest value from the PKCS7 struture: to add a signer to an existing structure. | 43 | digest value from the PKCS7 structure: 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 | ||
@@ -55,7 +55,7 @@ B<signcert> parameter though. This can reduce the size of the signature if the | |||
55 | signers certificate can be obtained by other means: for example a previously | 55 | signers certificate can be obtained by other means: for example a previously |
56 | signed message. | 56 | signed message. |
57 | 57 | ||
58 | The signedData structure includes several PKCS#7 autenticatedAttributes | 58 | The signedData structure includes several PKCS#7 authenticatedAttributes |
59 | including the signing time, the PKCS#7 content type and the supported list of | 59 | including the signing time, the PKCS#7 content type and the supported list of |
60 | ciphers in an SMIMECapabilities attribute. If B<PKCS7_NOATTR> is set then no | 60 | ciphers in an SMIMECapabilities attribute. If B<PKCS7_NOATTR> is set then no |
61 | authenticatedAttributes will be used. If B<PKCS7_NOSMIMECAP> is set then just | 61 | authenticatedAttributes will be used. If B<PKCS7_NOSMIMECAP> is set then just |
diff --git a/src/lib/libssl/src/doc/crypto/PKCS7_verify.pod b/src/lib/libssl/src/doc/crypto/PKCS7_verify.pod index 781c6108a9..059fbff8e9 100644 --- a/src/lib/libssl/src/doc/crypto/PKCS7_verify.pod +++ b/src/lib/libssl/src/doc/crypto/PKCS7_verify.pod | |||
@@ -16,7 +16,7 @@ PKCS7_verify, PKCS7_get0_signers - verify a PKCS#7 signedData structure | |||
16 | 16 | ||
17 | PKCS7_verify() verifies a PKCS#7 signedData structure. B<p7> is the PKCS7 | 17 | PKCS7_verify() verifies a PKCS#7 signedData structure. B<p7> is the PKCS7 |
18 | structure to verify. B<certs> is a set of certificates in which to search for | 18 | structure to verify. B<certs> is a set of certificates in which to search for |
19 | the signer's certificate. B<store> is a trusted certficate store (used for | 19 | the signer's certificate. B<store> is a trusted certificate store (used for |
20 | chain verification). B<indata> is the signed data if the content is not | 20 | chain verification). B<indata> is the signed data if the content is not |
21 | present in B<p7> (that is it is detached). The content is written to B<out> | 21 | present in B<p7> (that is it is detached). The content is written to B<out> |
22 | if it is not NULL. | 22 | if it is not NULL. |
diff --git a/src/lib/libssl/src/doc/crypto/SMIME_write_PKCS7.pod b/src/lib/libssl/src/doc/crypto/SMIME_write_PKCS7.pod index ca6bd02763..4a7cd08c42 100644 --- a/src/lib/libssl/src/doc/crypto/SMIME_write_PKCS7.pod +++ b/src/lib/libssl/src/doc/crypto/SMIME_write_PKCS7.pod | |||
@@ -40,7 +40,7 @@ the data must be read twice: once to compute the signature in PKCS7_sign() | |||
40 | and once to output the S/MIME message. | 40 | and once to output the S/MIME message. |
41 | 41 | ||
42 | If streaming is performed the content is output in BER format using indefinite | 42 | If streaming is performed the content is output in BER format using indefinite |
43 | length constructuted encoding except in the case of signed data with detached | 43 | length constructed encoding except in the case of signed data with detached |
44 | content where the content is absent and DER format is used. | 44 | content where the content is absent and DER format is used. |
45 | 45 | ||
46 | =head1 BUGS | 46 | =head1 BUGS |
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 c6442b947f..f97e05e683 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 | |||
@@ -45,7 +45,7 @@ B<loc>. The deleted entry is returned and must be freed up. | |||
45 | =head1 NOTES | 45 | =head1 NOTES |
46 | 46 | ||
47 | The use of string types such as B<MBSTRING_ASC> or B<MBSTRING_UTF8> | 47 | The use of string types such as B<MBSTRING_ASC> or B<MBSTRING_UTF8> |
48 | is strongly recommened for the B<type> parameter. This allows the | 48 | is strongly recommended for the B<type> parameter. This allows the |
49 | internal code to correctly determine the type of the field and to | 49 | internal code to correctly determine the type of the field and to |
50 | apply length checks according to the relevant standards. This is | 50 | apply length checks according to the relevant standards. This is |
51 | done using ASN1_STRING_set_by_NID(). | 51 | done using ASN1_STRING_set_by_NID(). |
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 988fd7bdaf..48510890e8 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 | |||
@@ -51,7 +51,7 @@ X509_NAME_get_text_by_NID() and X509_NAME_get_text_by_OBJ() are | |||
51 | legacy functions which have various limitations which make them | 51 | legacy functions which have various limitations which make them |
52 | of minimal use in practice. They can only find the first matching | 52 | of minimal use in practice. They can only find the first matching |
53 | entry and will copy the contents of the field verbatim: this can | 53 | entry and will copy the contents of the field verbatim: this can |
54 | be highly confusing if the target is a muticharacter string type | 54 | be highly confusing if the target is a multicharacter string type |
55 | like a BMPString or a UTF8String. | 55 | like a BMPString or a UTF8String. |
56 | 56 | ||
57 | For a more general solution X509_NAME_get_index_by_NID() or | 57 | For a more general solution X509_NAME_get_index_by_NID() or |
diff --git a/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_get_error.pod b/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_get_error.pod index e4339dc28f..270b265ce5 100644 --- a/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_get_error.pod +++ b/src/lib/libssl/src/doc/crypto/X509_STORE_CTX_get_error.pod | |||
@@ -35,7 +35,7 @@ checks. | |||
35 | 35 | ||
36 | X509_STORE_CTX_get_error_depth() returns the B<depth> of the error. This is a | 36 | X509_STORE_CTX_get_error_depth() returns the B<depth> of the error. This is a |
37 | non-negative integer representing where in the certificate chain the error | 37 | non-negative integer representing where in the certificate chain the error |
38 | occurred. If it is zero it occured in the end entity certificate, one if | 38 | occurred. If it is zero it occurred in the end entity certificate, one if |
39 | it is the certificate which signed the end entity certificate and so on. | 39 | it is the certificate which signed the end entity certificate and so on. |
40 | 40 | ||
41 | X509_STORE_CTX_get_current_cert() returns the certificate in B<ctx> which | 41 | X509_STORE_CTX_get_current_cert() returns the certificate in B<ctx> which |
@@ -58,7 +58,7 @@ X509_STORE_CTX_get_error() returns B<X509_V_OK> or an error code. | |||
58 | 58 | ||
59 | X509_STORE_CTX_get_error_depth() returns a non-negative error depth. | 59 | X509_STORE_CTX_get_error_depth() returns a non-negative error depth. |
60 | 60 | ||
61 | X509_STORE_CTX_get_current_cert() returns the cerificate which caused the | 61 | X509_STORE_CTX_get_current_cert() returns the certificate which caused the |
62 | error or B<NULL> if no certificate is relevant to the error. | 62 | error or B<NULL> if no certificate is relevant to the error. |
63 | 63 | ||
64 | X509_verify_cert_error_string() returns a human readable error string for | 64 | X509_verify_cert_error_string() returns a human readable error string for |
@@ -265,11 +265,11 @@ Some feature of a certificate extension is not supported. Unused. | |||
265 | 265 | ||
266 | =item B<X509_V_ERR_PERMITTED_VIOLATION: permitted subtree violation> | 266 | =item B<X509_V_ERR_PERMITTED_VIOLATION: permitted subtree violation> |
267 | 267 | ||
268 | A name constraint violation occured in the permitted subtrees. | 268 | A name constraint violation occurred in the permitted subtrees. |
269 | 269 | ||
270 | =item B<X509_V_ERR_EXCLUDED_VIOLATION: excluded subtree violation> | 270 | =item B<X509_V_ERR_EXCLUDED_VIOLATION: excluded subtree violation> |
271 | 271 | ||
272 | A name constraint violation occured in the excluded subtrees. | 272 | A name constraint violation occurred in the excluded subtrees. |
273 | 273 | ||
274 | =item B<X509_V_ERR_SUBTREE_MINMAX: name constraints minimum and maximum not | 274 | =item B<X509_V_ERR_SUBTREE_MINMAX: name constraints minimum and maximum not |
275 | supported> | 275 | supported> |
@@ -292,7 +292,7 @@ a garbage extension or some new feature not currently supported. | |||
292 | 292 | ||
293 | =item B<X509_V_ERR_CRL_PATH_VALIDATION_ERROR: CRL path validation error> | 293 | =item B<X509_V_ERR_CRL_PATH_VALIDATION_ERROR: CRL path validation error> |
294 | 294 | ||
295 | An error occured when attempting to verify the CRL path. This error can only | 295 | An error occurred when attempting to verify the CRL path. This error can only |
296 | happen if extended CRL checking is enabled. | 296 | happen if extended CRL checking is enabled. |
297 | 297 | ||
298 | =item B<X509_V_ERR_APPLICATION_VERIFICATION: application verification failure> | 298 | =item B<X509_V_ERR_APPLICATION_VERIFICATION: application verification failure> |
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 8f602274ee..66c0da04d2 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 | |||
@@ -52,7 +52,7 @@ X509_STORE_CTX_trusted_stack() sets the set of trusted certificates of B<ctx> | |||
52 | to B<sk>. This is an alternative way of specifying trusted certificates | 52 | to B<sk>. This is an alternative way of specifying trusted certificates |
53 | instead of using an B<X509_STORE>. | 53 | instead of using an B<X509_STORE>. |
54 | 54 | ||
55 | X509_STORE_CTX_set_cert() sets the certificate to be vertified in B<ctx> to | 55 | X509_STORE_CTX_set_cert() sets the certificate to be verified in B<ctx> to |
56 | B<x>. | 56 | B<x>. |
57 | 57 | ||
58 | X509_STORE_CTX_set_chain() sets the additional certificate chain used by B<ctx> | 58 | X509_STORE_CTX_set_chain() sets the additional certificate chain used by B<ctx> |
@@ -64,10 +64,10 @@ enabled in the associated B<X509_VERIFY_PARAM> structure. This might be | |||
64 | used where additional "useful" CRLs are supplied as part of a protocol, | 64 | used where additional "useful" CRLs are supplied as part of a protocol, |
65 | for example in a PKCS#7 structure. | 65 | for example in a PKCS#7 structure. |
66 | 66 | ||
67 | X509_VERIFY_PARAM *X509_STORE_CTX_get0_param() retrieves an intenal pointer | 67 | X509_VERIFY_PARAM *X509_STORE_CTX_get0_param() retrieves an internal pointer |
68 | to the verification parameters associated with B<ctx>. | 68 | to the verification parameters associated with B<ctx>. |
69 | 69 | ||
70 | X509_STORE_CTX_set0_param() sets the intenal verification parameter pointer | 70 | X509_STORE_CTX_set0_param() sets the internal verification parameter pointer |
71 | to B<param>. After this call B<param> should not be used. | 71 | to B<param>. After this call B<param> should not be used. |
72 | 72 | ||
73 | X509_STORE_CTX_set_default() looks up and sets the default verification | 73 | X509_STORE_CTX_set_default() looks up and sets the default verification |
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 6acdd71e72..6c88aec49e 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 | |||
@@ -126,7 +126,7 @@ If B<X509_V_FLAG_USE_DELTAS> ise set delta CRLs (if present) are used to | |||
126 | determine certificate status. If not set deltas are ignored. | 126 | determine certificate status. If not set deltas are ignored. |
127 | 127 | ||
128 | B<X509_V_FLAG_CHECK_SS_SIGNATURE> enables checking of the root CA self signed | 128 | B<X509_V_FLAG_CHECK_SS_SIGNATURE> enables checking of the root CA self signed |
129 | cerificate signature. By default this check is disabled because it doesn't | 129 | certificate signature. By default this check is disabled because it doesn't |
130 | add any additional security but in some cases applications might want to | 130 | add any additional security but in some cases applications might want to |
131 | check the signature anyway. A side effect of not checking the root CA | 131 | check the signature anyway. A side effect of not checking the root CA |
132 | signature is that disabled or unsupported message digests on the root CA | 132 | signature is that disabled or unsupported message digests on the root CA |
diff --git a/src/lib/libssl/src/doc/crypto/X509_verify_cert.pod b/src/lib/libssl/src/doc/crypto/X509_verify_cert.pod index 5253bdcd70..f05edd8333 100644 --- a/src/lib/libssl/src/doc/crypto/X509_verify_cert.pod +++ b/src/lib/libssl/src/doc/crypto/X509_verify_cert.pod | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | =head1 NAME | 3 | =head1 NAME |
4 | 4 | ||
5 | X509_verify_cert - discover and verify X509 certificte chain | 5 | X509_verify_cert - discover and verify X509 certificate chain |
6 | 6 | ||
7 | =head1 SYNOPSIS | 7 | =head1 SYNOPSIS |
8 | 8 | ||
@@ -40,7 +40,7 @@ for <= 0 return value on error. | |||
40 | =head1 BUGS | 40 | =head1 BUGS |
41 | 41 | ||
42 | This function uses the header B<x509.h> as opposed to most chain verification | 42 | This function uses the header B<x509.h> as opposed to most chain verification |
43 | functiosn which use B<x509_vfy.h>. | 43 | functions which use B<x509_vfy.h>. |
44 | 44 | ||
45 | =head1 SEE ALSO | 45 | =head1 SEE ALSO |
46 | 46 | ||
diff --git a/src/lib/libssl/src/doc/crypto/d2i_DSAPublicKey.pod b/src/lib/libssl/src/doc/crypto/d2i_DSAPublicKey.pod index eeb96c485f..10c49e3ad2 100644 --- a/src/lib/libssl/src/doc/crypto/d2i_DSAPublicKey.pod +++ b/src/lib/libssl/src/doc/crypto/d2i_DSAPublicKey.pod | |||
@@ -68,7 +68,7 @@ If B<write_params> is zero then only the B<pub_key> field is encoded as an | |||
68 | B<INTEGER>. If B<write_params> is 1 then a B<SEQUENCE> consisting of the | 68 | B<INTEGER>. If B<write_params> is 1 then a B<SEQUENCE> consisting of the |
69 | B<p>, B<q>, B<g> and B<pub_key> respectively fields are encoded. | 69 | B<p>, B<q>, B<g> and B<pub_key> respectively fields are encoded. |
70 | 70 | ||
71 | The B<DSAPrivateKey> functions also use a non standard structure consiting | 71 | The B<DSAPrivateKey> functions also use a non standard structure consisting |
72 | consisting of a SEQUENCE containing the B<p>, B<q>, B<g> and B<pub_key> and | 72 | consisting of a SEQUENCE containing the B<p>, B<q>, B<g> and B<pub_key> and |
73 | B<priv_key> fields respectively. | 73 | B<priv_key> fields respectively. |
74 | 74 | ||
diff --git a/src/lib/libssl/src/doc/crypto/engine.pod b/src/lib/libssl/src/doc/crypto/engine.pod index 8020112835..e305a73271 100644 --- a/src/lib/libssl/src/doc/crypto/engine.pod +++ b/src/lib/libssl/src/doc/crypto/engine.pod | |||
@@ -181,7 +181,7 @@ to use the pointer value at all, as this kind of reference is a guarantee | |||
181 | that the structure can not be deallocated until the reference is released. | 181 | that the structure can not be deallocated until the reference is released. |
182 | 182 | ||
183 | However, a structural reference provides no guarantee that the ENGINE is | 183 | However, a structural reference provides no guarantee that the ENGINE is |
184 | initiliased and able to use any of its cryptographic | 184 | initialised and able to use any of its cryptographic |
185 | implementations. Indeed it's quite possible that most ENGINEs will not | 185 | implementations. Indeed it's quite possible that most ENGINEs will not |
186 | initialise at all in typical environments, as ENGINEs are typically used to | 186 | initialise at all in typical environments, as ENGINEs are typically used to |
187 | support specialised hardware. To use an ENGINE's functionality, you need a | 187 | support specialised hardware. To use an ENGINE's functionality, you need a |
@@ -573,7 +573,7 @@ for any higher-level ENGINE functions such as ENGINE_ctrl_cmd_string(). | |||
573 | by applications, administrations, users, etc. These can support arbitrary | 573 | by applications, administrations, users, etc. These can support arbitrary |
574 | operations via ENGINE_ctrl(), including passing to and/or from the control | 574 | operations via ENGINE_ctrl(), including passing to and/or from the control |
575 | commands data of any arbitrary type. These commands are supported in the | 575 | commands data of any arbitrary type. These commands are supported in the |
576 | discovery mechanisms simply to allow applications determinie if an ENGINE | 576 | discovery mechanisms simply allow applications to determine if an ENGINE |
577 | supports certain specific commands it might want to use (eg. application "foo" | 577 | supports certain specific commands it might want to use (eg. application "foo" |
578 | might query various ENGINEs to see if they implement "FOO_GET_VENDOR_LOGO_GIF" - | 578 | might query various ENGINEs to see if they implement "FOO_GET_VENDOR_LOGO_GIF" - |
579 | and ENGINE could therefore decide whether or not to support this "foo"-specific | 579 | and ENGINE could therefore decide whether or not to support this "foo"-specific |