Port p5-Crypt-Random has been removed, replace it with p5-BSD-arc4random.

2 files changed, 7 insertions, 7 deletions

diff --git a/regress/usr.sbin/switchd/Makefile b/regress/usr.sbin/switchd/Makefile
index 9bb85440b47..1a897df7cdd 100644
--- a/regress/usr.sbin/switchd/Makefile
+++ b/regress/usr.sbin/switchd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2018/10/06 10:52:24 bluhm Exp $
+# $OpenBSD: Makefile,v 1.7 2018/12/03 22:41:00 bluhm Exp $
 
 # The following ports must be installed for the regression tests:
 # p5-Net-Pcap		Perl interface for libpcap
 # p5-NetPacket		Perl interface for packet encoding/decoding
-# p5-Crypt-Random	To fill payloads with weak random data
+# p5-BSD-arc4random	Perl interface to the arc4 random number generator
 #
 # Check wether all required perl packages are installed.  If some
 # are missing print a warning and skip the tests, but do not fail.
@@ -11,7 +11,7 @@
 PERL_REQUIRE !=	perl -Mstrict -Mwarnings -e ' \
     eval { require NetPacket::Ethernet } or print $@; \
     eval { require Net::Pcap } or print $@; \
-    eval { require Crypt::Random } or print $@; \
+    eval { require BSD::arc4random } or print $@; \
 '
 .if ! empty (PERL_REQUIRE)
 regress:
diff --git a/regress/usr.sbin/switchd/run.pl b/regress/usr.sbin/switchd/run.pl
index fbc045e9a89..e087f834228 100644
--- a/regress/usr.sbin/switchd/run.pl
+++ b/regress/usr.sbin/switchd/run.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $OpenBSD: run.pl,v 1.11 2017/06/22 20:17:22 bluhm Exp $
+# $OpenBSD: run.pl,v 1.12 2018/12/03 22:41:00 bluhm Exp $
 
 # Copyright (c) 2017 Alexander Bluhm <bluhm@openbsd.org>
 # Copyright (c) 2016 Reyk Floeter <reyk@openbsd.org>
@@ -24,7 +24,7 @@ use Net::Pcap;
 use NetPacket::Ethernet;
 use NetPacket::IP;
 use NetPacket::UDP;
-use Crypt::Random;
+use BSD::arc4random qw(arc4random arc4random_uniform arc4random_bytes);
 
 use Switchd;
 
@@ -220,7 +220,7 @@ sub packet_send {
 	my $src;
 
 	# Payload
-	$data = Crypt::Random::makerandom_octet(Length => $packet->{length});
+	$data = arc4random_bytes($packet->{length});
 
 	# IP header
 	$ip = NetPacket::IP->decode();
@@ -229,7 +229,7 @@ sub packet_send {
 	$ip->{ver} = NetPacket::IP::IP_VERSION_IPv4;
 	$ip->{hlen} = 5;
 	$ip->{tos} = 0;
-	$ip->{id} = Crypt::Random::makerandom(Size => 16);
+	$ip->{id} = arc4random_uniform(2**16);
 	$ip->{ttl} = 0x5a;
 	$ip->{flags} = 0; #XXX NetPacket::IP::IP_FLAG_DONTFRAG;
 	$ip->{foffset} = 0;