aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorFdaSilvaYY <fdasilvayy@gmail.com>2016-09-24 13:37:16 +0200
committerMatt Caswell <matt@openssl.org>2017-01-25 09:06:34 +0000
commitd2a56999985ccf56ea6c82e6fa2f91c345bbc9d3 (patch)
treece01aa43b9446862e64c01c383a300a63352243a /doc
parent28b86f313b43cc70d11054d3830ef82e7af8290a (diff)
downloadopenssl-d2a56999985ccf56ea6c82e6fa2f91c345bbc9d3.tar.gz
Few nit's
Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1618)
Diffstat (limited to 'doc')
-rw-r--r--doc/man3/EVP_DigestInit.pod2
-rw-r--r--doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod13
2 files changed, 6 insertions, 9 deletions
diff --git a/doc/man3/EVP_DigestInit.pod b/doc/man3/EVP_DigestInit.pod
index d57f09daad..7d283fa7d3 100644
--- a/doc/man3/EVP_DigestInit.pod
+++ b/doc/man3/EVP_DigestInit.pod
@@ -210,7 +210,7 @@ digest name passed on the command line.
unsigned char md_value[EVP_MAX_MD_SIZE];
int md_len, i;
- if (!argv[1]) {
+ if (argv[1] == NULL) {
printf("Usage: mdtest digestname\n");
exit(1);
}
diff --git a/doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod b/doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod
index 71f8792275..0a925ce03a 100644
--- a/doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod
+++ b/doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod
@@ -130,20 +130,18 @@ Reference Implementation:
static int ssl_tlsext_ticket_key_cb(SSL *s, unsigned char key_name[16], unsigned char *iv, EVP_CIPHER_CTX *ctx, HMAC_CTX *hctx, int enc)
{
if (enc) { /* create new session */
- if (RAND_bytes(iv, EVP_MAX_IV_LENGTH) ) {
+ if (RAND_bytes(iv, EVP_MAX_IV_LENGTH) )
return -1; /* insufficient random */
- }
key = currentkey(); /* something that you need to implement */
- if ( !key ) {
+ if ( key == NULL ) {
/* current key doesn't exist or isn't valid */
- key = createkey(); /* something that you need to implement.
+ key = createkey(); /* something that you need to implement.
* createkey needs to initialise, a name,
* an aes_key, a hmac_key and optionally
* an expire time. */
- if ( !key ) { /* key couldn't be created */
+ if ( key == NULL ) /* key couldn't be created */
return 0;
- }
}
memcpy(key_name, key->name, 16);
@@ -155,9 +153,8 @@ Reference Implementation:
} else { /* retrieve session */
key = findkey(name);
- if (!key || key->expire < now() ) {
+ if (key == NULL || key->expire < now() )
return 0;
- }
HMAC_Init_ex(&hctx, key->hmac_key, 16, EVP_sha256(), NULL);
EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->aes_key, iv );