Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
89c614d0
Commit
89c614d0
authored
Feb 19, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ECDH curve
parent
e878307c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
13 deletions
+17
-13
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/cryptor/ECDHAndroid.kt
...dMain/kotlin/net/mamoe/mirai/utils/cryptor/ECDHAndroid.kt
+5
-1
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/cryptor/ECDHJvm.kt
...c/jvmMain/kotlin/net/mamoe/mirai/utils/cryptor/ECDHJvm.kt
+12
-12
No files found.
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/cryptor/ECDHAndroid.kt
View file @
89c614d0
...
@@ -12,6 +12,7 @@ package net.mamoe.mirai.utils.cryptor
...
@@ -12,6 +12,7 @@ package net.mamoe.mirai.utils.cryptor
import
android.annotation.SuppressLint
import
android.annotation.SuppressLint
import
net.mamoe.mirai.utils.md5
import
net.mamoe.mirai.utils.md5
import
java.security.*
import
java.security.*
import
java.security.spec.ECGenParameterSpec
import
java.security.spec.X509EncodedKeySpec
import
java.security.spec.X509EncodedKeySpec
import
javax.crypto.KeyAgreement
import
javax.crypto.KeyAgreement
...
@@ -60,11 +61,14 @@ actual class ECDH actual constructor(actual val keyPair: ECDHKeyPair) {
...
@@ -60,11 +61,14 @@ actual class ECDH actual constructor(actual val keyPair: ECDHKeyPair) {
_isECDHAvailable
=
false
_isECDHAvailable
=
false
}
}
actual
fun
generateKeyPair
():
ECDHKeyPair
{
actual
fun
generateKeyPair
():
ECDHKeyPair
{
if
(!
isECDHAvailable
)
{
if
(!
isECDHAvailable
)
{
return
ECDHKeyPair
.
DefaultStub
return
ECDHKeyPair
.
DefaultStub
}
}
return
ECDHKeyPairImpl
(
KeyPairGenerator
.
getInstance
(
"ECDH"
).
genKeyPair
())
return
ECDHKeyPairImpl
(
KeyPairGenerator
.
getInstance
(
"ECDH"
)
.
also
{
it
.
initialize
(
ECGenParameterSpec
(
"secp192k1"
))
}
.
genKeyPair
())
}
}
actual
fun
calculateShareKey
(
actual
fun
calculateShareKey
(
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/cryptor/ECDHJvm.kt
View file @
89c614d0
...
@@ -12,6 +12,7 @@ package net.mamoe.mirai.utils.cryptor
...
@@ -12,6 +12,7 @@ package net.mamoe.mirai.utils.cryptor
import
net.mamoe.mirai.utils.md5
import
net.mamoe.mirai.utils.md5
import
org.bouncycastle.jce.provider.BouncyCastleProvider
import
org.bouncycastle.jce.provider.BouncyCastleProvider
import
java.security.*
import
java.security.*
import
java.security.spec.ECGenParameterSpec
import
java.security.spec.X509EncodedKeySpec
import
java.security.spec.X509EncodedKeySpec
import
javax.crypto.KeyAgreement
import
javax.crypto.KeyAgreement
...
@@ -34,24 +35,23 @@ actual fun ECDH() = ECDH(ECDH.generateKeyPair())
...
@@ -34,24 +35,23 @@ actual fun ECDH() = ECDH(ECDH.generateKeyPair())
actual
class
ECDH
actual
constructor
(
actual
val
keyPair
:
ECDHKeyPair
)
{
actual
class
ECDH
actual
constructor
(
actual
val
keyPair
:
ECDHKeyPair
)
{
actual
companion
object
{
actual
companion
object
{
@Suppress
(
"ObjectPropertyName"
)
@Suppress
(
"ObjectPropertyName"
)
private
val
_isECDHAvailable
:
Boolean
private
val
_isECDHAvailable
:
Boolean
=
kotlin
.
runCatching
{
actual
val
isECDHAvailable
:
Boolean
get
()
=
_isECDHAvailable
if
(
Security
.
getProvider
(
BouncyCastleProvider
.
PROVIDER_NAME
)
!=
null
)
{
Security
.
removeProvider
(
BouncyCastleProvider
.
PROVIDER_NAME
)
}
Security
.
addProvider
(
BouncyCastleProvider
())
generateKeyPair
()
// try if it is working
}.
isSuccess
init
{
actual
val
isECDHAvailable
:
Boolean
get
()
=
_isECDHAvailable
_isECDHAvailable
=
kotlin
.
runCatching
{
if
(
Security
.
getProvider
(
"BouncyCastle"
)
!=
null
)
{
Security
.
removeProvider
(
"BouncyCastle"
)
}
Security
.
addProvider
(
BouncyCastleProvider
())
generateKeyPair
()
// try if it is working
}.
isSuccess
}
actual
fun
generateKeyPair
():
ECDHKeyPair
{
actual
fun
generateKeyPair
():
ECDHKeyPair
{
if
(!
isECDHAvailable
)
{
if
(!
isECDHAvailable
)
{
return
ECDHKeyPair
.
DefaultStub
return
ECDHKeyPair
.
DefaultStub
}
}
return
ECDHKeyPairImpl
(
KeyPairGenerator
.
getInstance
(
"ECDH"
).
genKeyPair
())
return
ECDHKeyPairImpl
(
KeyPairGenerator
.
getInstance
(
"ECDH"
)
.
also
{
it
.
initialize
(
ECGenParameterSpec
(
"secp192k1"
))
}
.
genKeyPair
())
}
}
actual
fun
calculateShareKey
(
actual
fun
calculateShareKey
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment