X-Git-Url: http://nitlanguage.org

diff --git a/lib/core/bytes.nit b/lib/core/bytes.nit
index 332efc2..94d3d27 100644
--- a/lib/core/bytes.nit
+++ b/lib/core/bytes.nit
@@ -19,6 +19,61 @@ import kernel
 import collection::array
 intrude import text::flat
 
+redef class Byte
+	# Write self as a string into `ns` at position `pos`
+	private fun add_digest_at(ns: NativeString, pos: Int) do
+		var tmp = (0xF0u8 & self) >> 4
+		ns[pos] = if tmp >= 0x0Au8 then tmp + 0x37u8 else tmp + 0x30u8
+		tmp = 0x0Fu8 & self
+		ns[pos + 1] = if tmp >= 0x0Au8 then tmp + 0x37u8 else tmp + 0x30u8
+	end
+
+	# Is `self` a valid hexadecimal digit (in ASCII)
+	#
+	# ~~~nit
+	# intrude import core::bytes
+	# assert not '/'.ascii.is_valid_hexdigit
+	# assert '0'.ascii.is_valid_hexdigit
+	# assert '9'.ascii.is_valid_hexdigit
+	# assert not ':'.ascii.is_valid_hexdigit
+	# assert not '@'.ascii.is_valid_hexdigit
+	# assert 'A'.ascii.is_valid_hexdigit
+	# assert 'F'.ascii.is_valid_hexdigit
+	# assert not 'G'.ascii.is_valid_hexdigit
+	# assert not '`'.ascii.is_valid_hexdigit
+	# assert 'a'.ascii.is_valid_hexdigit
+	# assert 'f'.ascii.is_valid_hexdigit
+	# assert not 'g'.ascii.is_valid_hexdigit
+	# ~~~
+	private fun is_valid_hexdigit: Bool do
+		return (self >= 0x30u8 and self <= 0x39u8) or
+		       (self >= 0x41u8 and self <= 0x46u8) or
+		       (self >= 0x61u8 and self <= 0x66u8)
+	end
+
+	# `self` as a hexdigit to its byte value
+	#
+	# ~~~nit
+	# intrude import core::bytes
+	# assert 0x39u8.hexdigit_to_byteval == 0x09u8
+	# assert 0x43u8.hexdigit_to_byteval == 0x0Cu8
+	# ~~~
+	#
+	# REQUIRE: `self.is_valid_hexdigit`
+	private fun hexdigit_to_byteval: Byte do
+		if self >= 0x30u8 and self <= 0x39u8 then
+			return self - 0x30u8
+		else if self >= 0x41u8 and self <= 0x46u8 then
+			return self - 0x37u8
+		else if self >= 0x61u8 and self <= 0x66u8 then
+			return self - 0x57u8
+		end
+		# Happens only if the requirement is not met.
+		# i.e. this abort is here to please the compiler
+		abort
+	end
+end
+
 # A buffer containing Byte-manipulation facilities
 #
 # Uses Copy-On-Write when persisted
@@ -26,7 +81,7 @@ class Bytes
 	super AbstractArray[Byte]
 
 	# A NativeString being a char*, it can be used as underlying representation here.
-	private var items: NativeString
+	var items: NativeString
 
 	# Number of bytes in the array
 	redef var length
@@ -63,6 +118,20 @@ class Bytes
 		return items[i]
 	end
 
+	# Returns self as a hexadecimal digest
+	fun hexdigest: String do
+		var elen = length * 2
+		var ns = new NativeString(elen)
+		var i = 0
+		var oi = 0
+		while i < length do
+			self[i].add_digest_at(ns, oi)
+			i += 1
+			oi += 2
+		end
+		return new FlatString.full(ns, elen, 0, elen - 1, elen)
+	end
+
 	#     var b = new Bytes.with_capacity(1)
 	#     b[0] = 101u8
 	#     assert b.to_s == "e"
@@ -164,7 +233,7 @@ private class BytesIterator
 
 	var max: Int
 
-	init with_buffer(b: Bytes) do init(b.items, 0, b.length - 1)
+	init with_buffer(b: Bytes) do init(b.items, 0, b.length)
 
 	redef fun is_ok do return index < max
 
@@ -186,6 +255,15 @@ redef class Text
 		return b
 	end
 
+	# Is `self` a valid hexdigest ?
+	#
+	#     assert "0B1d3F".is_valid_hexdigest
+	#     assert not "5G".is_valid_hexdigest
+	fun is_valid_hexdigest: Bool do
+		for i in bytes do if not i.is_valid_hexdigit then return false
+		return true
+	end
+
 	# Appends `self.bytes` to `b`
 	fun append_to_bytes(b: Bytes) do
 		for s in substrings do
@@ -193,6 +271,38 @@ redef class Text
 			b.append_ns_from(s.items, s.bytelen, from)
 		end
 	end
+
+	# Returns a new `Bytes` instance with the digest as content
+	#
+	#     assert "0B1F4D".hexdigest_to_bytes == [0x0Bu8, 0x1Fu8, 0x4Du8]
+	#
+	# REQUIRE: `self` is a valid hexdigest and hexdigest.length % 2 == 0
+	fun hexdigest_to_bytes: Bytes do
+		var b = bytes
+		var pos = 0
+		var max = bytelen
+		var ret = new Bytes.with_capacity(max / 2)
+		while pos < max do
+			ret.add((b[pos].hexdigit_to_byteval << 4) |
+			b[pos + 1].hexdigit_to_byteval)
+			pos += 2
+		end
+		return ret
+	end
+
+	# Gets the hexdigest of the bytes of `self`
+	#
+	#     assert "&lt;STRING&#47;&rt;".hexdigest == "266C743B535452494E47262334373B2672743B"
+	fun hexdigest: String do
+		var ln = bytelen
+		var outns = new NativeString(ln * 2)
+		var oi = 0
+		for i in [0 .. ln[ do
+			bytes[i].add_digest_at(outns, oi)
+			oi += 2
+		end
+		return new FlatString.with_infos(outns, ln * 2, 0, ln * 2 - 1)
+	end
 end
 
 redef class FlatText