Chapter 6 (Block Ciphers): Figures mixed up

[danieldeer]

In chapter 6, several figures are mixed up.

For example, Figure 6.2 ("In Figure 6.2, note that the permutation is not just one big cycle") currently shows this image:

which does not fit at all.

Actually Figure 6.4 is the correct one:

[fabthegreat]

Same remark for CBC mode of stream cyphers.

It doesn't really corresponds to what is written.

[hansSchall]

It looks like Fig 6.2 and Fig 6.3 are the same as the two unlabeled ones in CHAPTER 7. STREAM CIPHERS (p49-50).

The second one matches the text, but the first one doesn't make sense there either.