mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2025-01-09 04:55:38 +00:00
Clarify Comments and Fix Typos (#651)
Fixes many typos, and errors in comments. * Clarifies many comments * Grammar correction in config.pl help text * Removed comment about MBEDTLS_X509_EXT_NS_CERT_TYPE. * Comment typo fix (Dont => Don't) * Comment typo fix (assure => ensure) * Comment typo fix (byes => bytes) * Added citation for quoted standard * Comment typo fix (one complement => 1's complement) The is some debate about whether to prefer "one's complement", "ones' complement", or "1's complement". The more recent RFCs related to TLS (RFC 6347, RFC 4347, etc) use " 1's complement", so I followed that convention. * Added missing ")" in comment * Comment alignment * Incorrect comment after #endif
This commit is contained in:
parent
19714633f9
commit
7a77cb21d8
|
@ -206,7 +206,7 @@ int mbedtls_rsa_check_pub_priv( const mbedtls_rsa_context *pub, const mbedtls_rs
|
||||||
* \return 0 if successful, or an MBEDTLS_ERR_RSA_XXX error code
|
* \return 0 if successful, or an MBEDTLS_ERR_RSA_XXX error code
|
||||||
*
|
*
|
||||||
* \note This function does NOT take care of message
|
* \note This function does NOT take care of message
|
||||||
* padding. Also, be sure to set input[0] = 0 or assure that
|
* padding. Also, be sure to set input[0] = 0 or ensure that
|
||||||
* input is smaller than N.
|
* input is smaller than N.
|
||||||
*
|
*
|
||||||
* \note The input and output buffers must be large
|
* \note The input and output buffers must be large
|
||||||
|
|
|
@ -157,7 +157,7 @@
|
||||||
#define MBEDTLS_X509_EXT_INIHIBIT_ANYPOLICY (1 << 13)
|
#define MBEDTLS_X509_EXT_INIHIBIT_ANYPOLICY (1 << 13)
|
||||||
#define MBEDTLS_X509_EXT_FRESHEST_CRL (1 << 14)
|
#define MBEDTLS_X509_EXT_FRESHEST_CRL (1 << 14)
|
||||||
|
|
||||||
#define MBEDTLS_X509_EXT_NS_CERT_TYPE (1 << 16) /* Parsed (and then ?) */
|
#define MBEDTLS_X509_EXT_NS_CERT_TYPE (1 << 16)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Storage format identifiers
|
* Storage format identifiers
|
||||||
|
|
|
@ -228,7 +228,7 @@ int mbedtls_net_bind( mbedtls_net_context *ctx, const char *bind_ip, const char
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* I we ever get there, it's a success */
|
/* Bind was successful */
|
||||||
ret = 0;
|
ret = 0;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1186,12 +1186,12 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk,
|
||||||
#endif /* MBEDTLS_PEM_PARSE_C */
|
#endif /* MBEDTLS_PEM_PARSE_C */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* At this point we only know it's not a PEM formatted key. Could be any
|
* At this point we only know it's not a PEM formatted key. Could be any
|
||||||
* of the known DER encoded private key formats
|
* of the known DER encoded private key formats
|
||||||
*
|
*
|
||||||
* We try the different DER format parsers to see if one passes without
|
* We try the different DER format parsers to see if one passes without
|
||||||
* error
|
* error
|
||||||
*/
|
*/
|
||||||
#if defined(MBEDTLS_PKCS12_C) || defined(MBEDTLS_PKCS5_C)
|
#if defined(MBEDTLS_PKCS12_C) || defined(MBEDTLS_PKCS5_C)
|
||||||
if( ( ret = pk_parse_key_pkcs8_encrypted_der( pk, key, keylen,
|
if( ( ret = pk_parse_key_pkcs8_encrypted_der( pk, key, keylen,
|
||||||
pwd, pwdlen ) ) == 0 )
|
pwd, pwdlen ) ) == 0 )
|
||||||
|
|
|
@ -3413,7 +3413,7 @@ static int ssl_handle_possible_reconnect( mbedtls_ssl_context *ssl )
|
||||||
|
|
||||||
if( ret == MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED )
|
if( ret == MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED )
|
||||||
{
|
{
|
||||||
/* Dont check write errors as we can't do anything here.
|
/* Don't check write errors as we can't do anything here.
|
||||||
* If the error is permanent we'll catch it later,
|
* If the error is permanent we'll catch it later,
|
||||||
* if it's not, then hopefully it'll work next time. */
|
* if it's not, then hopefully it'll work next time. */
|
||||||
(void) ssl->f_send( ssl->p_bio, ssl->out_buf, len );
|
(void) ssl->f_send( ssl->p_bio, ssl->out_buf, len );
|
||||||
|
@ -5914,8 +5914,9 @@ int mbedtls_ssl_conf_alpn_protocols( mbedtls_ssl_config *conf, const char **prot
|
||||||
const char **p;
|
const char **p;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* "Empty strings MUST NOT be included and byte strings MUST NOT be
|
* RFC 7301 3.1: "Empty strings MUST NOT be included and byte strings
|
||||||
* truncated". Check lengths now rather than later.
|
* MUST NOT be truncated."
|
||||||
|
* We check lengths now rather than later.
|
||||||
*/
|
*/
|
||||||
tot_len = 0;
|
tot_len = 0;
|
||||||
for( p = protos; *p != NULL; p++ )
|
for( p = protos; *p != NULL; p++ )
|
||||||
|
@ -7472,7 +7473,7 @@ int mbedtls_ssl_check_cert_usage( const mbedtls_x509_crt *cert,
|
||||||
* and, for DTLS, to/from TLS equivalent.
|
* and, for DTLS, to/from TLS equivalent.
|
||||||
*
|
*
|
||||||
* For TLS this is the identity.
|
* For TLS this is the identity.
|
||||||
* For DTLS, use one complement (v -> 255 - v, and then map as follows:
|
* For DTLS, use 1's complement (v -> 255 - v, and then map as follows:
|
||||||
* 1.0 <-> 3.2 (DTLS 1.0 is based on TLS 1.1)
|
* 1.0 <-> 3.2 (DTLS 1.0 is based on TLS 1.1)
|
||||||
* 1.x <-> 3.x+1 for x != 0 (DTLS 1.2 based on TLS 1.2)
|
* 1.x <-> 3.x+1 for x != 0 (DTLS 1.2 based on TLS 1.2)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -656,7 +656,7 @@ int mbedtls_x509_get_sig_alg( const mbedtls_x509_buf *sig_oid, const mbedtls_x50
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* X.509 Extensions (No parsing of extensions, pointer should
|
* X.509 Extensions (No parsing of extensions, pointer should
|
||||||
* be either manually updated or extensions should be parsed!
|
* be either manually updated or extensions should be parsed!)
|
||||||
*/
|
*/
|
||||||
int mbedtls_x509_get_ext( unsigned char **p, const unsigned char *end,
|
int mbedtls_x509_get_ext( unsigned char **p, const unsigned char *end,
|
||||||
mbedtls_x509_buf *ext, int tag )
|
mbedtls_x509_buf *ext, int tag )
|
||||||
|
|
|
@ -6,8 +6,26 @@ use warnings;
|
||||||
use strict;
|
use strict;
|
||||||
|
|
||||||
my $usage = <<EOU;
|
my $usage = <<EOU;
|
||||||
$0 [-f <file>] unset <name>
|
$0 [-f <file>] [set <symbol> <value> | unset <symbol> | full | realfull]
|
||||||
$0 [-f <file>] set <name> [<value>]
|
|
||||||
|
Commands
|
||||||
|
set <symbol> [<value>] - Uncomments or adds a #define for the <symbol> to
|
||||||
|
the configuration file, and optionally making it
|
||||||
|
of <value>.
|
||||||
|
If the symbol isn't present in the file an error
|
||||||
|
is returned.
|
||||||
|
unset <symbol> - Comments out the #define for the given symbol if
|
||||||
|
present in the configuration file.
|
||||||
|
full - Uncomments all #define's in the configuration file
|
||||||
|
excluding some reserved symbols, until the
|
||||||
|
'Module configuration options' section
|
||||||
|
realfull - Uncomments all #define's with no exclusions
|
||||||
|
|
||||||
|
Options
|
||||||
|
-f <filename> - The file or file path for the configuration file
|
||||||
|
to edit. When omitted, the following default is
|
||||||
|
used:
|
||||||
|
$config_file
|
||||||
EOU
|
EOU
|
||||||
# for our eyes only:
|
# for our eyes only:
|
||||||
# $0 [-f <file>] full|realfull
|
# $0 [-f <file>] full|realfull
|
||||||
|
|
Loading…
Reference in a new issue