0.4 RC1 included full forms in SAS calc

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@658 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Ian Paterson 2007-03-15 17:13:51 +00:00
parent 377dccb812
commit 78e9ee82d0
1 changed files with 15 additions and 13 deletions

View File

@ -47,11 +47,6 @@
<!ENTITY RS1ARSZA "RS<span class='sub'>1A</span>...RS<span class='sub'>ZA</span>">
<!ENTITY RS1BRSZB "RS<span class='sub'>1B</span>...RS<span class='sub'>ZB</span>">
<!ENTITY RSH1ARSHZA "RSH<span class='sub'>1A</span>...RSH<span class='sub'>ZA</span>">
<!ENTITY rfc3711 "<span class='ref'>RFC 3711</span> <note>RFC 3711: Secure Real-time Transport Protocol &lt;<link url='http://www.ietf.org/rfc/rfc3711.txt'>http://www.ietf.org/rfc/rfc3711.txt</link>&gt;.</note>" >
]>
<?xml-stylesheet type='text/xsl' href='xep.xsl'?>
<xep>
@ -72,6 +67,12 @@
<supersededby>None</supersededby>
<shortname>cryptoesession</shortname>
&ianpaterson;
<revision>
<version>0.4</version>
<date>2007-03-15</date>
<initials>ip</initials>
<remark><p>Incorporated whole forms into SAS calculation</p></remark>
</revision>
<revision>
<version>0.3</version>
<date>2006-11-27</date>
@ -517,8 +518,7 @@ K = HASH(&dsupx; mod p)
&KCsubA; = <em>HMAC</em>(HASH, K, "Initiator Cipher Key")
&KMsubA; = <em>HMAC</em>(HASH, K, "Initiator MAC Key")
&KSsubA; = <em>HMAC</em>(HASH, K, "Initiator SIGMA Key")
<span class='highlight'>SAS = <em>truncate</em>(HASH(e | d | "Short Authentication String"))
&RSH1ARSHZA; = <em>HMAC</em>(HASH, &NsubA;, &RS1ARSZA;)
<span class='highlight'>&RSH1ARSHZA; = <em>HMAC</em>(HASH, &NsubA;, &RS1ARSZA;)
<em>if</em>&#160;&isPKsubB;&#160;<em>equals false then:</em>&#160;
&macA; = <em>HMAC</em>(HASH, &KSsubA;, {&NsubB;, &NsubA;, e, &RSH1ARSHZA;})
&IDA; = <em>cipher</em>(&KCsubA;, &CsubA;, &macA;)
@ -527,11 +527,14 @@ K = HASH(&dsupx; mod p)
&signA; = <em>sign</em>(&signKeyA;, &macA;)
&IDA; = <em>cipher</em>(&KCsubA;, &CsubA;, {&pubKeyA;, &signA;})
&MsubA; = <em>HMAC</em>(HASH, &KMsubA;, &CsubA;, &IDA;)
<span class='highlight'>SAS = <em>truncate</em>(HASH(&MsubA; | d | "Short Authentication String"))</span>&#160;
&IDA;, &MsubA;
------------&gt;
<span class='highlight'>e, &RSH1ARSHZA;
<span class='highlight'>e, &RSH1ARSHZA;&#160;
<em>assert</em>&#160;He = SHA256(e)
SAS = <em>truncate</em>(HASH(e | d | "Short Authentication String") ))
SAS = <em>truncate</em>(HASH(&MsubA; | d | "Short Authentication String"))
SAS
&lt;===========&gt;
@ -755,8 +758,7 @@ K = HASH(&dsupx; mod p)
&KCsubA; = <em>HMAC</em>(HASH, K, "Initiator Cipher Key")
&KMsubA; = <em>HMAC</em>(HASH, K, "Initiator MAC Key")
&KSsubA; = <em>HMAC</em>(HASH, K, "Initiator SIGMA Key")
<span class='highlight'>SAS = SASGEN(e, d)
&RSH1ARSHZA; = <em>HMAC</em>(HASH, &NsubA;, &RS1ARSZA;)
<span class='highlight'>&RSH1ARSHZA; = <em>HMAC</em>(HASH, &NsubA;, &RS1ARSZA;)
&formA2; = {&RSH1ARSHZA;, e, &NsubB;}
<em>if</em>&#160;&isPKsubB;&#160;<em>equals false then:</em>&#160;
&macA; = <em>HMAC</em>(HASH, &KSsubA;, {&NsubB;, &NsubA;, e, &formA;, &formA2;})
@ -766,13 +768,13 @@ K = HASH(&dsupx; mod p)
&signA; = SIGN(&signKeyA;, &macA;)
&IDA; = CIPHER(&KCsubA;, &CsubA;, {&pubKeyA;, &signA;})
&MsubA; = <em>HMAC</em>(HASH, &KMsubA;, &CsubA;, &IDA;)
<span class='highlight'>SAS = SASGEN(&MsubA;, &formB;)</span>&#160;
&IDA;, &MsubA;
------------&gt;
<span class='highlight'>&formA2;&#160;
<em>assert</em>&#160;He = SHA256(e)
SAS = SASGEN(e, d)
SAS = SASGEN(&MsubA;, &formB;)
SAS
&lt;===========&gt;