From 243743e83795181e44f8a1b075a67d0f53747663 Mon Sep 17 00:00:00 2001
From: Aaron Kaplan <aaron@lo-res.org>
Date: Mon, 9 Dec 2013 22:02:01 +0100
Subject: [PATCH] add the info about IANA vs. OpenSSL names

---
 src/cipher_suites/architecture.tex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cipher_suites/architecture.tex b/src/cipher_suites/architecture.tex
index b9afa5b..711e9db 100644
--- a/src/cipher_suites/architecture.tex
+++ b/src/cipher_suites/architecture.tex
@@ -41,8 +41,9 @@ Examples: \texttt{SHA256}
 \caption{Composition of a typical cipher string}
 \end{figure}
 
-
 \item{Authenticated encryption scheme:}
 An encryption scheme which provides for confidentiality, integrity and authenticity.
 
+\item {\textbf{NOTE:}} there are two naming schemes for cipher strings -- IANA names (see section \ref{section:Links}) and the more well known OpenSSL names. In this document we will always use OpenSSL names unless a specific service uses IANA names.
+
 \end{description}
-- 
2.11.0