From 2f5de61ce333fc38c3a7ca6f40bb07b3f5e2819e Mon Sep 17 00:00:00 2001
From: Peter Wu <lekensteyn@gmail.com>
Date: Fri, 6 Dec 2013 18:49:46 +0100
Subject: generate-wireshark-cs: use "0" for unavailable block size

Stream cipher RC4 (and block cipher NULL) do not have a IV. The
packet-ssl-utils code needs to be fixed up for this, but this
generator can already be created. Revert this patch until the
block to iv_size rename is complete.
---
 generate-wireshark-cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'generate-wireshark-cs')

diff --git a/generate-wireshark-cs b/generate-wireshark-cs
index 2464064..5b9a9a4 100755
--- a/generate-wireshark-cs
+++ b/generate-wireshark-cs
@@ -97,6 +97,11 @@ p() {
 		;;
 	esac
 
+	# For block sizes, see:
+	# SSL 3.0: http://tools.ietf.org/html/rfc6101#page-55
+	# TLS 1.0: http://tools.ietf.org/html/rfc2246#page-62
+	# TLS 1.1: http://tools.ietf.org/html/rfc4346#page-69
+	# TLS 1.2: http://tools.ietf.org/html/rfc5246#page-84
 	# GCM's IV size is always 4 regardless of underlying block cipher
 	[[ $1 == *_GCM_* ]] && blocksize=4 ||
 	case $cipher in
@@ -107,7 +112,8 @@ p() {
 	RC2)
 		blocksize=8 ;;
 	RC4|NULL)
-		blocksize=1 ;;
+		# N/A for stream cipher RC4
+		blocksize=0 ;;
 	*)
 		warn "Unknown cipher $cipher in $hexid $1"
 		return
-- 
cgit v1.2.1