Merge branch 'main' into 1906-readtime

gefeili · gefeili · commit c8b32f43e5bf · 2024-11-13T14:53:30.000+10:30
# Conflicts:
#	pg/src/main/java/org/bouncycastle/bcpg/StreamUtil.java
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/StreamUtil.java b/pg/src/main/java/org/bouncycastle/bcpg/StreamUtil.java
@@ -117,7 +117,7 @@ static void writeTime(BCPGOutputStream pOut, long time)
     static long readTime(BCPGInputStream in)
         throws IOException
     {
-        return (((long) in.read() << 24 | in.read() << 16 | in.read() << 8 | in.read()) & 0xFFFFFFFFL) * 1000L;
+        return ((long)read4OctetLength(in) & 0xFFFFFFFFL) * 1000L;
     }
 
     static void write2OctetLength(OutputStream pOut, int len)

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ static void writeTime(BCPGOutputStream pOut, long time)`
`117`	`117`	`static long readTime(BCPGInputStream in)`
`118`	`118`	`throws IOException`
`119`	`119`	`{`
`120`		`- return (((long) in.read() << 24 \| in.read() << 16 \| in.read() << 8 \| in.read()) & 0xFFFFFFFFL) * 1000L;`
	`120`	`+ return ((long)read4OctetLength(in) & 0xFFFFFFFFL) * 1000L;`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`static void write2OctetLength(OutputStream pOut, int len)`