(gpgsm_decrypt): Return GPG_ERR_NO_DATA if it is not a

encrypted message.

2 files changed, 10 insertions, 0 deletions

diff --git a/sm/ChangeLog b/sm/ChangeLog
index c2627d3d2..eac744b08 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-08  Werner Koch  <[email protected]>
+
+	* decrypt.c (gpgsm_decrypt): Return GPG_ERR_NO_DATA if it is not a 
+	encrypted message.
+
 2004-04-07  Werner Koch  <[email protected]>
 
 	* gpgsm.c: New option --force-crl-refresh.
diff --git a/sm/decrypt.c b/sm/decrypt.c
index 76524b51f..df0edc2ae 100644
--- a/sm/decrypt.c
+++ b/sm/decrypt.c
@@ -333,6 +333,11 @@ gpgsm_decrypt (CTRL ctrl, int in_fd, FILE *out_fp)
                                numbuf, algoid?algoid:"?", NULL);
               }
 
+              /* If it seems that this is not an ecrypted message we
+                 return a more sensible error code. */
+              if (!algoid)
+                rc = gpg_error (GPG_ERR_NO_DATA);
+
               goto leave;
             }
           dfparm.algo = algo;