Changeset 496

Timestamp:

08/27/07 16:18:35

Author:

rachel

Message:

Removed use of old macro ERR1P and replaced with new stacked errors OPS_ERROR_1

Files:

• openpgpsdk/trunk/include/openpgpsdk/errors.h (modified) (3 diffs)
• openpgpsdk/trunk/src/advanced/adv_packet-parse.c (modified) (22 diffs)

openpgpsdk/trunk/include/openpgpsdk/errors.h

@@ -17 +17 @@
-    /* reader errors */
-    OPS_E_R=0x1000,     /* general reader error */
-
-
-
+
+
+
+
-
-    /* writer errors */
@@ -39 +40 @@
-    /* Algorithm support errors */
-    OPS_E_ALG=0x5000,                   /* general algorithm error */
-
+
+
+
+
-
-    /* Protocol errors */
-    OPS_E_PROTO=0x6000, /* general protocol error */
-
-
+
+
+
+
+
+
+
+
+
-    } ops_errcode_t;
-
@@ -71 +82 @@
-#define OPS_ERROR(err,code,fmt) do { ops_push_error(err,code,0,__FILE__,__LINE__,fmt); } while(0)
-#define OPS_ERROR_1(err,code,fmt,arg)   do { ops_push_error(err,code,0,__FILE__,__LINE__,fmt,arg); } while(0)
+#define OPS_ERROR_2(err,code,fmt,arg,arg2)      do { ops_push_error(err,code,0,__FILE__,__LINE__,fmt,arg,arg2); } while(0)
+#define OPS_ERROR_3(err,code,fmt,arg,arg2,arg3) do { ops_push_error(err,code,0,__FILE__,__LINE__,fmt,arg,arg2,arg3); } while(0)
+#define OPS_ERROR_4(err,code,fmt,arg,arg2,arg3,arg4)    do { ops_push_error(err,code,0,__FILE__,__LINE__,fmt,arg,arg2,arg3,arg4); } while(0)
-
-#endif /* OPS_ERRORS */

openpgpsdk/trunk/src/advanced/adv_packet-parse.c

