From ddff1b5a876631de0326bf41b1f22f6816572bbb Mon Sep 17 00:00:00 2001
From: Alessandro Boch <aboch@docker.com>
Date: Tue, 19 Jul 2016 11:51:29 -0700
Subject: [PATCH] Use fnv1-a to construct the SPI

Signed-off-by: Alessandro Boch <aboch@docker.com>
---
 libnetwork/drivers/overlay/encryption.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/libnetwork/drivers/overlay/encryption.go b/libnetwork/drivers/overlay/encryption.go
index e36fa0ff3a..ec8c4a8419 100644
--- a/libnetwork/drivers/overlay/encryption.go
+++ b/libnetwork/drivers/overlay/encryption.go
@@ -5,6 +5,7 @@ import (
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
+	"hash/fnv"
 	"net"
 	"sync"
 	"syscall"
@@ -353,13 +354,13 @@ func spExists(sp *netlink.XfrmPolicy) (bool, error) {
 }
 
 func buildSPI(src, dst net.IP, st uint32) int {
-	spi := int(st)
-	f := src[len(src)-4:]
-	t := dst[len(dst)-4:]
-	for i := 0; i < 4; i++ {
-		spi = spi ^ (int(f[i])^int(t[3-i]))<<uint32(8*i)
-	}
-	return spi
+	b := make([]byte, 4)
+	binary.BigEndian.PutUint32(b, st)
+	h := fnv.New32a()
+	h.Write(src)
+	h.Write(b)
+	h.Write(dst)
+	return int(binary.BigEndian.Uint32(h.Sum(nil)))
 }
 
 func buildAeadAlgo(k *key, s int) *netlink.XfrmStateAlgo {