external/java_websocket/patches/0001-cid-1545227-Dm-Dubious-method-used.patch

   1 From 695aacc67345bf1f9d311972f864751c135d4047 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
   3 Date: Sun, 1 Oct 2023 19:42:26 +0100
   4 Subject: [PATCH] cid#1545227 Dm: Dubious method used
   5
   6 and
   7
   8 cid#1545310 Dm: Dubious method used
   9 cid#1545513 Dm: Dubious method used
  10 ---
  11  src/main/java/org/java_websocket/drafts/Draft_6455.java | 7 ++++---
  12  1 file changed, 4 insertions(+), 3 deletions(-)
  13
  14 diff --git a/src/main/java/org/java_websocket/drafts/Draft_6455.java b/src/main/java/org/java_websocket/drafts/Draft_6455.java
  15 index f9f960d..1e08448 100644
  16 --- a/src/main/java/org/java_websocket/drafts/Draft_6455.java
  17 +++ b/src/main/java/org/java_websocket/drafts/Draft_6455.java
  18 @@ -26,6 +26,7 @@
  19  package org.java_websocket.drafts;
  20
  21  import java.math.BigInteger;
  22 +import java.nio.charset.StandardCharsets;
  23  import java.nio.ByteBuffer;
  24  import java.security.MessageDigest;
  25  import java.security.NoSuchAlgorithmException;
  26 @@ -470,7 +471,7 @@
  27      if (log.isLoggable(Level.FINE)) {
  28        log.fine("afterEnconding({}): {}" + " : " + framedata.getPayloadData().remaining() + " : " +
  29            (framedata.getPayloadData().remaining() > 1000 ? "too big to display"
  30 -              : new String(framedata.getPayloadData().array())));
  31 +              : new String(framedata.getPayloadData().array(), StandardCharsets.US_ASCII)));
  32      }
  33      return createByteBufferFromFramedata(framedata);
  34    }
  35 @@ -590,7 +591,7 @@
  36      if (log.isLoggable(Level.FINE)) {
  37        log.fine("afterDecoding({}): {}" + " : " + frame.getPayloadData().remaining() + " : " +
  38            (frame.getPayloadData().remaining() > 1000 ? "too big to display"
  39 -              : new String(frame.getPayloadData().array())));
  40 +              : new String(frame.getPayloadData().array(), StandardCharsets.US_ASCII)));
  41      }
  42      frame.isValid();
  43      return frame;
  44 @@ -838,7 +839,7 @@
  45      } catch (NoSuchAlgorithmException e) {
  46        throw new IllegalStateException(e);
  47      }
  48 -    return Base64.encodeBytes(sh1.digest(acc.getBytes()));
  49 +    return Base64.encodeBytes(sh1.digest(acc.getBytes(StandardCharsets.US_ASCII)));
  50    }
  51
  52    private byte[] toByteArray(long val, int bytecount) {
  53 --
  54 2.41.0
  55