From 0d904cc5e4ee4d8ec9de741c668ade57e9644318 Mon Sep 17 00:00:00 2001
From: Ben <zyhfish@163.com>
Date: Wed, 21 Mar 2018 09:38:37 +0800
Subject: [PATCH] DNN-18204: catch CryptographicException as well for backward
 compability.

---
 DNN Platform/Library/Entities/Portals/PortalInfo.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/DNN Platform/Library/Entities/Portals/PortalInfo.cs b/DNN Platform/Library/Entities/Portals/PortalInfo.cs
index 7a2df7f9671..82368eb2d91 100644
--- a/DNN Platform/Library/Entities/Portals/PortalInfo.cs	
+++ b/DNN Platform/Library/Entities/Portals/PortalInfo.cs	
@@ -22,6 +22,7 @@
 
 using System;
 using System.Data;
+using System.Security.Cryptography;
 using System.Xml.Serialization;
 
 using DotNetNuke.Common;
@@ -811,7 +812,12 @@ public void Fill(IDataReader dr)
                     ? p
                     : Security.FIPSCompliant.DecryptAES(p, Config.GetDecryptionkey(), Host.Host.GUID);
             }
-            catch(FormatException)
+            catch (FormatException)
+            {
+                // for backward compatibility
+                ProcessorPassword = p;
+            }
+            catch(CryptographicException)
             {
                 // for backward compatibility
                 ProcessorPassword = p;