A small step for GnuPG but a huge leap for error codes.

(Sorry, it does not build currently - I need to check it in to avoid
duplicate work.)

1 files changed, 57 insertions, 177 deletions

diff --git a/common/maperror.c b/common/maperror.c
index e3e18e4a1..c6a1135c7 100644
--- a/common/maperror.c
+++ b/common/maperror.c
@@ -43,21 +43,21 @@ map_ksba_err (int err)
     case 0: 
       break;
 
-    case KSBA_Out_Of_Core: err = GNUPG_Out_Of_Core; break;
-    case KSBA_Invalid_Value: err = GNUPG_Invalid_Value; break;
-    case KSBA_Not_Implemented: err = GNUPG_Not_Implemented; break;
-    case KSBA_Conflict: err = GNUPG_Conflict; break;
-    case KSBA_Read_Error: err = GNUPG_Read_Error; break;
-    case KSBA_Write_Error: err = GNUPG_Write_Error; break;
-    case KSBA_No_Data: err = GNUPG_No_Data; break;
-    case KSBA_Bug: err = GNUPG_Bug; break;
-    case KSBA_Unsupported_Algorithm: err = GNUPG_Unsupported_Algorithm; break;
-    case KSBA_Invalid_Index: err = GNUPG_Invalid_Index; break;
-    case KSBA_Invalid_Sexp: err = GNUPG_Invalid_Sexp; break;
-    case KSBA_Unknown_Sexp: err = GNUPG_Unknown_Sexp; break;
+    case KSBA_Out_Of_Core: err = GPG_ERR_ENOMEM; break;
+    case KSBA_Invalid_Value: err = GPG_ERR_INV_VALUE; break;
+    case KSBA_Not_Implemented: err = GPG_ERR_NOT_IMPLEMENTED; break;
+    case KSBA_Conflict: err = GPG_ERR_CONFLICT; break;
+    case KSBA_Read_Error: err = GPG_ERR_EIO; break;
+    case KSBA_Write_Error: err = GPG_ERR_EIO; break;
+    case KSBA_No_Data: err = GPG_ERR_NO_DATA; break;
+    case KSBA_Bug: err = GPG_ERR_BUG; break;
+    case KSBA_Unsupported_Algorithm: err = GPG_ERR_UNSUPPORTED_ALGORITHM; break;
+    case KSBA_Invalid_Index: err = GPG_ERR_INV_INDEX; break;
+    case KSBA_Invalid_Sexp: err = GPG_ERR_INV_SEXP; break;
+    case KSBA_Unknown_Sexp: err = GPG_ERR_UNKNOWN_SEXP; break;
       
     default:
-      err = seterr (General_Error);
+      err = GPG_ERR_GENERAL;
       break;
     }
   return err;
@@ -67,200 +67,80 @@ map_ksba_err (int err)
 int 
 map_gcry_err (int err)
 {
-  switch (err)
-    {
-    case GCRYERR_EOF:
-    case -1:
-      err = -1;
-      break;
-
-    case 0:
-      break;
-
-    case GCRYERR_WRONG_PK_ALGO:
-    case GCRYERR_INV_PK_ALGO:
-    case GCRYERR_INV_MD_ALGO:
-    case GCRYERR_INV_CIPHER_ALGO:
-      err = GNUPG_Unsupported_Algorithm;
-      break;
-    case GCRYERR_INV_KEYLEN:
-    case GCRYERR_WEAK_KEY:
-    case GCRYERR_BAD_PUBLIC_KEY: err = GNUPG_Bad_Public_Key; break;
-    case GCRYERR_BAD_SECRET_KEY: err = GNUPG_Bad_Secret_Key; break;
-    case GCRYERR_BAD_SIGNATURE:  err = GNUPG_Bad_Signature; break;
-
-    case GCRYERR_BAD_MPI:
-      err = GNUPG_Bad_Data;
-      break;
-      
-    case GCRYERR_INV_ARG:
-    case GCRYERR_INV_OP:
-    case GCRYERR_INTERNAL:
-    case GCRYERR_INV_CIPHER_MODE:
-      err = GNUPG_Invalid_Value;
-      break;
-
-    case GCRYERR_SELFTEST: 
-      err = GNUPG_Bug;
-      break;
-
-    case GCRYERR_SEXP_INV_LEN_SPEC    :
-    case GCRYERR_SEXP_STRING_TOO_LONG :
-    case GCRYERR_SEXP_UNMATCHED_PAREN :
-    case GCRYERR_SEXP_NOT_CANONICAL   :
-    case GCRYERR_SEXP_BAD_CHARACTER   :
-    case GCRYERR_SEXP_BAD_QUOTATION   :
-    case GCRYERR_SEXP_ZERO_PREFIX     :
-    case GCRYERR_SEXP_NESTED_DH       :
-    case GCRYERR_SEXP_UNMATCHED_DH    :
-    case GCRYERR_SEXP_UNEXPECTED_PUNC :
-    case GCRYERR_SEXP_BAD_HEX_CHAR    :
-    case GCRYERR_SEXP_ODD_HEX_NUMBERS :
-    case GCRYERR_SEXP_BAD_OCT_CHAR    :
-      err = GNUPG_Invalid_Sexp;
-      break;
-
-    case GCRYERR_NO_MEM: err = GNUPG_Out_Of_Core; break;
-
-    case GCRYERR_NOT_IMPL:  err = GNUPG_Not_Implemented; break;
-    case GCRYERR_CONFLICT:  err = GNUPG_Conflict; break;
-      
-    case GCRYERR_INV_OBJ:   /* an object is not valid */
-    case GCRYERR_TOO_SHORT: /* provided buffer too short */
-    case GCRYERR_TOO_LARGE: /* object is too large */
-    case GCRYERR_NO_OBJ:    /* Missing item in an object */
-    default:
-      err = seterr (General_Error);
-      break;
-    }
   return err;
 }
 
 int 
 map_kbx_err (int err)
 {
-  switch (err)
-    {
-    case -1:
-    case 0:
-      break;
-      
-    default:
-      err = seterr (General_Error);
-      break;
-    }
   return err;
 }
 
