[openssl/openssl] 11e61b: Fix BLAKE2s reporting the same EVP_MD_get_size() a...

[James Muir]

  Branch: refs/heads/master
  Home:   https://github.com/openssl/openssl
  Commit: 11e61b3174762ec21ce0875a6449c61e316b4a0b
      https://github.com/openssl/openssl/commit/11e61b3174762ec21ce0875a6449c61e316b4a0b
  Author: наб <nabijaczleweli at nabijaczleweli.xyz>
  Date:   2023-11-15 (Wed, 15 Nov 2023)

  Changed paths:
    M providers/implementations/digests/blake2_prov.c

  Log Message:
  -----------
  Fix BLAKE2s reporting the same EVP_MD_get_size() as BLAKE2b (64)

Fixes: commit 6d1e730a1ea2c64bdffa88c6b3bee4c3f5bed602 ("Implement
 BLAKE2s with the same macro as BLAKE2b")
Closes: #22708

Reviewed-by: Paul Dale <pauli at openssl.org>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22710)


  Commit: 56aa3e8d1a286e11e56d9a9f6373c33a87a69ff4
      https://github.com/openssl/openssl/commit/56aa3e8d1a286e11e56d9a9f6373c33a87a69ff4
  Author: наб <nabijaczleweli at nabijaczleweli.xyz>
  Date:   2023-11-15 (Wed, 15 Nov 2023)

  Changed paths:
    M test/recipes/30-test_evp_data/evpkdf_hkdf.txt

  Log Message:
  -----------
  Import repro from #22708 as a test case

Reviewed-by: Paul Dale <pauli at openssl.org>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22710)


  Commit: 86db958835d1f8ba9ce49a9f93b5309c3d13b91c
      https://github.com/openssl/openssl/commit/86db958835d1f8ba9ce49a9f93b5309c3d13b91c
  Author: James Muir <james at openssl.org>
  Date:   2023-11-15 (Wed, 15 Nov 2023)

  Changed paths:
    M demos/Makefile
    M demos/bio/Makefile
    M demos/bio/sconnect.c
    M demos/cipher/Makefile
    M demos/cipher/ariacbc.c
    M demos/cms/Makefile
    M demos/cms/cms_ddec.c
    M demos/cms/cms_dec.c
    M demos/cms/cms_sign.c
    M demos/cms/cms_sign2.c
    M demos/digest/Makefile
    M demos/encode/Makefile
    M demos/encrypt/Makefile
    M demos/encrypt/rsa_encrypt.c
    M demos/guide/Makefile
    M demos/http3/Makefile
    M demos/kdf/Makefile
    M demos/kdf/argon2.c
    M demos/kdf/hkdf.c
    M demos/kdf/pbkdf2.c
    M demos/kdf/scrypt.c
    M demos/keyexch/Makefile
    M demos/mac/Makefile
    M demos/pkey/EVP_PKEY_RSA_keygen.c
    M demos/pkey/Makefile
    M demos/signature/Makefile
    M demos/signature/rsa_pss_direct.c
    M demos/signature/rsa_pss_hash.c
    A demos/smime/Makefile
    M demos/smime/smdec.c
    M demos/smime/smenc.c
    M demos/smime/smsign.c
    M demos/smime/smsign2.c
    M demos/smime/smver.c
    A demos/sslecho/Makefile
    M demos/sslecho/main.c
    R demos/sslecho/makefile

  Log Message:
  -----------
  demos: tidy up makefiles, fix warnings

Update makefiles so that consistent patterns are used.  Object files
are compiled from source using an implicit rule (but using our
CFLAGS); for linking, we give an explicit rule.  Ensure that "make
test" works in each subdirectory (even if it does not actually run any
applications).  The top-level demo makefile now works.

The makefiles are not make-agnostic.  e.g. they use the variable $(RM)
in "clean" recipes, which is defined in gnu-make but may not be
defined in others.

Part of #17806

Testing:

  $ cd demo
  $ make test

Reviewed-by: Paul Dale <pauli at openssl.org>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22698)


Compare: https://github.com/openssl/openssl/compare/4f0172c543dd...86db958835d1