openssl - Mirror of https://github.com/openssl/openssl

diff options

author	Pauli <paul.dale@oracle.com>	2019-07-16 20:35:42 +1000
committer	Pauli <paul.dale@oracle.com>	2019-07-16 20:35:42 +1000
commit	4bd8b24045e1b044a2696b0675a9120ac0384567 (patch)
tree	8bbce07e745ecc9cf6f6ecf1b8e5815c290b5ee8 /apps
parent	dd6b270618b8f43009999e45ad6dd03ca50bbe54 (diff)

remove end of line spaces

Reviewed-by: Paul Yang <yang.yang@baishancloud.com> (Merged from https://github.com/openssl/openssl/pull/9397)

Diffstat (limited to 'apps')

-rw-r--r--

apps/s_client.c

1 files changed, 2 insertions, 2 deletions

/* * Copyright 2011-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html */ #include <assert.h> #include <stdlib.h> #include <string.h> #include <openssl/sha.h> #include <openssl/crypto.h> #include <openssl/err.h> #include <openssl/rand.h> #include <openssl/core_dispatch.h> #include <openssl/proverr.h> #include "internal/thread_once.h" #include "prov/providercommon.h" #include "prov/provider_ctx.h" #include "prov/provider_util.h" #include "prov/implementations.h" #include "drbg_local.h" static OSSL_FUNC_rand_newctx_fn drbg_hash_new_wrapper; static OSSL_FUNC_rand_freectx_fn drbg_hash_free; static OSSL_FUNC_rand_instantiate_fn drbg_hash_instantiate_wrapper; static OSSL_FUNC_rand_uninstantiate_fn drbg_hash_uninstantiate_wrapper; static OSSL_FUNC_rand_generate_fn drbg_hash_generate_wrapper; static OSSL_FUNC_rand_reseed_fn drbg_hash_reseed_wrapper; static OSSL_FUNC_rand_settable_ctx_params_fn drbg_hash_settable_ctx_params; static OSSL_FUNC_rand_set_ctx_params_fn drbg_hash_set_ctx_params; static OSSL_FUNC_rand_gettable_ctx_params_fn drbg_hash_gettable_ctx_params; static OSSL_FUNC_rand_get_ctx_params_fn drbg_hash_get_ctx_params; static OSSL_FUNC_rand_verify_zeroization_fn drbg_hash_verify_zeroization; /* 888 bits from SP800-90Ar1 10.1 table 2 */ #define HASH_PRNG_MAX_SEEDLEN (888/8) /* 440 bits from SP800-90Ar1 10.1 table 2 */ #define HASH_PRNG_SMALL_SEEDLEN (440/8) /* Determine what seedlen to use based on the block length */ #define MAX_BLOCKLEN_USING_SMALL_SEEDLEN (256/8) #define INBYTE_IGNORE ((unsigned char)0xFF) typedef struct rand_drbg_hash_st { PROV_DIGEST digest; EVP_MD_CTX *ctx; size_t blocklen; unsigned char V[HASH_PRNG_MAX_SEEDLEN]; unsigned char C[HASH_PRNG_MAX_SEEDLEN]; /* Temporary value storage: should always exceed max digest length */ unsigned char vtmp[HASH_PRNG_MAX_SEEDLEN]; } PROV_DRBG_HASH; /* * SP800-90Ar1 10.3.1 Derivation function using a Hash Function (Hash_df). * The input string used is composed of: * inbyte - An optional leading byte (ignore if equal to INBYTE_IGNORE) * in - input string 1 (A Non NULL value). * in2 - optional input string (Can be NULL). * in3 - optional input string (Can be NULL). * These are concatenated as part of the DigestUpdate process. */ static int hash_df(PROV_DRBG *drbg, unsigned char *out, const unsigned char inbyte, const unsigned char *in, size_t inlen, const unsigned char *in2, size_t in2len, const unsigned char *in3, size_t in3len) { PROV_DRBG_HASH *hash = (PROV_DRBG_HASH *)drbg->data; EVP_MD_CTX *ctx = hash->ctx; unsigned char *vtmp = hash->vtmp; /* tmp = counter || num_bits_returned || [inbyte] */ unsigned char tmp[1 + 4 + 1]; int tmp_sz = 0; size_t outlen = drbg->seedlen; size_t num_bits_returned = outlen * 8; /* * No need to check outlen size here, as the standard only ever needs * seedlen bytes which is always less than the maximum permitted. */ /* (Step 3) counter = 1 (tmp[0] is the 8 bit counter) */ tmp[tmp_sz++] = 1; /* tmp[1..4] is the fixed 32 bit no_of_bits_to_return */ tmp[tmp_sz++] = (unsigned char)((num_bits_returned >> 24) & 0xff); tmp[tmp_sz++] = (unsigned char)((num_bits_returned >> 16) & 0xff); tmp[tmp_sz++] = (unsigned char)((num_bits_returned >> 8) & 0xff); tmp[tmp_sz++] = (unsigned char)(num_bits_returned & 0xff); /* Tack the additional input byte onto the end of tmp if it exists */ if (inbyte != INBYTE_IGNORE) tmp[tmp_sz++] = inbyte; /* (Step 4) */ for (;;) { /* * (Step 4.1) out = out || Hash(tmp || in || [in2] || [in3]) * (where tmp = counter || num_bits_returned || [inbyte]) */ if (!(EVP_DigestInit_ex(ctx, ossl_prov_digest_md(&hash->digest), NULL) && EVP_DigestUpdate(ctx, tmp, tmp_sz) && EVP_DigestUpdate(ctx, in, inlen) && (in2 == NULL || EVP_DigestUpdate(ctx, in2, in2len)) && (in3 == NULL || EVP_DigestUpdate(ctx, in3, in3len)))) return 0; if (outlen < hash->blocklen) { if (!EVP_DigestFinal(ctx, vtmp, NULL)) return 0; memcpy(out, vtmp, outlen); OPENSSL_cleanse(vtmp, hash->blocklen); break; } else if(!EVP_DigestFinal(ctx, out, NULL)) { return 0; } outlen -= hash->blocklen; if (outlen == 0) break; /* (Step 4.2) counter++ */ tmp[0]++; out += hash->blocklen; } return 1; } /* Helper function that just passes 2 input parameters to hash_df() */ static int hash_df1(PROV_DRBG *drbg, unsigned char *out, const unsigned char in_byte, const unsigned char *in1, size_t in1len) { return hash_df(drbg, out, in_byte, in1, in1len, NULL, 0, NULL, 0); } /* * Add 2 byte buffers together. The first elements in each buffer are the top * most bytes. The result is stored in the dst buffer. * The final carry is ignored i.e: dst = (dst + in) mod (2^seedlen_bits). * where dst size is drbg->seedlen, and inlen <= drbg->seedlen. */ static int add_bytes(PROV_DRBG *drbg, unsigned char *dst, unsigned char *in, size_t inlen) { size_t i; int result; const unsigned char *add; unsigned char carry = 0, *d; assert(drbg->seedlen >= 1 && inlen >= 1 && inlen <= drbg->seedlen); d = &dst[drbg->seedlen - 1]; add = &in[inlen - 1]; for (i = inlen; i > 0; i--, d--, add--) { result = *d + *add + carry; carry = (unsigned char)(result >> 8); *d = (unsigned char)(result & 0xff); } if (carry != 0) { /* Add the carry to the top of the dst if inlen is not the same size */ for (i = drbg->seedlen - inlen; i > 0; --i, d--) { *d += 1; /* Carry can only be 1 */ if (*d != 0) /* exit if carry doesnt propagate to the next byte */ break; } } return 1; } /* V = (V + Hash(inbyte || V || [additional_input]) mod (2^seedlen) */ static int add_hash_to_v(PROV_DRBG *drbg, unsigned char inbyte, const unsigned char *adin, size_t adinlen) { PROV_DRBG_HASH *hash = (PROV_DRBG_HASH *)drbg->data; EVP_MD_CTX *ctx = hash->ctx; return EVP_DigestInit_ex(ctx, ossl_prov_digest_md(&hash->digest), NULL) && EVP_DigestUpdate(ctx, &inbyte, 1) && EVP_DigestUpdate(ctx, hash->V, drbg->seedlen) && (adin == NULL || EVP_DigestUpdate(ctx, adin, adinlen)) && EVP_DigestFinal(ctx, hash->vtmp, NULL) && add_bytes(drbg, hash->V,


context:
space:
mode: