From 013682166c9d907abc7abf10705307564b77c5be Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Fri, 29 May 2020 23:53:56 +0200 Subject: [PATCH] Wrong module --- .../kotlin/com/ionspin/kotlin/crypto/SRNG.kt | 87 ++++++++++--------- .../kotlin/com/ionspin/kotlin/crypto/SRNG.kt | 87 +++++++++---------- 2 files changed, 87 insertions(+), 87 deletions(-) diff --git a/multiplatform-crypto-delegated/src/mingwX64Main/kotlin/com/ionspin/kotlin/crypto/SRNG.kt b/multiplatform-crypto-delegated/src/mingwX64Main/kotlin/com/ionspin/kotlin/crypto/SRNG.kt index c9172fd..1a83ce8 100644 --- a/multiplatform-crypto-delegated/src/mingwX64Main/kotlin/com/ionspin/kotlin/crypto/SRNG.kt +++ b/multiplatform-crypto-delegated/src/mingwX64Main/kotlin/com/ionspin/kotlin/crypto/SRNG.kt @@ -1,43 +1,44 @@ -/* - * Copyright 2019 Ugljesa Jovanovic - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.ionspin.kotlin.crypto - -import kotlinx.cinterop.* -import platform.windows.* - -/** - * Created by Ugljesa Jovanovic - * ugljesa.jovanovic@ionspin.com - * on 21-Sep-2019 - */ -actual object SRNG { - private val advapi by lazy { LoadLibraryA("ADVAPI32.DLL")} - - private val advapiRandom by lazy { - GetProcAddress(advapi, "SystemFunction036")?.reinterpret, ULong, Int>>>() ?: error("Failed getting advapi random") - } - - @Suppress("EXPERIMENTAL_UNSIGNED_LITERALS") - actual fun getRandomBytes(amount: Int): UByteArray { - memScoped { - val randArray = allocArray(amount) - val pointer = randArray.getPointer(this) - val status = advapiRandom(pointer.reinterpret(), amount.convert()) - return UByteArray(amount) { pointer[it].toUByte() } - } - } -} \ No newline at end of file +//We'll handle SRNG through libsodium +///* +// * Copyright 2019 Ugljesa Jovanovic +// * +// * Licensed under the Apache License, Version 2.0 (the "License"); +// * you may not use this file except in compliance with the License. +// * You may obtain a copy of the License at +// * +// * http://www.apache.org/licenses/LICENSE-2.0 +// * +// * Unless required by applicable law or agreed to in writing, software +// * distributed under the License is distributed on an "AS IS" BASIS, +// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// * See the License for the specific language governing permissions and +// * limitations under the License. +// */ +// +//package com.ionspin.kotlin.crypto +// +//import kotlinx.cinterop.* +//import platform.windows.* +// +///** +// * Created by Ugljesa Jovanovic +// * ugljesa.jovanovic@ionspin.com +// * on 21-Sep-2019 +// */ +//actual object SRNG { +// private val advapi by lazy { LoadLibraryA("ADVAPI32.DLL")} +// +// private val advapiRandom by lazy { +// GetProcAddress(advapi, "SystemFunction036")?.reinterpret, ULong, Int>>>() ?: error("Failed getting advapi random") +// } +// +// @Suppress("EXPERIMENTAL_UNSIGNED_LITERALS") +// actual fun getRandomBytes(amount: Int): UByteArray { +// memScoped { +// val randArray = allocArray(amount) +// val pointer = randArray.getPointer(this) +// val status = advapiRandom(pointer.reinterpret(), amount.convert()) +// return UByteArray(amount) { pointer[it].toUByte() } +// } +// } +//} \ No newline at end of file diff --git a/multiplatform-crypto/src/mingwX64Main/kotlin/com/ionspin/kotlin/crypto/SRNG.kt b/multiplatform-crypto/src/mingwX64Main/kotlin/com/ionspin/kotlin/crypto/SRNG.kt index f00150e..c9172fd 100644 --- a/multiplatform-crypto/src/mingwX64Main/kotlin/com/ionspin/kotlin/crypto/SRNG.kt +++ b/multiplatform-crypto/src/mingwX64Main/kotlin/com/ionspin/kotlin/crypto/SRNG.kt @@ -1,44 +1,43 @@ -// We will rely on libsodium for randomness -///* -// * Copyright 2019 Ugljesa Jovanovic -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this file except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// */ -// -//package com.ionspin.kotlin.crypto -// -//import kotlinx.cinterop.* -//import platform.windows.* -// -///** -// * Created by Ugljesa Jovanovic -// * ugljesa.jovanovic@ionspin.com -// * on 21-Sep-2019 -// */ -//actual object SRNG { -// private val advapi by lazy { LoadLibraryA("ADVAPI32.DLL")} -// -// private val advapiRandom by lazy { -// GetProcAddress(advapi, "SystemFunction036")?.reinterpret, ULong, Int>>>() ?: error("Failed getting advapi random") -// } -// -// @Suppress("EXPERIMENTAL_UNSIGNED_LITERALS") -// actual fun getRandomBytes(amount: Int): UByteArray { -// memScoped { -// val randArray = allocArray(amount) -// val pointer = randArray.getPointer(this) -// val status = advapiRandom(pointer.reinterpret(), amount.convert()) -// return UByteArray(amount) { pointer[it].toUByte() } -// } -// } -//} \ No newline at end of file +/* + * Copyright 2019 Ugljesa Jovanovic + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.ionspin.kotlin.crypto + +import kotlinx.cinterop.* +import platform.windows.* + +/** + * Created by Ugljesa Jovanovic + * ugljesa.jovanovic@ionspin.com + * on 21-Sep-2019 + */ +actual object SRNG { + private val advapi by lazy { LoadLibraryA("ADVAPI32.DLL")} + + private val advapiRandom by lazy { + GetProcAddress(advapi, "SystemFunction036")?.reinterpret, ULong, Int>>>() ?: error("Failed getting advapi random") + } + + @Suppress("EXPERIMENTAL_UNSIGNED_LITERALS") + actual fun getRandomBytes(amount: Int): UByteArray { + memScoped { + val randArray = allocArray(amount) + val pointer = randArray.getPointer(this) + val status = advapiRandom(pointer.reinterpret(), amount.convert()) + return UByteArray(amount) { pointer[it].toUByte() } + } + } +} \ No newline at end of file