@@ -154,3 +154,132 @@ int test_wc_ChaCha20Poly1305_aead(void)
154154 return EXPECT_RESULT ();
155155} /* END test_wc_ChaCha20Poly1305_aead */
156156
157+ /*
158+ * Testing wc_XChaCha20Poly1305_Encrypt() and wc_XChaCha20Poly1305_Decrypt()
159+ * Test vector from Draft IRTF CFRG XChaCha Appendix A.3
160+ */
161+ int test_wc_XChaCha20Poly1305_aead (void )
162+ {
163+ EXPECT_DECLS ;
164+ #if defined(HAVE_CHACHA ) && defined(HAVE_POLY1305 ) && defined(HAVE_XCHACHA )
165+ const byte key [] = {
166+ 0x80 , 0x81 , 0x82 , 0x83 , 0x84 , 0x85 , 0x86 , 0x87 ,
167+ 0x88 , 0x89 , 0x8a , 0x8b , 0x8c , 0x8d , 0x8e , 0x8f ,
168+ 0x90 , 0x91 , 0x92 , 0x93 , 0x94 , 0x95 , 0x96 , 0x97 ,
169+ 0x98 , 0x99 , 0x9a , 0x9b , 0x9c , 0x9d , 0x9e , 0x9f
170+ };
171+ /* XChaCha uses a 24-byte nonce */
172+ const byte nonce [] = {
173+ 0x40 , 0x41 , 0x42 , 0x43 , 0x44 , 0x45 , 0x46 , 0x47 ,
174+ 0x48 , 0x49 , 0x4a , 0x4b , 0x4c , 0x4d , 0x4e , 0x4f ,
175+ 0x50 , 0x51 , 0x52 , 0x53 , 0x54 , 0x55 , 0x56 , 0x57
176+ };
177+ const byte plaintext [] = {
178+ 0x4c , 0x61 , 0x64 , 0x69 , 0x65 , 0x73 , 0x20 , 0x61 ,
179+ 0x6e , 0x64 , 0x20 , 0x47 , 0x65 , 0x6e , 0x74 , 0x6c ,
180+ 0x65 , 0x6d , 0x65 , 0x6e , 0x20 , 0x6f , 0x66 , 0x20 ,
181+ 0x74 , 0x68 , 0x65 , 0x20 , 0x63 , 0x6c , 0x61 , 0x73 ,
182+ 0x73 , 0x20 , 0x6f , 0x66 , 0x20 , 0x27 , 0x39 , 0x39 ,
183+ 0x3a , 0x20 , 0x49 , 0x66 , 0x20 , 0x49 , 0x20 , 0x63 ,
184+ 0x6f , 0x75 , 0x6c , 0x64 , 0x20 , 0x6f , 0x66 , 0x66 ,
185+ 0x65 , 0x72 , 0x20 , 0x79 , 0x6f , 0x75 , 0x20 , 0x6f ,
186+ 0x6e , 0x6c , 0x79 , 0x20 , 0x6f , 0x6e , 0x65 , 0x20 ,
187+ 0x74 , 0x69 , 0x70 , 0x20 , 0x66 , 0x6f , 0x72 , 0x20 ,
188+ 0x74 , 0x68 , 0x65 , 0x20 , 0x66 , 0x75 , 0x74 , 0x75 ,
189+ 0x72 , 0x65 , 0x2c , 0x20 , 0x73 , 0x75 , 0x6e , 0x73 ,
190+ 0x63 , 0x72 , 0x65 , 0x65 , 0x6e , 0x20 , 0x77 , 0x6f ,
191+ 0x75 , 0x6c , 0x64 , 0x20 , 0x62 , 0x65 , 0x20 , 0x69 ,
192+ 0x74 , 0x2e
193+ };
194+ const byte aad [] = {
195+ 0x50 , 0x51 , 0x52 , 0x53 , 0xc0 , 0xc1 , 0xc2 , 0xc3 ,
196+ 0xc4 , 0xc5 , 0xc6 , 0xc7
197+ };
198+ /* Expected combined ciphertext + 16-byte tag */
199+ const byte expected [] = {
200+ 0xbd , 0x6d , 0x17 , 0x9d , 0x3e , 0x83 , 0xd4 , 0x3b , 0x95 , 0x76 , 0x57 , 0x94 ,
201+ 0x93 , 0xc0 , 0xe9 , 0x39 , 0x57 , 0x2a , 0x17 , 0x00 , 0x25 , 0x2b , 0xfa , 0xcc ,
202+ 0xbe , 0xd2 , 0x90 , 0x2c , 0x21 , 0x39 , 0x6c , 0xbb , 0x73 , 0x1c , 0x7f , 0x1b ,
203+ 0x0b , 0x4a , 0xa6 , 0x44 , 0x0b , 0xf3 , 0xa8 , 0x2f , 0x4e , 0xda , 0x7e , 0x39 ,
204+ 0xae , 0x64 , 0xc6 , 0x70 , 0x8c , 0x54 , 0xc2 , 0x16 , 0xcb , 0x96 , 0xb7 , 0x2e ,
205+ 0x12 , 0x13 , 0xb4 , 0x52 , 0x2f , 0x8c , 0x9b , 0xa4 , 0x0d , 0xb5 , 0xd9 , 0x45 ,
206+ 0xb1 , 0x1b , 0x69 , 0xb9 , 0x82 , 0xc1 , 0xbb , 0x9e , 0x3f , 0x3f , 0xac , 0x2b ,
207+ 0xc3 , 0x69 , 0x48 , 0x8f , 0x76 , 0xb2 , 0x38 , 0x35 , 0x65 , 0xd3 , 0xff , 0xf9 ,
208+ 0x21 , 0xf9 , 0x66 , 0x4c , 0x97 , 0x63 , 0x7d , 0xa9 , 0x76 , 0x88 , 0x12 , 0xf6 ,
209+ 0x15 , 0xc6 , 0x8b , 0x13 , 0xb5 , 0x2e ,
210+ /* Authentication Tag */
211+ 0xc0 , 0x87 , 0x59 , 0x24 , 0xc1 , 0xc7 , 0x98 , 0x79 , 0x47 , 0xde , 0xaf , 0xd8 ,
212+ 0x78 , 0x0a , 0xcf , 0x49
213+ };
214+
215+ byte out [256 ];
216+ byte plain_out [256 ];
217+ word32 outLen = sizeof (plaintext ) + 16 ;
218+
219+ XMEMSET (out , 0 , sizeof (out ));
220+ XMEMSET (plain_out , 0 , sizeof (plain_out ));
221+
222+ /* Test Encrypt (One-shot) */
223+ ExpectIntEQ (wc_XChaCha20Poly1305_Encrypt (out , sizeof (out ), plaintext ,
224+ sizeof (plaintext ), aad , sizeof (aad ), nonce , sizeof (nonce ),
225+ key , sizeof (key )), 0 );
226+ ExpectIntEQ (XMEMCMP (out , expected , outLen ), 0 );
227+
228+ /* Test Decrypt (One-shot) */
229+ ExpectIntEQ (wc_XChaCha20Poly1305_Decrypt (plain_out , sizeof (plain_out ), out ,
230+ outLen , aad , sizeof (aad ), nonce , sizeof (nonce ),
231+ key , sizeof (key )), 0 );
232+ ExpectIntEQ (XMEMCMP (plain_out , plaintext , sizeof (plaintext )), 0 );
233+
234+ /* Test Encrypt bad args. */
235+ ExpectIntEQ (wc_XChaCha20Poly1305_Encrypt (NULL , sizeof (out ), plaintext ,
236+ sizeof (plaintext ), aad , sizeof (aad ), nonce , sizeof (nonce ),
237+ key , sizeof (key )), WC_NO_ERR_TRACE (BAD_FUNC_ARG ));
238+ ExpectIntEQ (wc_XChaCha20Poly1305_Encrypt (out , sizeof (out ), NULL ,
239+ sizeof (plaintext ), aad , sizeof (aad ), nonce , sizeof (nonce ),
240+ key , sizeof (key )), WC_NO_ERR_TRACE (BAD_FUNC_ARG ));
241+ ExpectIntEQ (wc_XChaCha20Poly1305_Encrypt (out , sizeof (out ), plaintext ,
242+ sizeof (plaintext ), NULL , sizeof (aad ), nonce , sizeof (nonce ),
243+ key , sizeof (key )), WC_NO_ERR_TRACE (BAD_FUNC_ARG ));
244+ ExpectIntEQ (wc_XChaCha20Poly1305_Encrypt (out , sizeof (out ), plaintext ,
245+ sizeof (plaintext ), aad , sizeof (aad ), NULL , sizeof (nonce ),
246+ key , sizeof (key )), WC_NO_ERR_TRACE (BAD_FUNC_ARG ));
247+ ExpectIntEQ (wc_XChaCha20Poly1305_Encrypt (out , sizeof (out ), plaintext ,
248+ sizeof (plaintext ), aad , sizeof (aad ), nonce , sizeof (nonce ),
249+ NULL , sizeof (key )), WC_NO_ERR_TRACE (BAD_FUNC_ARG ));
250+ /* Wrong nonce size (12 instead of 24) */
251+ ExpectIntEQ (wc_XChaCha20Poly1305_Encrypt (out , sizeof (out ), plaintext ,
252+ sizeof (plaintext ), aad , sizeof (aad ), nonce , 12 ,
253+ key , sizeof (key )), WC_NO_ERR_TRACE (BAD_FUNC_ARG ));
254+ /* Wrong key size */
255+ ExpectIntEQ (wc_XChaCha20Poly1305_Encrypt (out , sizeof (out ), plaintext ,
256+ sizeof (plaintext ), aad , sizeof (aad ), nonce , sizeof (nonce ),
257+ key , 16 ), WC_NO_ERR_TRACE (BAD_FUNC_ARG ));
258+
259+ /* Test Decrypt bad args. */
260+ ExpectIntEQ (wc_XChaCha20Poly1305_Decrypt (NULL , sizeof (plain_out ), out ,
261+ outLen , aad , sizeof (aad ), nonce , sizeof (nonce ),
262+ key , sizeof (key )), WC_NO_ERR_TRACE (BAD_FUNC_ARG ));
263+ ExpectIntEQ (wc_XChaCha20Poly1305_Decrypt (plain_out , sizeof (plain_out ), NULL ,
264+ outLen , aad , sizeof (aad ), nonce , sizeof (nonce ),
265+ key , sizeof (key )), WC_NO_ERR_TRACE (BAD_FUNC_ARG ));
266+ ExpectIntEQ (wc_XChaCha20Poly1305_Decrypt (plain_out , sizeof (plain_out ), out ,
267+ outLen , NULL , sizeof (aad ), nonce , sizeof (nonce ),
268+ key , sizeof (key )), WC_NO_ERR_TRACE (BAD_FUNC_ARG ));
269+ ExpectIntEQ (wc_XChaCha20Poly1305_Decrypt (plain_out , sizeof (plain_out ), out ,
270+ outLen , aad , sizeof (aad ), NULL , sizeof (nonce ),
271+ key , sizeof (key )), WC_NO_ERR_TRACE (BAD_FUNC_ARG ));
272+ ExpectIntEQ (wc_XChaCha20Poly1305_Decrypt (plain_out , sizeof (plain_out ), out ,
273+ outLen , aad , sizeof (aad ), nonce , sizeof (nonce ),
274+ NULL , sizeof (key )), WC_NO_ERR_TRACE (BAD_FUNC_ARG ));
275+ /* Wrong nonce size (12 instead of 24) */
276+ ExpectIntEQ (wc_XChaCha20Poly1305_Decrypt (plain_out , sizeof (plain_out ), out ,
277+ outLen , aad , sizeof (aad ), nonce , 12 ,
278+ key , sizeof (key )), WC_NO_ERR_TRACE (BAD_FUNC_ARG ));
279+ /* Wrong key size */
280+ ExpectIntEQ (wc_XChaCha20Poly1305_Decrypt (plain_out , sizeof (plain_out ), out ,
281+ outLen , aad , sizeof (aad ), nonce , sizeof (nonce ),
282+ key , 16 ), WC_NO_ERR_TRACE (BAD_FUNC_ARG ));
283+ #endif
284+ return EXPECT_RESULT ();
285+ } /* END test_wc_XChaCha20Poly1305_aead */
0 commit comments