Import OpenSSL 1.1.0i

util/perl/with_fallback.pm

@@ -1,4 +1,4 @@
-# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -8,15 +8,17 @@
 package with_fallback;
 
 sub import {
+    shift;
+
     use File::Basename;
     use File::Spec::Functions;
     foreach (@_) {
-	eval "require $_";
+	eval "use $_";
 	if ($@) {
 	    unshift @INC, catdir(dirname(__FILE__),
                                  "..", "..", "external", "perl");
 	    my $transfer = "transfer::$_";
-	    eval "require $transfer";
+	    eval "use $transfer";
 	    shift @INC;
 	    warn $@ if $@;
 	}