Yes, your second one is near perfect. At the moment, the riot squads use a square shield (well, square with rounded corners). BTW, CRS are not only riot squads. They have teams of mountain rescue and civil security too. I tried to get a picture, but Google didn't bring much...