Merge pull request #1356 from aboch/isb

mavenugo · web-flow · commit c7dc6dc476a5 · 2016-07-25T19:16:01.000-07:00
Fix bug in ipsec key rotation
diff --git a/drivers/overlay/encryption.go b/drivers/overlay/encryption.go
@@ -488,7 +488,7 @@ func updateNodeKey(lIP, rIP net.IP, idxs []*spi, curKeys []*key, newIdx, priIdx,
 
 	if delIdx != -1 {
 		// -rSA0
-		programSA(rIP, lIP, spis[delIdx], nil, reverse, false)
+		programSA(lIP, rIP, spis[delIdx], nil, reverse, false)
 	}
 
 	if newIdx > -1 {

Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,7 @@ func updateNodeKey(lIP, rIP net.IP, idxs []spi, curKeys []key, newIdx, priIdx,`
`488`	`488`
`489`	`489`	`if delIdx != -1 {`
`490`	`490`	`// -rSA0`
`491`		`- programSA(rIP, lIP, spis[delIdx], nil, reverse, false)`
	`491`	`+ programSA(lIP, rIP, spis[delIdx], nil, reverse, false)`
`492`	`492`	`}`
`493`	`493`
`494`	`494`	`if newIdx > -1 {`