diff -Naur libreswan-3.20-orig/lib/libswan/lswnss.c libreswan-3.20/lib/libswan/lswnss.c
--- libreswan-3.20-orig/lib/libswan/lswnss.c	2017-03-14 11:53:11.000000000 -0400
+++ libreswan-3.20/lib/libswan/lswnss.c	2017-06-06 11:50:35.662776208 -0400
@@ -63,16 +63,15 @@
 			pfree(nssdir);
 			return FALSE;
 		}
+		if (PK11_IsFIPS() && get_password == NULL) {
+			snprintf(err, sizeof(lsw_nss_buf_t),
+			 	"on FIPS mode a password is required");
+			return FALSE;
+		}
 	} else {
 		NSS_NoDB_Init(".");
 	}
 
-	if (PK11_IsFIPS() && get_password == NULL) {
-		snprintf(err, sizeof(lsw_nss_buf_t),
-			 "on FIPS mode a password is required");
-		return FALSE;
-	}
-
 	if (get_password) {
 		PK11_SetPasswordFunc(get_password);
 	}