From: Konstantinos Margaritis Date: Fri, 17 Mar 2023 09:35:16 +0000 (+0000) Subject: Add xchacha_encrypt_bytes_svp64 wrapper function X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ebf5f7a61338fce96db159d89a1aba6c6e643330;p=openpower-isa.git Add xchacha_encrypt_bytes_svp64 wrapper function --- diff --git a/crypto/chacha20/src/xchacha20_wrapper.c b/crypto/chacha20/src/xchacha20_wrapper.c index 4fd7a4dd..6ed4f2be 100644 --- a/crypto/chacha20/src/xchacha20_wrapper.c +++ b/crypto/chacha20/src/xchacha20_wrapper.c @@ -8,9 +8,6 @@ void xchacha_hchacha20_svp64(uint8_t *out, const uint8_t *in, const uint8_t *k) { - uint8_t out2[32]; - xchacha_hchacha20(out2, in, k); - // These cannot be the same pointer as the original function, as it is really a separate CPU/RAM // we have to memcpy from input to this pointer, the address was chosen arbitrarily uint64_t inptr_svp64 = 0x100000; @@ -21,7 +18,7 @@ void xchacha_hchacha20_svp64(uint8_t *out, const uint8_t *in, const uint8_t *k) pypowersim_state_t *state = pypowersim_prepare(); // Change the relevant elements, mandatory: body - state->binary = PyBytes_FromStringAndSize((const char *)&xchacha_hchacha20_svp64_real, 1000); + state->binary = PyBytes_FromStringAndSize((const char *)&xchacha_hchacha20_svp64_real, 10000); // Set GPR #3 to the output pointer PyObject *out_address = PyLong_FromUnsignedLongLong(outptr_svp64); PyList_SetItem(state->initial_regs, 3, out_address); @@ -34,10 +31,6 @@ void xchacha_hchacha20_svp64(uint8_t *out, const uint8_t *in, const uint8_t *k) for (int i=0; i < 16; i += 8) { PyObject *svp64_address = PyLong_FromUnsignedLongLong(inptr_svp64 + i); uint64_t *inptr64 = (uint64_t *) in; -/* printf("in[%d] \t: %p -> %02x %02x %02x %02x %02x %02x %02x %02x\n", i, inptr64, in[i+0], in[i+1], in[i+2], in[i+3], - in[i+4], in[i+5], in[i+6], in[i+7]); - - printf("val \t: %016lx -> %016lx\n", *inptr64, inptr_svp64 + i);*/ PyObject *word = PyLong_FromUnsignedLongLong(*inptr64); PyDict_SetItem(state->initial_mem, svp64_address, word); in += 8; @@ -51,10 +44,6 @@ void xchacha_hchacha20_svp64(uint8_t *out, const uint8_t *in, const uint8_t *k) for (int i=0; i < 32; i += 8) { PyObject *svp64_address = PyLong_FromUnsignedLongLong(keyptr_svp64 + i); uint64_t *keyptr64 = (uint64_t *) k; -/* printf("k[%d] \t: %p -> %02x %02x %02x %02x %02x %02x %02x %02x\n", i, keyptr64, k[i+0], k[i+1], k[i+2], k[i+3], - k[i+4], k[i+5], k[i+6], k[i+7]); - - printf("val \t: %016lx -> %016lx\n", *keyptr64, keyptr_svp64 + i);*/ PyObject *word = PyLong_FromUnsignedLongLong(*keyptr64); PyDict_SetItem(state->initial_mem, svp64_address, word); k += 8; @@ -91,15 +80,122 @@ void xchacha_hchacha20_svp64(uint8_t *out, const uint8_t *in, const uint8_t *k) PyObject *pyval = PyDict_GetItem(mem, svp64_address); uint64_t val = PyLong_AsUnsignedLongLong(pyval); *outptr64 = val; - printf("out: %p -> %016lx\t val: %016lx -> %lx\n", outptr64, *outptr64, val, outptr_svp64 + i); outptr64++; } +} - for (int i=0; i < 32; i+= 8) { - printf("out[%d] : %02x %02x %02x %02x %02x %02x %02x %02x\n", i, out[i+0], out[i+1], out[i+2], out[i+3], - out[i+4], out[i+5], out[i+6], out[i+7]); - printf("out2[%d] : %02x %02x %02x %02x %02x %02x %02x %02x\n", i, out2[i+0], out2[i+1], out2[i+2], out2[i+3], - out2[i+4], out2[i+5], out2[i+6], out2[i+7]); +void xchacha_encrypt_bytes_svp64(XChaCha_ctx *ctx, const uint8_t *m, uint8_t *c, uint32_t bytes) { + uint8_t c2[1000]; + xchacha_encrypt_bytes(ctx, m, c2, bytes); + // These cannot be the same pointer as the original function, as it is really a separate CPU/RAM + // we have to memcpy from input to this pointer, the address was chosen arbitrarily + uint64_t ctxptr_svp64 = 0x100000; + uint64_t mptr_svp64 = 0x200000; + uint64_t cptr_svp64 = 0x300000; + + // Create the pypowersim_state + pypowersim_state_t *state = pypowersim_prepare(); + + // Change the relevant elements + state->binary = PyBytes_FromStringAndSize((const char *)&xchacha_encrypt_bytes_svp64_real, 10000); + + // Set GPR #3 to the output pointer + PyObject *ctxptr_address = PyLong_FromUnsignedLongLong(ctxptr_svp64); + PyList_SetItem(state->initial_regs, 3, ctxptr_address); + + // Load data into buffer from real memory + uint8_t *ctx_u8ptr = (uint8_t *) ctx; + for (size_t i=0; i < 64; i += 8) { + PyObject *svp64_address = PyLong_FromUnsignedLongLong(ctxptr_svp64); + uint64_t *ctxptr64 = (uint64_t *) ctx_u8ptr; + /*printf("ctx[%ld]\t: %p -> %02x %02x %02x %02x %02x %02x %02x %02x\n", i, ctxptr64, ctx_u8ptr[0], ctx_u8ptr[1], ctx_u8ptr[2], ctx_u8ptr[3], + ctx_u8ptr[4], ctx_u8ptr[5], ctx_u8ptr[6], ctx_u8ptr[7]); + printf("val\t: %016lx -> %016lx\n", *ctxptr64, ctxptr_svp64);*/ + PyObject *word = PyLong_FromUnsignedLongLong(*ctxptr64); + PyDict_SetItem(state->initial_mem, svp64_address, word); + ctx_u8ptr += 8; + ctxptr_svp64 += 8; } + + // Set GPR #4 to the input pointer + PyObject *mptr_address = PyLong_FromUnsignedLongLong(mptr_svp64); + PyList_SetItem(state->initial_regs, 4, mptr_address); + + uint32_t bytes_rem = bytes % 8; + bytes -= bytes_rem; + // Load data into buffer from real memory + for (size_t i=0; i < bytes; i += 8) { + PyObject *svp64_address = PyLong_FromUnsignedLongLong(mptr_svp64); + uint64_t *mptr64 = (uint64_t *) m; + /*printf("m[%ld] \t: %p -> %02x %02x %02x %02x %02x %02x %02x %02x\n", i, mptr64, m[0], m[1], m[2], m[3], + m[4], m[5], m[6], m[7]); + + printf("val \t: %016lx -> %016lx\n", *mptr64, mptr_svp64);*/ + PyObject *word = PyLong_FromUnsignedLongLong(*mptr64); + PyDict_SetItem(state->initial_mem, svp64_address, word); + m += 8; + mptr_svp64 += 8; + } + // Load remaining bytes + PyObject *svp64_address = PyLong_FromUnsignedLongLong(mptr_svp64); + uint64_t mptr64 = 0; + uint8_t *mptr8 = (uint8_t *) &mptr64; + for (size_t i=0; i < bytes_rem; i++) { + mptr8[i] = m[i]; + } + PyObject *word = PyLong_FromUnsignedLongLong(mptr64); + PyDict_SetItem(state->initial_mem, svp64_address, word); + + // Set GPR #5 to the cipher pointer + PyObject *cptr_address = PyLong_FromUnsignedLongLong(cptr_svp64); + PyList_SetItem(state->initial_regs, 5, cptr_address); + + // Set GPR #r65 to the cipher pointer + PyObject *bytes_svp64 = PyLong_FromUnsignedLongLong(bytes); + PyList_SetItem(state->initial_regs, 6, bytes_svp64); + + // Prepare the arguments object for the call + pypowersim_prepareargs(state); + + // Call the function and get the resulting object + state->result_obj = PyObject_CallObject(state->simulator, state->args); + if (!state->result_obj) { + PyErr_Print(); + printf("Error invoking 'run_a_simulation'\n"); + pypowersim_finalize(state); + exit(1); + } + + PyObject *memobj = PyObject_GetAttrString(state->result_obj, "mem"); + if (!memobj) { + PyErr_Print(); + Py_DECREF(state->result_obj); + printf("Error getting mem object\n"); + } + + PyObject *mem = PyObject_GetAttrString(memobj, "mem"); + if (!mem) { + PyErr_Print(); + Py_DECREF(state->result_obj); + printf("Error getting mem dict\n"); + } + + uint64_t *cptr64 = (uint64_t *) c; + for (size_t i=0; i < 32; i += 8) { + PyObject *svp64_address = PyLong_FromUnsignedLongLong((cptr_svp64 + i)/8); + PyObject *pyval = PyDict_GetItem(mem, svp64_address); + uint64_t val = PyLong_AsUnsignedLongLong(pyval); + *cptr64 = val; + printf("c: %p -> %016lx\t val: %016lx -> %lx\n", cptr64, *cptr64, val, cptr_svp64 + i); + cptr64++; + } + + for (size_t i=0; i < bytes; i+= 8) { + printf("c[%ld] : %02x %02x %02x %02x %02x %02x %02x %02x\n", i, c[i+0], c[i+1], c[i+2], c[i+3], + c[i+4], c[i+5], c[i+6], c[i+7]); + printf("c2[%ld] : %02x %02x %02x %02x %02x %02x %02x %02x\n", i, c2[i+0], c2[i+1], c2[i+2], c2[i+3], + c2[i+4], c2[i+5], c2[i+6], c2[i+7]); + } + } diff --git a/crypto/chacha20/src/xchacha20_wrapper.h b/crypto/chacha20/src/xchacha20_wrapper.h index 717aaaf6..03426be6 100644 --- a/crypto/chacha20/src/xchacha20_wrapper.h +++ b/crypto/chacha20/src/xchacha20_wrapper.h @@ -1,4 +1,9 @@ #include +#include "xchacha20.h" + void xchacha_hchacha20_svp64_real(uint8_t *out, const uint8_t *in, const uint8_t *k); void xchacha_hchacha20_svp64(uint8_t *out, const uint8_t *in, const uint8_t *k); + +void xchacha_encrypt_bytes_svp64_real(XChaCha_ctx *ctx, const uint8_t *m, uint8_t *c, uint32_t bytes); +void xchacha_encrypt_bytes_svp64(XChaCha_ctx *ctx, const uint8_t *m, uint8_t *c, uint32_t bytes);