Introduce transform_apply_seqdupe

This distinguishes the two cases.  Right now they are still handled
the same everywhere.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/secnet.h b/secnet.h
index 21b94c090b7a28ab5ed0c6c7d7c5cab8eebf7031..e253a14177ff0f161ab7bcba146f7a7e9939b1ad 100644 (file)
--- a/secnet.h
+++ b/secnet.h
@@ -548,12 +548,15 @@ typedef enum {
     transform_apply_ok       = 0, /* all is well (everyone may assume==0) */
     transform_apply_err      = 1, /* any other problem */
     transform_apply_seqrange = 2,
-        /* message decrypted but sequence number was out of range */
+        /* message decrypted but sequence number was out of recent range */
+    transform_apply_seqdupe  = 3,
+        /* message decrypted but was dupe of recent packet */
 } transform_apply_return;
 
 static inline bool_t
 transform_apply_return_badseq(transform_apply_return problem) {
-    return problem == transform_apply_seqrange;
+    return problem == transform_apply_seqrange ||
+          problem == transform_apply_seqdupe;
 }
 
 typedef transform_apply_return transform_apply_fn(void *st,

diff --git a/transform-common.h b/transform-common.h
index 2e7883303a25c862d81fdb7404d8e28b3b4ad92f..74e08ea3d0acc9faa9769a6e2eeae6cb9833bed6 100644 (file)
--- a/transform-common.h
+++ b/transform-common.h
@@ -53,7 +53,7 @@ typedef uint32_t recvbitmap_type;
            recvbitmap_type recvbit=(uint32_t)1 << skew;        \
            if (ti->recvbitmap & recvbit) {                     \
                *errmsg="seqnum: duplicate";                    \
-               return transform_apply_seqrange;                \
+               return transform_apply_seqdupe;                 \
            }                                                   \
            ti->recvbitmap |= recvbit;                          \
        }                                                       \