Remove arc4random_stir() and arc4random_addrandom(), which none should

be using directly.  Well, a few rare people cloned it upstream and it
will take a bit of time for them to learn.
ok various

2 files changed, 2 insertions, 28 deletions

diff --git a/src/lib/libc/crypt/Makefile.inc b/src/lib/libc/crypt/Makefile.inc
index 5dbd240bf5..c852523372 100644
--- a/src/lib/libc/crypt/Makefile.inc
+++ b/src/lib/libc/crypt/Makefile.inc
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile.inc,v 1.18 2010/10/28 08:34:37 mikeb Exp $
+#       $OpenBSD: Makefile.inc,v 1.19 2013/10/21 20:33:23 deraadt Exp $
 
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/crypt ${LIBCSRCDIR}/crypt
 
@@ -11,5 +11,4 @@ MLINKS+=crypt.3 des_setkey.3 blowfish.3 blf_key.3 blowfish.3 blf_enc.3
 MLINKS+=blowfish.3 blf_dec.3 blowfish.3 blf_ecb_encrypt.3
 MLINKS+=blowfish.3 blf_ecb_decrypt.3 blowfish.3 blf_cbc_encrypt.3
 MLINKS+=blowfish.3 blf_cbc_decrypt.3
-MLINKS+=arc4random.3 arc4random_stir.3 arc4random.3 arc4random_addrandom.3
 MLINKS+=arc4random.3 arc4random_buf.3 arc4random.3 arc4random_uniform.3
diff --git a/src/lib/libc/crypt/arc4random.c b/src/lib/libc/crypt/arc4random.c
index 356e231815..e836395803 100644
--- a/src/lib/libc/crypt/arc4random.c
+++ b/src/lib/libc/crypt/arc4random.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: arc4random.c,v 1.25 2013/10/01 18:34:57 markus Exp $  */
+/*      $OpenBSD: arc4random.c,v 1.26 2013/10/21 20:33:23 deraadt Exp $ */
 
 /*
  * Copyright (c) 1996, David Mazieres <dm@uun.org>
@@ -158,31 +158,6 @@ _rs_random_u32(u_int32_t *val)
         return;
 }
 
-void
-arc4random_stir(void)
-{
-        _ARC4_LOCK();
-        _rs_stir();
-        _ARC4_UNLOCK();
-}
-
-void
-arc4random_addrandom(u_char *dat, int datlen)
-{
-        int m;
-
-        _ARC4_LOCK();
-        if (!rs_initialized)
-                _rs_stir();
-        while (datlen > 0) {
-                m = MIN(datlen, KEYSZ + IVSZ);
-                _rs_rekey(dat, m);
-                dat += m;
-                datlen -= m;
-        }
-        _ARC4_UNLOCK();
-}
-
 u_int32_t
 arc4random(void)
 {