archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8201867: Kerberos keytabs with holes in certain places are parsed incorrectly

Browse source 
Reviewed-by: valeriep
This commit is contained in:
Weijun Wang 2018-05-18 16:27:15 +08:00
parent fdaaae3622
commit b8855ebbc2
2 changed files with 133 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -62,13 +62,29 @@ public class KeyTabInputStream extends KrbDataInputStream implements KeyTabConst
}
KeyTabEntry readEntry(int entryLen, int ktVersion) throws IOException, RealmException {
KeyTabEntry readEntry(int entryLen, int ktVersion)
throws IOException, RealmException {
index = entryLen;
if (index == 0) { //in native implementation, when the last entry is deleted, a byte 0 is left.
// in native implementation, when the last entry is deleted,
// an entry length of 0 is left.
if (index == 0) {
return null;
}
if (index < 0) { //in native implementation, when one of the entries is deleted, the entry length turns to be negative, and
skip(Math.abs(index)); //the fields are left with 0 bytes
// in native implementation, when one of the entries is deleted,
// the entry length is changed to be negative, and the content
// is zeroed out to be a "hole".
if (index < 0) {
// Skip the zeroed content.
long n = -index;
while (n > 0) {
long n2 = skip(n);
if (n2 == 0) {
throw new IOException("Premature end of stream reached");
} else {
n -= n2;
}
}
return null;
}
int principalNum = read(2); //the number of service names.