diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2018-03-27 17:03:01 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2018-03-27 17:03:01 +0000 |
commit | 02be298e504b8554caca6dc85af450e1ea44d19d (patch) | |
tree | b4870fcd2c2663fedd44997d4bb5ad13dcd50293 /engines | |
parent | 4f94f84d8491a2455678402b5c7c92e692a272bc (diff) | |
download | src-02be298e504b8554caca6dc85af450e1ea44d19d.tar.gz src-02be298e504b8554caca6dc85af450e1ea44d19d.zip |
Import OpenSSL 1.0.2o.vendor/openssl/1.0.2o
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=331625
svn path=/vendor-crypto/openssl/1.0.2o/; revision=331626; tag=vendor/openssl/1.0.2o
Diffstat (limited to 'engines')
-rw-r--r-- | engines/ccgost/README.gost | 19 | ||||
-rw-r--r-- | engines/ccgost/gost_eng.c | 7 | ||||
-rw-r--r-- | engines/e_atalla.c | 2 |
3 files changed, 13 insertions, 15 deletions
diff --git a/engines/ccgost/README.gost b/engines/ccgost/README.gost index c96cccc7b40a..80f7900d0987 100644 --- a/engines/ccgost/README.gost +++ b/engines/ccgost/README.gost @@ -193,7 +193,7 @@ Russian clients and RSA/DSA ciphersuites for foreign clients. openssl dgst -mac gost-mac -macopt key:<32 bytes of key> datafile - Note absense of an option that specifies digest algorithm. gost-mac + Note absence of an option that specifies digest algorithm. gost-mac algorithm supports only one digest (which is actually part of implementation of this mac) and OpenSSL is clever enough to find out this. @@ -216,8 +216,8 @@ openssl pksc12 -export -inkey gost.pem -in gost_cert.pem -keypbe gost89\ 7. Testing speed of symmetric ciphers. To test performance of GOST symmetric ciphers you should use -evp switch -of the openssl speed command. Engine-provided ciphers couldn't be -accessed by cipher-specific functions, only via generic evp interface +of the openssl speed command. Engine-provided ciphers can be accessed only via +generic evp interface and not by cipher-specific functions. openssl speed -evp gost89 openssl speed -evp gost89-cnt @@ -225,7 +225,7 @@ accessed by cipher-specific functions, only via generic evp interface PROGRAMMING INTERFACES DETAILS -Applications never should access engine directly. They only use provided +Applications should never access engine directly. They should only use provided EVP_PKEY API. But there are some details, which should be taken into account. @@ -281,12 +281,11 @@ If UKM is not set by this control command, encrypt operation would generate random UKM. -This sources include implementation of GOST 28147-89 and GOST R 34.11-94 -which are completely indepentent from OpenSSL and can be used separately -(files gost89.c, gost89.h, gosthash.c, gosthash.h) Utility gostsum (file -gostsum.c) is provided as example of such separate usage. This is -program, simular to md5sum and sha1sum utilities, but calculates GOST R -34.11-94 hash. +These sources include implementation of GOST 28147-89 and GOST R 34.11-94 +which are completely independent from OpenSSL and can be used separately +(files gost89.c, gost89.h, gosthash.c, gosthash.h). Utility gostsum (file +gostsum.c) is provided as an example of such separate usage. This program is +similar to md5sum and sha1sum utilities, but calculates GOST R 34.11-94 hash. Makefile doesn't include rule for compiling gostsum. Use command diff --git a/engines/ccgost/gost_eng.c b/engines/ccgost/gost_eng.c index 5924791b7735..ea52c4dbe9db 100644 --- a/engines/ccgost/gost_eng.c +++ b/engines/ccgost/gost_eng.c @@ -157,10 +157,6 @@ static int bind_gost(ENGINE *e, const char *id) return ret; } -#ifndef OPENSSL_NO_DYNAMIC_ENGINE -IMPLEMENT_DYNAMIC_BIND_FN(bind_gost) - IMPLEMENT_DYNAMIC_CHECK_FN() -#endif /* ndef OPENSSL_NO_DYNAMIC_ENGINE */ static int gost_digests(ENGINE *e, const EVP_MD **digest, const int **nids, int nid) { @@ -278,4 +274,7 @@ void ENGINE_load_gost(void) ENGINE_free(toadd); ERR_clear_error(); } +#else +IMPLEMENT_DYNAMIC_BIND_FN(bind_gost) +IMPLEMENT_DYNAMIC_CHECK_FN() #endif diff --git a/engines/e_atalla.c b/engines/e_atalla.c index 6a324e6766b0..7d136fff0736 100644 --- a/engines/e_atalla.c +++ b/engines/e_atalla.c @@ -494,7 +494,7 @@ static int atalla_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, goto err; } /* Prepare the key-data */ - memset(&keydata, 0, sizeof keydata); + memset(&keydata, 0, sizeof(keydata)); numbytes = BN_num_bytes(m); memset(exponent->d, 0, numbytes); memset(modulus->d, 0, numbytes); |