catacomb/__init__.py (KeySZRange.pad): Return correct value.

[catacomb-python] / algorithms.c

diff --git a/algorithms.c b/algorithms.c
index 1615c12bcb87edf2d622fe291dcae293a938ca1c..064fb03dabb2c0faf3f6edb4dead5e55e8d77958 100644 (file)
--- a/algorithms.c
+++ b/algorithms.c
@@ -1131,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;
   }


@@ -1302,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);
   }