diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp
index 8f61041592394c9ca83a47c6bb82dc94cf140208..5528aa073d149690cf062d5fcc20e3dd76181b90 100644
--- a/indra/newview/llsechandler_basic.cpp
+++ b/indra/newview/llsechandler_basic.cpp
@@ -1356,6 +1356,7 @@ LLSecAPIBasicHandler::~LLSecAPIBasicHandler()
 	_writeProtectedData();
 }
 
+#if LEGACY_PASSWORD_STORAGE
 // compat_rc4 reads old rc4 encrypted files
 void compat_rc4(llifstream &protected_data_stream, std::string &decrypted_data)
 {
@@ -1394,6 +1395,7 @@ void compat_rc4(llifstream &protected_data_stream, std::string &decrypted_data)
 
 	EVP_CIPHER_CTX_free(ctx);
 }
+#endif
 
 void LLSecAPIBasicHandler::_readProtectedData(unsigned char *unique_id, U32 id_len)
 {
@@ -1452,6 +1454,7 @@ void LLSecAPIBasicHandler::_readProtectedData(unsigned char *unique_id, U32 id_l
 		if (parser->parse(parse_stream, mProtectedDataMap, 
 						  LLSDSerialize::SIZE_UNLIMITED) == LLSDParser::PARSE_FAILURE)
 		{
+#if LEGACY_PASSWORD_STORAGE
 			// clear and reset to try compat
 			parser->reset();
 			decrypted_data.clear();
@@ -1466,6 +1469,10 @@ void LLSecAPIBasicHandler::_readProtectedData(unsigned char *unique_id, U32 id_l
 				// everything failed abort
 				LLTHROW(LLProtectedDataException("Config file cannot be decrypted."));
 			}
+#else
+            // everything failed abort
+            LLTHROW(LLProtectedDataException("Config file cannot be decrypted."));
+#endif
 		}
 	}
 }
diff --git a/indra/newview/tests/llsechandler_basic_test.cpp b/indra/newview/tests/llsechandler_basic_test.cpp
index 23f85d21fe5b244c4de497832b2ab54b3137b518..91a14d544727ea2cef32efb6c03ce01d36e534d3 100644
--- a/indra/newview/tests/llsechandler_basic_test.cpp
+++ b/indra/newview/tests/llsechandler_basic_test.cpp
@@ -734,6 +734,8 @@ namespace tut
 	template<> template<>
 	void sechandler_basic_test_object::test<3>()
 	{
+        skip("Broken with openssl 3.0");
+
 		std::string protected_data = "sUSh3wj77NG9oAMyt3XIhaej3KLZhLZWFZvI6rIGmwUUOmmelrRg0NI9rkOj8ZDpTPxpwToaBT5u"
 		"GQhakdaGLJznr9bHr4/6HIC1bouKj4n2rs4TL6j2WSjto114QdlNfLsE8cbbE+ghww58g8SeyLQO"
 		"nyzXoz+/PBz0HD5SMFDuObccoPW24gmqYySz8YoEWhSwO0pUtEEqOjVRsAJgF5wLAtJZDeuilGsq"
@@ -849,6 +851,8 @@ namespace tut
 	template<> template<>
 	void sechandler_basic_test_object::test<4>()
 	{
+        skip("Broken with openssl 3.0");
+        
 		LLPointer<LLSecAPIBasicHandler> handler = new LLSecAPIBasicHandler("sechandler_settings.tmp", "test_password.dat");
 		handler->init();