Add an "encryption unknown error

4 files changed, 19 insertions, 1 deletions

diff --git a/SmartDeviceLink/private/SDLError.h b/SmartDeviceLink/private/SDLError.h
index 1621d8f1b..f6e7a0bb9 100644
--- a/SmartDeviceLink/private/SDLError.h
+++ b/SmartDeviceLink/private/SDLError.h
@@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSError *)sdl_encryption_lifecycle_notReadyError;
 + (NSError *)sdl_encryption_lifecycle_encryption_off;
 + (NSError *)sdl_encryption_lifecycle_nak;
++ (NSError *)sdl_encryption_unknown;
 
 #pragma mark SDLManager
 
diff --git a/SmartDeviceLink/private/SDLError.m b/SmartDeviceLink/private/SDLError.m
index 35818d361..5ee60e6bb 100644
--- a/SmartDeviceLink/private/SDLError.m
+++ b/SmartDeviceLink/private/SDLError.m
@@ -52,6 +52,18 @@ NS_ASSUME_NONNULL_BEGIN
 
 }
 
++ (NSError *)sdl_encryption_unknown {
+    NSDictionary<NSString *, NSString *> *userInfo = @{
+                                                       NSLocalizedDescriptionKey: @"Encryption received an unknown error",
+                                                       NSLocalizedFailureReasonErrorKey: @"We don't know the reason for the failure",
+                                                       NSLocalizedRecoverySuggestionErrorKey: @"Ensure that encryption is properly set up"
+                                                       };
+
+    return [NSError errorWithDomain:SDLErrorDomainEncryptionLifecycleManager
+                               code:SDLEncryptionLifecycleManagerErrorNAK
+                           userInfo:userInfo];
+}
+
 #pragma mark - SDLManager
 
 + (NSError *)sdl_lifecycle_rpcErrorWithDescription:(nullable NSString *)description andReason:(nullable NSString *)reason {
diff --git a/SmartDeviceLink/private/SDLProtocol.m b/SmartDeviceLink/private/SDLProtocol.m
index 5e8ad60f4..13b628bf7 100644
--- a/SmartDeviceLink/private/SDLProtocol.m
+++ b/SmartDeviceLink/private/SDLProtocol.m
@@ -351,6 +351,8 @@ NS_ASSUME_NONNULL_BEGIN
             if (!messagePayload) {
                 if (encryptError != nil) {
                     *error = encryptError;
+                } else {
+                    *error = [NSError sdl_encryption_unknown];
                 }
                 return NO;
             }
diff --git a/SmartDeviceLink/public/SDLErrorConstants.h b/SmartDeviceLink/public/SDLErrorConstants.h
index da4757ec1..e653ad2d4 100644
--- a/SmartDeviceLink/public/SDLErrorConstants.h
+++ b/SmartDeviceLink/public/SDLErrorConstants.h
@@ -73,7 +73,10 @@ typedef NS_ENUM(NSInteger, SDLEncryptionLifecycleManagerError) {
     /**
      *  Received NAK from the remote head unit.
      */
-    SDLEncryptionLifecycleManagerErrorNAK = -3
+    SDLEncryptionLifecycleManagerErrorNAK = -3,
+
+    /// An unknown error occurred
+    SDLEncryptionLifecycleManagerErrorUnknown = -4
 };
 
 /**