From c53220b05e19fa7f64f6ae768fe19f4fb4293a97 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 26 May 2004 03:27:43 +0000
Subject: [PATCH] fix CryptManager::GenerateRSAKey errors being fatal

---
 stepmania/src/CryptManager.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/stepmania/src/CryptManager.cpp b/stepmania/src/CryptManager.cpp
index 29d8c66e2a..1961c1eafb 100644
--- a/stepmania/src/CryptManager.cpp
+++ b/stepmania/src/CryptManager.cpp
@@ -14,7 +14,6 @@
 #include <memory>
 
 using namespace CryptoPP;
-using namespace std;
 
 static const CString PRIVATE_KEY_PATH = "Data/private.rsa";
 static const CString PUBLIC_KEY_PATH = "Data/public.rsa";
@@ -48,17 +47,22 @@ void CryptManager::GenerateRSAKey( unsigned int keyLength, CString privFilename,
 {
 	ASSERT( PREFSMAN->m_bSignProfileData );
 
-	AutoSeededRandomPool rng;
+	try
+	{
+		AutoSeededRandomPool rng;
 
-	RSAES_OAEP_SHA_Decryptor priv(rng, keyLength);
-	RageFileSink privFile(privFilename);
-	priv.DEREncode(privFile);
-	privFile.MessageEnd();
+		RSAES_OAEP_SHA_Decryptor priv(rng, keyLength);
+		RageFileSink privFile(privFilename);
+		priv.DEREncode(privFile);
+		privFile.MessageEnd();
 
-	RSAES_OAEP_SHA_Encryptor pub(priv);
-	RageFileSink pubFile(pubFilename);
-	pub.DEREncode(pubFile);
-	pubFile.MessageEnd();
+		RSAES_OAEP_SHA_Encryptor pub(priv);
+		RageFileSink pubFile(pubFilename);
+		pub.DEREncode(pubFile);
+		pubFile.MessageEnd();
+	} catch( const CryptoPP::Exception &s ) {
+		LOG->Warn( "GenerateRSAKey failed: %s", s.what() );
+	}
 }
 
 void CryptManager::SignFileToFile( CString sPath, CString sSignatureFile )