@@ -131 +131 @@
-/*! macro to save typing */
-#define C               content.content
+
-/*! set error code in content and run CallBack to handle error */
-#define ERRCODE(cbinfo,err)     do { C.errcode.errcode=err; CB(cbinfo,OPS_PARSER_ERRCODE,&content); } while(0)
@@ -140 +141 @@
-#define WARN(warn)      do { C.error.error=warn; CB(OPS_PARSER_ERROR,&content);; } while(0)
-#define WARNP(info,warn)        do { C.error.error=warn; CBP(info,OPS_PARSER_ERROR,&content); } while(0)
+#ifdef XXX
-/*! \todo descr ERR1 macro */
-#define ERR1P(info,fmt,x)       do { format_error(&content,(fmt),(x)); CBP(info,OPS_PARSER_ERROR,&content); return ops_false; } while(0)
-#define ERR2P(info,fmt,x,y)     do { format_error(&content,(fmt),(x),(y)); CBP(info,OPS_PARSER_ERROR,&content); return ops_false; } while(0)
-#define ERR4P(info,fmt,x,y,z,a) do { format_error(&content,(fmt),(x),(y),(z),(a)); CBP(info,OPS_PARSER_ERROR,&content); return ops_false; } while(0)
+#endif
-
-/* XXX: replace ops_ptag_t with something more appropriate for limiting
-   reads */
-
+#ifdef OLD
-/* Note that this makes the parser non-reentrant, in a limited way */
-/* It is the caller's responsibility to avoid overflow in the buffer */
@@ -161 +165 @@
-    content->content.error.error=buf;
-    }
+#endif
-
-/**
@@ -918 +923 @@
-                                 ops_parse_info_t *pinfo)
-    {
-
+//    
-    unsigned char c[1];
-
@@ -927 +932 @@
-    key->version=c[0];
-    if(key->version < 2 || key->version > 4)
-
+
+
+
+
+
-
-    if(!limited_read_time(&key->creation_time,region,pinfo))
@@ -969 +978 @@
-
-    default:
-
+
+
-        }
-
@@ -999 +1009 @@
-    // XXX: this test should be done for all packets, surely?
-    if(region->length_read != region->length)
-
-
+
+
+
+
+
-
-    CBP(pinfo,tag,&content);
@@ -1230 +1243 @@
-
-    default:
-
+
+
+
+
-        }
-
-    if(region->length_read != region->length)
-
+
+
+
+
-
-    if(C.signature.signer_id_set)
@@ -1459 +1478 @@
-    default:
-        if(pinfo->ss_parsed[t8]&t7)
-ERR1P(pinfo,"Unknown signature subpacket type (%d)"
-                
+OPS_ERROR_1(&pinfo->errors, OPS_E_PROTO_UNKNOWN_SS
+                        "Unknown signature subpacket type (%d)",
-        read=ops_false;
-        break;
@@ -1469 +1488 @@
-        {
-        if(content.critical)
-
-
+
+
+
-        if(!read && !limited_skip(subregion.length-1,&subregion,pinfo))
-            return 0;
@@ -1480 +1500 @@
-
-    if(read && subregion.length_read != subregion.length)
-
+
+
+
+
+
+
- 
-    CBP(pinfo,content.tag,&content);
@@ -1654 +1679 @@
-
-    default:
-
-
+
+
+
+
-        }
-
-    if(region->length_read != region->length)
-
-
+
+
+
+
+
+
-
-    CBP(pinfo,OPS_PTAG_CT_SIGNATURE_FOOTER,&content);
@@ -1696 +1727 @@
-    else if(c[0] == 4)
-        return parse_v4_signature(region,pinfo,v4_hashed_data_start);
-
+
+
+
+
-    }
-
@@ -1725 +1759 @@
-        return 0;
-    if(C.one_pass_signature.version != 3)
-
-
+
+
+
+
+
+
-
-    if(!limited_read(c,1,region,pinfo))
@@ -2190 +2228 @@
-    C.pk_session_key.version=c[0];
-    if(C.pk_session_key.version != OPS_PKSK_V3)
-
+
+
-              "Bad public-key encrypted session key version (%d)",
-              C.pk_session_key.version);
+        return 0;
+        }
-
-    if(!limited_read(C.pk_session_key.key_id,
@@ -2229 +2270 @@
-
-    default:
-ERR1P(pinfo
-             "Unknown public key algorithm in session key (%d
-             C.pk_session_key.algorithm
+OPS_ERROR_1(&pinfo->errors, OPS_E_ALG_UNSUPPORTED_PUBLIC_KEY_ALG
+                    "Unknown public key algorithm in session key (%s
+                    ops_show_pka(C.pk_session_key.algorithm)
-        return 0;
-        }
@@ -2264 +2305 @@
-        {
-        // ERR1P
-
+
+
+
-        return 0;
-        }
@@ -2282 +2325 @@
-    if((unsigned)n != k+3)
-        {
-
-
+
+
+
-        return 0;
-        }
@@ -2308 +2352 @@
-    if (unencoded_m_buf[k+1]!=cs[0] || unencoded_m_buf[k+2]!=cs[1])
-        {
-
+
+
-              cs[0], cs[1], unencoded_m_buf[k+1], unencoded_m_buf[k+2]);
-        return 0;
@@ -2463 +2508 @@
-        unsigned char buf[OPS_MAX_BLOCK_SIZE+2];
-        size_t b=decrypt->blocksize;
-
+        //
-        ops_region_t encregion;
-
@@ -2478 +2523 @@
-            {
-            ops_reader_pop_decrypt(pinfo);
-
-
+
+
+
+
-            }
-
@@ -2734 +2781 @@
-
-    default:
-
+
+
-        r=0;
-        }