]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Update userland arc4random() with OpenBSD's Chacha20 based arc4random().
authordelphij <delphij@FreeBSD.org>
Sun, 19 Aug 2018 17:40:50 +0000 (17:40 +0000)
committerdelphij <delphij@FreeBSD.org>
Sun, 19 Aug 2018 17:40:50 +0000 (17:40 +0000)
commitcc30da3fe1312a2339a4261feabcc432d8b543d7
treeee75152b4a830a9a9cc43935fc322da1c1241897
parent4f91615a00c32b4500bb0e6a8460ca29aea436d1
Update userland arc4random() with OpenBSD's Chacha20 based arc4random().

  ObsoleteFiles.inc:

    Remove manual pages for arc4random_addrandom(3) and
    arc4random_stir(3).

  contrib/ntp/lib/isc/random.c:
  contrib/ntp/sntp/libevent/evutil_rand.c:

    Eliminate in-tree usage of arc4random_addrandom().

  crypto/heimdal/lib/roken/rand.c:
  crypto/openssh/config.h:

    Eliminate in-tree usage of arc4random_stir().

  include/stdlib.h:

    Remove arc4random_stir() and arc4random_addrandom() prototypes,
    provide temporary shims for transistion period.

  lib/libc/gen/Makefile.inc:

    Hook arc4random-compat.c to build, add hint for Chacha20 source for
    kernel, and remove arc4random_addrandom(3) and arc4random_stir(3)
    links.

  lib/libc/gen/arc4random.c:

    Adopt OpenBSD arc4random.c,v 1.54 with bare minimum changes, use the
    sys/crypto/chacha20 implementation of keystream.

  lib/libc/gen/Symbol.map:

    Remove arc4random_stir and arc4random_addrandom interfaces.

  lib/libc/gen/arc4random.h:

    Adopt OpenBSD arc4random.h,v 1.4 but provide _ARC4_LOCK of our own.

  lib/libc/gen/arc4random.3:

    Adopt OpenBSD arc4random.3,v 1.35 but keep FreeBSD r114444 and
    r118247.

  lib/libc/gen/arc4random-compat.c:

    Compatibility shims for arc4random_stir and arc4random_addrandom
    functions to preserve ABI.  Log once when called but do nothing
    otherwise.

  lib/libc/gen/getentropy.c:
  lib/libc/include/libc_private.h:

    Fold __arc4_sysctl into getentropy.c (renamed to arnd_sysctl).
    Remove from libc_private.h as a result.

  sys/crypto/chacha20/chacha.c:
  sys/crypto/chacha20/chacha.h:

    Make it possible to use the kernel implementation in libc.

PR: 182610
Reviewed by: cem, markm
Obtained from: OpenBSD
Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D16760
16 files changed:
ObsoleteFiles.inc
contrib/ntp/lib/isc/random.c
contrib/ntp/sntp/libevent/evutil_rand.c
crypto/heimdal/lib/roken/rand.c
crypto/openssh/config.h
include/stdlib.h
lib/libc/gen/Makefile.inc
lib/libc/gen/Symbol.map
lib/libc/gen/arc4random-compat.c [new file with mode: 0644]
lib/libc/gen/arc4random.3
lib/libc/gen/arc4random.c
lib/libc/gen/arc4random.h [new file with mode: 0644]
lib/libc/gen/getentropy.c
lib/libc/include/libc_private.h
sys/crypto/chacha20/chacha.c
sys/crypto/chacha20/chacha.h