From b9a22e66cabe332f8fe62a77d9441d75c4bdc109 Mon Sep 17 00:00:00 2001
From: Darren Starr <darren@nocturnal.no>
Date: Fri, 19 Jan 2018 07:14:38 +0100
Subject: [PATCH] Fixed PAP password encryption

---
 src/main/java/org/tinyradius/packet/AccessRequest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/tinyradius/packet/AccessRequest.java b/src/main/java/org/tinyradius/packet/AccessRequest.java
index ebf57628..3f1c7f9f 100644
--- a/src/main/java/org/tinyradius/packet/AccessRequest.java
+++ b/src/main/java/org/tinyradius/packet/AccessRequest.java
@@ -261,11 +261,11 @@ private byte[] encodePapPassword(final byte[] userPass, byte[] sharedSecret) {
 			md5.update(i == 0 ? getAuthenticator() : lastBlock);
 			byte bn[] = md5.digest();
 
-			System.arraycopy(encryptedPass, i, lastBlock, 0, 16);
-
 			// perform the XOR as specified by RFC 2865.
 			for (int j = 0; j < 16; j++)
 				encryptedPass[i + j] = (byte) (bn[j] ^ encryptedPass[i + j]);
+
+			System.arraycopy(encryptedPass, i, lastBlock, 0, 16);
 		}
 
 		return encryptedPass;