From 43f8a6d1824780a1d99dc642a6dac2153d958b21 Mon Sep 17 00:00:00 2001 From: Csaba Kiraly Date: Thu, 15 Jun 2023 11:47:48 +0200 Subject: [PATCH] Revert "encoding: introducing the "nop" cipher" This reverts commit 50dd3cd7b3ad1a4264a96dafa85eb4eb2ecca0dc. --- .../private/eth/p2p/discoveryv5/encoding.nim | 3 +- libp2pdht/private/eth/p2p/discoveryv5/nop.nim | 74 ------------------- 2 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 libp2pdht/private/eth/p2p/discoveryv5/nop.nim diff --git a/libp2pdht/private/eth/p2p/discoveryv5/encoding.nim b/libp2pdht/private/eth/p2p/discoveryv5/encoding.nim index df12406..5bdf475 100644 --- a/libp2pdht/private/eth/p2p/discoveryv5/encoding.nim +++ b/libp2pdht/private/eth/p2p/discoveryv5/encoding.nim @@ -24,7 +24,6 @@ import libp2p/signed_envelope, metrics, nimcrypto, - nop, "."/[messages, messages_encoding, node, spr, hkdf, sessions], "."/crypto @@ -41,7 +40,7 @@ logScope: topics = "discv5" type - cipher = nop128 + cipher = aes128 const version: uint16 = 1 diff --git a/libp2pdht/private/eth/p2p/discoveryv5/nop.nim b/libp2pdht/private/eth/p2p/discoveryv5/nop.nim deleted file mode 100644 index 1c8394d..0000000 --- a/libp2pdht/private/eth/p2p/discoveryv5/nop.nim +++ /dev/null @@ -1,74 +0,0 @@ -# -# -# NimCrypto -# (c) Copyright 2023 Status -# -# See the file "LICENSE", included in this -# distribution, for details about the copyright. -# - -## This module implements a no-op(NOP) crypto that des nothing, -## Do not use for anything else than testing. - -{.deadCodeElim:on.} - -when sizeof(int) == 4: - type - NopContext[bits: static[uint]] = object - skey: array[120, uint32] - nr: int -elif sizeof(int) == 8: - type - NopContext[bits: static[uint]] = object - skey: array[120, uint64] - nr: int - -type - nop128* = NopContext[128] - nop192* = NopContext[192] - nop256* = NopContext[256] - nop* = nop128 | nop192 | nop256 - -proc encrypt*(ctx: NopContext, input: openarray[byte], - output: var openarray[byte]) = - for i, v in input: - output[i] = v - -proc decrypt*(ctx: NopContext, input: openarray[byte], - output: var openarray[byte]) = - for i, v in input: - output[i] = v - -template sizeKey*(ctx: NopContext): int = - (ctx.bits div 8) - -template sizeBlock*(ctx: NopContext): int = - (16) - -template sizeKey*(r: typedesc[nop]): int = - when r is nop128: - (16) - elif r is nop192: - (24) - elif r is nop256: - (32) - -template sizeBlock*(r: typedesc[nop]): int = - (16) - -proc init*(ctx: var NopContext, key: openarray[byte]) {.inline.} = - discard - -proc init*(ctx: var NopContext, key: ptr byte, nkey: int = 0) {.inline.} = - discard - -proc clear*(ctx: var NopContext) {.inline.} = - discard - -proc encrypt*(ctx: var NopContext, inbytes: ptr byte, - outbytes: ptr byte) {.inline.} = - outbytes = inbytes - -proc decrypt*(ctx: var NopContext, inbytes: ptr byte, - outbytes: ptr byte) {.inline.} = - outbytes = inbytes