A few more fixes to specify charset

Author: andylintner

src/main/java/com/beowulfe/hap/impl/pairing/FinalPairHandler.java

@@ -75,17 +75,17 @@ private HttpResponse createResponse() throws Exception {
 
 		EdsaSigner signer = new EdsaSigner(authInfo.getPrivateKey());
 
-		byte[] material = ByteUtils.joinBytes(okm, authInfo.getMac().getBytes(), signer.getPublicKey());
+		byte[] material = ByteUtils.joinBytes(okm, authInfo.getMac().getBytes(StandardCharsets.UTF_8), signer.getPublicKey());
 
 		byte[] proof = signer.sign(material);
 
 		Encoder encoder = TypeLengthValueUtils.getEncoder();
-		encoder.add(MessageType.USERNAME, authInfo.getMac().getBytes());
+		encoder.add(MessageType.USERNAME, authInfo.getMac().getBytes(StandardCharsets.UTF_8));
 		encoder.add(MessageType.PUBLIC_KEY, signer.getPublicKey());
 		encoder.add(MessageType.SIGNATURE, proof);
 		byte[] plaintext = encoder.toByteArray();
 
-		ChachaEncoder chacha = new ChachaEncoder(hkdf_enc_key, "PS-Msg06".getBytes());
+		ChachaEncoder chacha = new ChachaEncoder(hkdf_enc_key, "PS-Msg06".getBytes(StandardCharsets.UTF_8));
 		byte[] ciphertext = chacha.encodeCiphertext(plaintext);
 
 		encoder = TypeLengthValueUtils.getEncoder();

src/main/java/com/beowulfe/hap/impl/pairing/PairVerificationManager.java

@@ -72,17 +72,17 @@ private HttpResponse stage1(Stage1Request request) throws Exception {
 		byte[] proof = new EdsaSigner(authInfo.getPrivateKey()).sign(material);
 
 		HKDFBytesGenerator hkdf = new HKDFBytesGenerator(new SHA512Digest());
-		hkdf.init(new HKDFParameters(sharedSecret, "Pair-Verify-Encrypt-Salt".getBytes(),
-				"Pair-Verify-Encrypt-Info".getBytes()));
+		hkdf.init(new HKDFParameters(sharedSecret, "Pair-Verify-Encrypt-Salt".getBytes(StandardCharsets.UTF_8),
+				"Pair-Verify-Encrypt-Info".getBytes(StandardCharsets.UTF_8)));
 		hkdfKey = new byte[32];
 		hkdf.generateBytes(hkdfKey, 0, 32);
 
 		Encoder encoder = TypeLengthValueUtils.getEncoder();
-		encoder.add(MessageType.USERNAME, authInfo.getMac().getBytes());
+		encoder.add(MessageType.USERNAME, authInfo.getMac().getBytes(StandardCharsets.UTF_8));
 		encoder.add(MessageType.SIGNATURE, proof);
 		byte[] plaintext = encoder.toByteArray();
 
-		ChachaEncoder chacha = new ChachaEncoder(hkdfKey, "PV-Msg02".getBytes());
+		ChachaEncoder chacha = new ChachaEncoder(hkdfKey, "PV-Msg02".getBytes(StandardCharsets.UTF_8));
 		byte[] ciphertext = chacha.encodeCiphertext(plaintext);
 
 		encoder = TypeLengthValueUtils.getEncoder();
@@ -104,7 +104,7 @@ private HttpResponse stage2(Stage2Request request) throws Exception {
 
 		byte[] clientLtpk = authInfo.getUserPublicKey(authInfo.getMac()+new String(clientUsername, StandardCharsets.UTF_8));
 		if (clientLtpk == null) {
-			throw new Exception("Unknown user: "+new String(clientUsername));
+			throw new Exception("Unknown user: "+new String(clientUsername, StandardCharsets.UTF_8));
 		}
 
 		Encoder encoder = TypeLengthValueUtils.getEncoder();

src/main/java/com/beowulfe/hap/impl/pairing/PairingUpdateController.java

@@ -29,7 +29,7 @@ public HttpResponse handle(HttpRequest request) throws IOException {
 			authInfo.createUser(authInfo.getMac()+new String(username, StandardCharsets.UTF_8), ltpk);
 		} else if (method == 4) { //Remove pairing
 			byte[] username = d.getBytes(MessageType.USERNAME);
-			authInfo.removeUser(authInfo.getMac()+new String(username));
+			authInfo.removeUser(authInfo.getMac()+new String(username, StandardCharsets.UTF_8));
 			if (!authInfo.hasUser()) {
 				advertiser.setDiscoverable(true);
 			}

src/main/java/com/beowulfe/hap/impl/responses/InternalServerErrorResponse.java

@@ -1,6 +1,7 @@
 package com.beowulfe.hap.impl.responses;
 
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 
 import com.beowulfe.hap.impl.http.HttpResponse;
 
@@ -19,7 +20,7 @@ public int getStatusCode() {
 
 	@Override
 	public ByteBuffer getBody() {
-		return ByteBuffer.wrap(e.getClass().getName().getBytes());
+		return ByteBuffer.wrap(e.getClass().getName().getBytes(StandardCharsets.UTF_8));
 	}
 
 	public Exception getException() {