X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/blobdiff_plain/848ba392a415557f73bbca53e2dc350348f96849..dafb2da44bb35c7057744ca820833cde6d43c534:/pubkey.c

diff --git a/pubkey.c b/pubkey.c
index 50fa78c..391db31 100644
--- a/pubkey.c
+++ b/pubkey.c
@@ -1136,6 +1136,57 @@ end:
   return (0);
 }
 
+/*----- Ed25519 -----------------------------------------------------------*/
+
+static PyObject *meth_ed25519_pubkey(PyObject *me, PyObject *arg)
+{
+  const char *k;
+  Py_ssize_t ksz;
+  PyObject *rc = 0;
+  if (!PyArg_ParseTuple(arg, "s#:ed25519_pubkey", &k, &ksz)) goto end;
+  rc = bytestring_pywrap(0, ED25519_PUBSZ);
+  ed25519_pubkey((octet *)PyString_AS_STRING(rc), k, ksz);
+  return (rc);
+end:
+  return (0);
+}
+
+static PyObject *meth_ed25519_sign(PyObject *me, PyObject *arg, PyObject *kw)
+{
+  const char *k, *p = 0, *m;
+  Py_ssize_t ksz, psz, msz;
+  PyObject *rc = 0;
+  octet pp[ED25519_PUBSZ];
+  char *kwlist[] = { "key", "msg", "pub", 0 };
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#s#|s#:ed25519_sign", kwlist,
+				   &k, &ksz, &m, &msz, &p, &psz))
+    goto end;
+  if (p && psz != ED25519_PUBSZ) VALERR("bad public length");
+  if (!p) { p = (const char *)pp; ed25519_pubkey(pp, k, ksz); }
+  rc = bytestring_pywrap(0, ED25519_SIGSZ);
+  ed25519_sign((octet *)PyString_AS_STRING(rc), k, ksz,
+	       (const octet *)p, m, msz);
+  return (rc);
+end:
+  return (0);
+}
+
+static PyObject *meth_ed25519_verify(PyObject *me, PyObject *arg)
+{
+  const char *p, *m, *s;
+  Py_ssize_t psz, msz, ssz;
+  PyObject *rc = 0;
+  if (!PyArg_ParseTuple(arg, "s#s#s#:ed25519_verify",
+			&p, &psz, &m, &msz, &s, &ssz))
+    goto end;
+  if (psz != ED25519_PUBSZ) VALERR("bad public length");
+  if (ssz != ED25519_SIGSZ) VALERR("bad signature length");
+  rc = getbool(!ed25519_verify((const octet *)p, m, msz, (const octet *)s));
+  return (rc);
+end:
+  return (0);
+}
+
 /*----- Global stuff ------------------------------------------------------*/
 
 static PyMethodDef methods[] = {
@@ -1152,6 +1203,12 @@ static PyMethodDef methods[] = {
 generate(NBITS, [event = pgen_nullev, rng = rand, nsteps = 0]) -> R")
   METH  (x25519,			"\
 x25519(KEY, PUBLIC) -> SHARED")
+  METH  (ed25519_pubkey,		"\
+ed25519_pubkey(KEY) -> PUBLIC")
+  KWMETH(ed25519_sign,			"\
+ed25519_sign(KEY, MSG, [PUBLIC]) -> SIG")
+  METH  (ed25519_verify,		"\
+ed25519_verify(PUBLIC, MSG, SIG) -> BOOL")
 #undef METHNAME
   { 0 }
 };