From 60530aac02244b703b89943ff6585c17ef45b502 Mon Sep 17 00:00:00 2001
From: anlicheng <anlicheng@xywy.com>
Date: Wed, 14 Jun 2023 17:46:38 +0800
Subject: [PATCH] fix

---
 apps/iot/src/iot_cipher_rsa.erl     | 11 +----
 apps/iot/src/mocker/host_mocker.erl | 62 ++++++++++++++---------------
 2 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/apps/iot/src/iot_cipher_rsa.erl b/apps/iot/src/iot_cipher_rsa.erl
index dc99ab3..255e66b 100644
--- a/apps/iot/src/iot_cipher_rsa.erl
+++ b/apps/iot/src/iot_cipher_rsa.erl
@@ -24,13 +24,6 @@ encode(Data, PublicKey) when is_map(Data), is_binary(PublicKey) ->
     encode(BinData, PublicKey);
 
 encode(Data, PublicKey) when is_binary(Data), is_binary(PublicKey) ->
-    PubBin = format_public_key(PublicKey),
-    [Pub] = public_key:pem_decode(PubBin),
+    [Pub] = public_key:pem_decode(PublicKey),
     PubKey = public_key:pem_entry_decode(Pub),
-    public_key:encrypt_public(Data, PubKey).
-
-%% 格式化pubic_key
-format_public_key(PubKey = <<"-----BEGIN PUBLIC KEY-----\n", _/binary>>) ->
-    PubKey;
-format_public_key(PubKey) ->
-    <<"-----BEGIN PUBLIC KEY-----\n", PubKey/binary, "-----END PUBLIC KEY-----">>.
\ No newline at end of file
+    public_key:encrypt_public(Data, PubKey).
\ No newline at end of file
diff --git a/apps/iot/src/mocker/host_mocker.erl b/apps/iot/src/mocker/host_mocker.erl
index b0fe5ff..ea072e6 100644
--- a/apps/iot/src/mocker/host_mocker.erl
+++ b/apps/iot/src/mocker/host_mocker.erl
@@ -25,39 +25,39 @@
     conn_pid,
     topic :: binary(),
     pub_key = <<"-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAyo1pv/2PUbZ2vr7VMzG81X7kfXV1BaLeoSMkVRyuY72Txdof715P
-o/LH2iEXW51lEgHGU7NTm+aowfyEUWyNIxs8DfQP0AAD/lH9WZGf35vr0gKLfGlI
-ks8Eb1Nu/gS1Arx/ndBkp2mLr1po7T+TBxfHO4hpKYPlBTD4rjRsJRcKCTq4gApB
-rD/+I+ry617d8NP5pBg7xBXWED9BQncccYDPNe/+RVM9D0EuvGO8YafihcO7qbPn
-j7spdi9xiaVmpe0B4u7QpD2Bai8k5ceJ7W6ib7cPdkaEw7W74re6OdQ91wbSjM1U
-LkT3vS+bKJgkP54TPaKHpF8QrB51u6GY/QIDAQAB
+MIIBCgKCAQEAp5Ky0wCtWb5sq7s4wq8K+BNAINtwYDCnwdJWrPX1/ueubu+VwLf4
+EyNyghHCGrwntDbCPXmM8DYI99Mxfy2r8aaMgjwXdAzGpPkrzE6iGjLQmUHbSGBg
+ZGVe3RgFhhIZC1c85VBtXqh9nrmgw9FuYlex0w9p1vODIw3IhmJDFAgP45reTO0l
+yggZpfABi++R7HpF8uuQzc5GnFDGM3pESbGK6o7E5CYy5f+pKNAahJEfUf0onFsp
+kneCGh/vBldcmFsXYQ3biAHmF8UPHf8NALU+FRnJx1dfkGTu7UudYvEUIfPO2cqW
+2rvQ9BYPInerFw304hR2EyM1NJRa4idHtQIDAQAB
 -----END RSA PUBLIC KEY-----">>,
     pri_key = <<"-----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----">>,
 
     aes = <<>>