diff --git a/.p4ignore b/.p4ignore
index 648ee3b8e002d..be4216a9e0e0a 100644
--- a/.p4ignore
+++ b/.p4ignore
@@ -1,10 +1,12 @@
 #
-#  Copyright (c) 2000, 2020, Oracle and/or its affiliates.
+# Copyright (c) 2000, 2021, Oracle and/or its affiliates.
 #
-#  Licensed under the Universal Permissive License v 1.0 as shown at
-#  http://oss.oracle.com/licenses/upl.
+# Licensed under the Universal Permissive License v 1.0 as shown at
+# http://oss.oracle.com/licenses/upl.
 #
 
 # Directory for auto-downloaded JDK
 jdk/
 
+# Directory for auto-downloaded OpenSSL on Windows
+openssl/
diff --git a/bin/cfgwindows.sh b/bin/cfgwindows.sh
index d35997d0f8141..799c15616f8b8 100644
--- a/bin/cfgwindows.sh
+++ b/bin/cfgwindows.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 #
-#  Copyright (c) 2000, 2020, Oracle and/or its affiliates.
+# Copyright (c) 2000, 2021, Oracle and/or its affiliates.
 #
-#  Licensed under the Universal Permissive License v 1.0 as shown at
-#  http://oss.oracle.com/licenses/upl.
+# Licensed under the Universal Permissive License v 1.0 as shown at
+# http://oss.oracle.com/licenses/upl.
 #
 
 #
@@ -28,6 +28,11 @@ function get_java_home
   echo Not Supported
   }
 
+function get_openssl_home
+  {
+  echo Not Supported
+  }
+
 # determine the scripts directory, assuming all scripts are in the same directory
 SCRIPT_PATH="${BASH_SOURCE[0]}"
 while [ -h "${SCRIPT_PATH}" ]; do
@@ -50,5 +55,16 @@ fi
 
 source $SCRIPTS_DIR/cfgcommon.sh
 
+# configure OpenSSL for building test certificates
+if [ -z $OPENSSL_HOME ]; then
+  OPENSSL_HOME=`eval get_openssl_home`
+  echo OPENSSL_HOME evaluated to $OPENSSL_HOME
+fi
+
+export PATH=${OPENSSL_HOME}:${PATH}
+export OPENSSL_CONF=${OPENSSL_HOME}/openssl.cnf
+echo openssl: `which openssl`
+openssl version
+
 unset SCRIPT_PATH
 unset SCRIPTS_DIR