-
-int 
+/* Map Assuan error code ERR to an GPG_ERR_ code.  We need to
+   distinguish between genuine (and legacy) Assuan error codes and
+   application error codes shared with all GnuPG modules.  The rule is
+   simple: All errors with a gpg_err_source of UNKNOWN are genuine
+   Assuan codes all others are passed verbatim through. */
+gpg_error_t
 map_assuan_err (int err)
 {
+  gpg_err_code_t ec;
+
+  if (gpg_err_source (err))
+    return err;
+
   switch (err)
     {
-    case -1:
-    case 0:
-      break;
+    case -1:                     ec = GPG_ERR_EOF; break;
+    case 0:                      ec = 0; break;
 
-    case ASSUAN_Canceled:        err = GNUPG_Canceled; break;
-    case ASSUAN_Invalid_Index:   err = GNUPG_Invalid_Index; break;
+    case ASSUAN_Canceled:        ec = GPG_ERR_CANCELED; break;
+    case ASSUAN_Invalid_Index:   ec = GPG_ERR_INV_INDEX; break;
 
-    case ASSUAN_Not_Implemented: err = GNUPG_Not_Implemented; break;
-    case ASSUAN_Server_Fault:    err = GNUPG_Assuan_Server_Fault; break;
-    case ASSUAN_No_Public_Key:   err = GNUPG_No_Public_Key; break;
-    case ASSUAN_No_Secret_Key:   err = GNUPG_No_Secret_Key; break;
+    case ASSUAN_Not_Implemented: ec = GPG_ERR_NOT_IMPLEMENTED; break;
+    case ASSUAN_Server_Fault:    ec = GPG_ERR_ASSUAN_SERVER_FAULT; break;
+    case ASSUAN_No_Public_Key:   ec = GPG_ERR_NO_PUBKEY; break;
+    case ASSUAN_No_Secret_Key:   ec = GPG_ERR_NO_SECKEY; break;
 
-    case ASSUAN_Cert_Revoked:    err = GNUPG_Certificate_Revoked; break;
-    case ASSUAN_No_CRL_For_Cert: err = GNUPG_No_CRL_Known; break;       
-    case ASSUAN_CRL_Too_Old:     err = GNUPG_CRL_Too_Old; break;        
+    case ASSUAN_Cert_Revoked:    ec = GPG_ERR_CERT_REVOKED; break;
+    case ASSUAN_No_CRL_For_Cert: ec = GPG_ERR_NO_CRL_KNOWN; break;       
+    case ASSUAN_CRL_Too_Old:     ec = GPG_ERR_CRL_TOO_OLD; break;        
 
-    case ASSUAN_Not_Trusted:     err = GNUPG_Not_Trusted; break;
+    case ASSUAN_Not_Trusted:     ec = GPG_ERR_NOT_TRUSTED; break;
 
-    case ASSUAN_Card_Error:      err = GNUPG_Card_Error; break;
-    case ASSUAN_Invalid_Card:    err = GNUPG_Invalid_Card; break;
-    case ASSUAN_No_PKCS15_App:   err = GNUPG_No_PKCS15_App; break;
-    case ASSUAN_Card_Not_Present: err= GNUPG_Card_Not_Present; break;
-    case ASSUAN_Not_Confirmed:   err = GNUPG_Not_Confirmed; break;
-    case ASSUAN_Invalid_Id:      err = GNUPG_Invalid_Id; break;
+    case ASSUAN_Card_Error:      ec = GPG_ERR_CARD; break;
+    case ASSUAN_Invalid_Card:    ec = GPG_ERR_INV_CARD; break;
+    case ASSUAN_No_PKCS15_App:   ec = GPG_ERR_NO_PKCS15_APP; break;
+    case ASSUAN_Card_Not_Present: ec= GPG_ERR_CARD_NOT_PRESENT; break;
+    case ASSUAN_Not_Confirmed:   ec = GPG_ERR_NOT_CONFIRMED; break;
+    case ASSUAN_Invalid_Id:      ec = GPG_ERR_INV_ID; break;
 
     default:
-      err = err < 100? GNUPG_Assuan_Server_Fault : GNUPG_Assuan_Error;
+      ec = err < 100? GPG_ERR_ASSUAN_SERVER_FAULT : GPG_ERR_ASSUAN;
       break;
     }
-  return err;
+  return gpg_err_make (GPG_ERR_SOURCE_UNKNOWN, ec);
 }
 
