be more liberal in accepting notifies with a protocol id

diff --git a/src/charon/encoding/payloads/notify_payload.c b/src/charon/encoding/payloads/notify_payload.c
index d943b215c99279d7da3eb2ccc51027e4211a120b..b11d8f2069414bba3b0168fb599b1700be0cbc0c 100644 (file)
--- a/src/charon/encoding/payloads/notify_payload.c
+++ b/src/charon/encoding/payloads/notify_payload.c
@@ -191,15 +191,8 @@ static status_t verify(private_notify_payload_t *this)
        {
                case PROTO_NONE:
                case PROTO_IKE:
-                       break;
                case PROTO_AH:
                case PROTO_ESP:
-                       if (this->spi.len != 4)
-                       {
-                               DBG1(DBG_ENC, "Invalid SPI size for %N", 
-                                        protocol_id_names, this->protocol_id);
-                               return FAILED;
-                       }
                        break;
                default:
                        DBG1(DBG_ENC, "Unknown protocol (%d)", this->protocol_id);
@@ -364,10 +357,14 @@ static u_int32_t get_spi(private_notify_payload_t *this)
        {
                case PROTO_AH:
                case PROTO_ESP:
-                       return *((u_int32_t*)this->spi.ptr);
+                       if (this->spi.len == 4)
+                       {
+                               return *((u_int32_t*)this->spi.ptr);
+                       }
                default:
-                       return 0;
+                       break;
        }
+       return 0;
 }
 
 /**