t/t-algorithms.py: Add tests for other HSalsa20 and HChaCha key sizes.

[catacomb-python] / algorithms.c

diff --git a/algorithms.c b/algorithms.c
index 37d52cd49d88dafad281bbb87e059f27799c6603..064fb03dabb2c0faf3f6edb4dead5e55e8d77958 100644 (file)
--- a/algorithms.c
+++ b/algorithms.c
@@ -987,6 +987,7 @@ static PyObject *gaeameth_copy(PyObject *me, PyObject *arg)
     VALERR("can't duplicate nonce-dependent aad");
   rc = gaeadaad_pywrap((PyObject *)me->ob_type,
                       GAEAD_DUP(GAEADAAD_A(me)), 0, 0);
     VALERR("can't duplicate nonce-dependent aad");
   rc = gaeadaad_pywrap((PyObject *)me->ob_type,
                       GAEAD_DUP(GAEADAAD_A(me)), 0, 0);

+  GAEADAAD_HLEN(rc) = GAEADAAD_HLEN(me);

 end:
   return (rc);
 }
 end:
   return (rc);
 }


@@ -1130,7 +1131,8 @@ static PyObject *gaeemeth_aad(PyObject *me, PyObject *arg)
     if (!ge->aad)
       ge->aad = (gaeadaad_pyobj *)
        gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(ge->ob_type)->aad,
     if (!ge->aad)
       ge->aad = (gaeadaad_pyobj *)
        gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(ge->ob_type)->aad,

-                       GAEAD_AAD(ge->e), ge->f&AEADF_PCHSZ, ge->hsz);
+                       GAEAD_AAD(ge->e), ge->f&(AEADF_PCHSZ | AEADF_NOAAD),
+                       ge->hsz);

     Py_INCREF(ge->aad);
     rc = (PyObject *)ge->aad;
   }
     Py_INCREF(ge->aad);
     rc = (PyObject *)ge->aad;
   }


@@ -1301,7 +1303,8 @@ static PyObject *gaedmeth_aad(PyObject *me, PyObject *arg)
     if (!gd->aad)
       gd->aad = (gaeadaad_pyobj *)
        gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(gd->ob_type)->aad,
     if (!gd->aad)
       gd->aad = (gaeadaad_pyobj *)
        gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(gd->ob_type)->aad,

-                       GAEAD_AAD(gd->d), gd->f&AEADF_PCHSZ, gd->hsz);
+                       GAEAD_AAD(gd->d), gd->f&(AEADF_PCHSZ | AEADF_NOAAD),
+                       gd->hsz);

     Py_INCREF(gd->aad);
     return ((PyObject *)gd->aad);
   }
     Py_INCREF(gd->aad);
     return ((PyObject *)gd->aad);
   }