don't import 'RFC' from MIME::Base32

call encode_rfc3548 explicitly instead as newer versions of
the base32 package will drop this import scheme (stretch)

diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm
index 0b6437404f38c5e324881d1e35d8745fb959034f..ea4245c2e58e2159e69773b306e315d2a63f2f2b 100644 (file)
--- a/PVE/AccessControl.pm
+++ b/PVE/AccessControl.pm
@@ -8,7 +8,7 @@ use Crypt::OpenSSL::RSA;
 use Net::SSLeay;
 use Net::IP;
 use MIME::Base64;
 use Net::SSLeay;
 use Net::IP;
 use MIME::Base64;

-use MIME::Base32 qw(RFC); #libmime-base32-perl
+use MIME::Base32; #libmime-base32-perl

 use Digest::SHA;
 use URI::Escape;
 use LWP::UserAgent;
 use Digest::SHA;
 use URI::Escape;
 use LWP::UserAgent;

diff --git a/oathkeygen b/oathkeygen
index 84b644190bd9ef29c9bea223079efb1733c39537..89e385ab459e05ddcf0b9db86a246fe05139a701 100755 (executable)
--- a/oathkeygen
+++ b/oathkeygen
@@ -2,10 +2,10 @@
 
 use strict;
 use warnings;
 
 use strict;
 use warnings;

-use MIME::Base32 qw(RFC); #libmime-base32-perl
+use MIME::Base32; #libmime-base32-perl

 
 my $test;
 open(RND, "/dev/urandom");
 sysread(RND, $test, 10) == 10 || die "read randon data failed\n";
 
 my $test;
 open(RND, "/dev/urandom");
 sysread(RND, $test, 10) == 10 || die "read randon data failed\n";

-print MIME::Base32::encode($test) . "\n";
+print MIME::Base32::encode_rfc3548($test) . "\n";