Directory,Tests: remove janky pem reader

This commit removes janky pem reader code in favour of Bouncycastle's PemReader.
nblockchain · Apr 25, 2023 · fdc84a1 · fdc84a1
1 parent 128b6a3
commit fdc84a1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 40 deletions.
diff --git a/NOnion/Directory/HiddenServiceDescriptorDocument.fs b/NOnion/Directory/HiddenServiceDescriptorDocument.fs
@@ -32,10 +32,10 @@ type IntroductionPointEntry =
                 let words = lines.Peek().Split ' ' |> MutableQueue<string>
 
                 let rec readBlock(state: string) =
-                    let line = lines.Dequeue()
+                    let line = sprintf "%s\n" (lines.Dequeue())
 
                     if line.StartsWith "-----END" then
-                        state
+                        state + line
                     else
                         readBlock(state + line)
 
@@ -73,28 +73,23 @@ type IntroductionPointEntry =
                         }
                 | "auth-key" ->
                     lines.Dequeue() |> ignore<string>
-                    //get rid of begin
-                    lines.Dequeue() |> ignore<string>
 
                     innerParse
                         { state with
                             AuthKey =
                                 readBlock String.Empty
-                                |> Convert.FromBase64String
+                                |> PemUtility.PemToByteArray
                                 |> Certificate.FromBytes
                                 |> Some
                         }
                 | "enc-key-cert" ->
                     lines.Dequeue() |> ignore<string>
-                    //get rid of begin
-                    lines.Dequeue() |> ignore<string>
-
 
                     innerParse
                         { state with
                             EncKeyCert =
                                 readBlock String.Empty
-                                |> Convert.FromBase64String
+                                |> PemUtility.PemToByteArray
                                 |> Certificate.FromBytes
                                 |> Some
                         }
@@ -211,7 +206,7 @@ type HiddenServiceDescriptorDocument =
         let lines = stringToParse.Split '\n' |> MutableQueue<string>
 
         let rec readBlock(state: string) =
-            let line = lines.Dequeue()
+            let line = sprintf "%s\n" (lines.Dequeue())
 
             if line.StartsWith "-----END" then
                 state + line

diff --git a/NOnion/Directory/HiddenServiceFirstLayerDescriptorDocument.fs b/NOnion/Directory/HiddenServiceFirstLayerDescriptorDocument.fs
@@ -72,7 +72,7 @@ type HiddenServiceFirstLayerDescriptorDocument =
         let lines = stringToParse.Split '\n' |> MutableQueue<string>
 
         let rec readBlock(state: string) =
-            let line = lines.Dequeue()
+            let line = sprintf "%s\n" (lines.Dequeue())
 
             if line.StartsWith "-----END" then
                 state + line
@@ -153,16 +153,8 @@ type HiddenServiceFirstLayerDescriptorDocument =
 
                     { state with
                         HiddenServiceFirstLayerDescriptorDocument.SigningKeyCert =
-                            (readBlock String.Empty)
-                                .Replace(
-                                    "-----BEGIN ED25519 CERT-----",
-                                    String.Empty
-                                )
-                                .Replace(
-                                    "-----END ED25519 CERT-----",
-                                    String.Empty
-                                )
-                            |> Convert.FromBase64String
+                            readBlock String.Empty
+                            |> PemUtility.PemToByteArray
                             |> Certificate.FromBytes
                             |> Some
                     }
@@ -176,17 +168,10 @@ type HiddenServiceFirstLayerDescriptorDocument =
                 | "superencrypted" ->
                     lines.Dequeue() |> ignore<string>
 
-                    let payloadString = readBlock String.Empty
-
                     { state with
                         HiddenServiceFirstLayerDescriptorDocument.EncryptedPayload =
-                            payloadString
-                                .Replace(
-                                    "-----BEGIN MESSAGE-----",
-                                    String.Empty
-                                )
-                                .Replace("-----END MESSAGE-----", String.Empty)
-                            |> Convert.FromBase64String
+                            readBlock String.Empty
+                            |> PemUtility.PemToByteArray
                             |> Some
                     }
                 | _ ->

diff --git a/NOnion/Directory/HiddenServiceSecondLayerDescriptorDocument.fs b/NOnion/Directory/HiddenServiceSecondLayerDescriptorDocument.fs
@@ -24,7 +24,7 @@ type HiddenServiceSecondLayerDescriptorDocument =
         let lines = stringToParse.Split '\n' |> MutableQueue<string>
 
         let rec readBlock(state: string) =
-            let line = lines.Dequeue()
+            let line = sprintf "%s\n" (lines.Dequeue())
 
             if line.StartsWith "-----END" then
                 state + line
@@ -40,17 +40,10 @@ type HiddenServiceSecondLayerDescriptorDocument =
                 | "encrypted" ->
                     lines.Dequeue() |> ignore<string>
 
-                    let payloadString = readBlock String.Empty
-
                     { state with
                         HiddenServiceSecondLayerDescriptorDocument.EncryptedPayload =
-                            payloadString
-                                .Replace(
-                                    "-----BEGIN MESSAGE-----",
-                                    String.Empty
-                                )
-                                .Replace("-----END MESSAGE-----", String.Empty)
-                            |> Convert.FromBase64String
+                            readBlock String.Empty
+                            |> PemUtility.PemToByteArray
                             |> Some
                     }
                 | _ ->