-/* Map GNUPG_xxx error codes to Assuan status codes */
+/* Map GPG_xERR_xx error codes to Assuan status codes */
 int
 map_to_assuan_status (int rc)
 {
-  switch (rc)
-    {
-    case -1:
-      rc = ASSUAN_No_Data_Available;
-      break;
-    case 0: break;
-    case GNUPG_Bad_CA_Certificate: 
-    case GNUPG_Bad_Certificate:  
-    case GNUPG_Wrong_Key_Usage:
-    case GNUPG_Certificate_Revoked:
-    case GNUPG_No_CRL_Known:
-    case GNUPG_CRL_Too_Old:
-    case GNUPG_No_Policy_Match:
-    case GNUPG_Certificate_Expired:
-      rc = ASSUAN_Bad_Certificate; 
-      break;
-    case GNUPG_Bad_Certificate_Chain: rc = ASSUAN_Bad_Certificate_Chain; break;
-    case GNUPG_Missing_Certificate: rc = ASSUAN_Missing_Certificate; break;
-    case GNUPG_No_Data:           rc = ASSUAN_No_Data_Available; break;
-    case GNUPG_Bad_Signature:     rc = ASSUAN_Bad_Signature; break;
-    case GNUPG_Not_Implemented:   rc = ASSUAN_Not_Implemented; break;
-    case GNUPG_No_Agent:          rc = ASSUAN_No_Agent; break;
-    case GNUPG_Agent_Error:       rc = ASSUAN_Agent_Error; break;
-    case GNUPG_No_Public_Key:     rc = ASSUAN_No_Public_Key; break;
-    case GNUPG_No_Secret_Key:     rc = ASSUAN_No_Secret_Key; break;
-    case GNUPG_Invalid_Data:      rc = ASSUAN_Invalid_Data; break;
-    case GNUPG_Invalid_Name:      rc = ASSUAN_Invalid_Name; break;
-    case GNUPG_Not_Trusted:       rc = ASSUAN_Not_Trusted; break;
-    case GNUPG_Canceled:          rc = ASSUAN_Canceled; break;
-    case GNUPG_Invalid_Index:     rc = ASSUAN_Invalid_Index; break;
+  gpg_err_code_t   ec = gpg_err_code (rc);
+  gpg_err_source_t es = gpg_err_source (rc);
 
-    case GNUPG_Card_Error:      
-    case GNUPG_Card_Reset:      
-      rc = ASSUAN_Card_Error; 
-      break;
-    case GNUPG_Card_Removed:  
-    case GNUPG_Card_Not_Present:
-      rc = ASSUAN_Card_Not_Present;
-      break;
-    case GNUPG_Invalid_Card:      rc = ASSUAN_Invalid_Card; break;
-    case GNUPG_No_PKCS15_App:     rc = ASSUAN_No_PKCS15_App; break;
-    case GNUPG_Not_Confirmed:     rc = ASSUAN_Not_Confirmed; break;
-    case GNUPG_Invalid_Id:        rc = ASSUAN_Invalid_Id; break; 
+  if (!es)
+    {
+      es = GPG_ERR_SOURCE_USER_4; /*  This should not happen, but we
+                                      need to make sure to pass a new
+                                      Assuan errorcode along. */
+      log_debug ("map_to_assuan_status called with no error source\n");
+    }
 
-    case GNUPG_Bad_PIN:
-    case GNUPG_Bad_Passphrase:
-      rc = ASSUAN_No_Secret_Key;
-      break;
+  if (ec == -1)
+    ec = GPG_ERR_NO_DATA;  /* That used to be ASSUAN_No_Data_Available. */
 
-    case GNUPG_Read_Error: 
-    case GNUPG_Write_Error:
-    case GNUPG_IO_Error: 
-      rc = ASSUAN_Server_IO_Error;
-      break;
-    case GNUPG_Out_Of_Core:    
-    case GNUPG_Resource_Limit: 
-      rc = ASSUAN_Server_Resource_Problem;
-      break;
-    case GNUPG_Bug: 
-    case GNUPG_Internal_Error:   
-      rc = ASSUAN_Server_Bug;
-      break;
-    default: 
-      rc = ASSUAN_Server_Fault;
-      break;
-    }
-  return rc;
+  return gpg_err_make (es, ec);
 }