Add Make.win32 -fcommon, define u64int, sync libsec, libmp, libauthsrv with Plan 9, define usize, add chacha20, libsec: add mising \ #16

adriangrigore · 2024-06-22T22:41:53Z

No description provided.

0intro · 2024-06-22T23:16:50Z

Thanks. I'm looking at it.

adriangrigore · 2024-06-23T01:19:22Z

I removed #pragmas at start of header files, maybe it's a good idea to leave them there despite the warnings. Proper solution I think would be to #ifdef them: https://github.com/9fans/drawterm/blob/main/include/authsrv.h but that would mean patching on Plan 9 side also.

adriangrigore · 2024-06-23T01:54:15Z

Oh, I see there are more changes in this repo vs Plan 9 versions(not that many) I just copied the libs.

I could merge and force push I think.

0intro · 2024-06-23T11:43:25Z

Overall, it looks good. Thank your for working on this.

Could you rename libsec: sync with Plan9 to libsec: sync with Plan 9?

adriangrigore · 2024-06-23T15:02:40Z

Ok, changed libsec commit message, left #pragmas in place and added -Wno-unknown-pragmas to Make.win32.

0intro · 2024-06-23T15:04:36Z

I think it's probably better to add #ifdef PLAN9 around pragma, like it was done for the other header files (include/draw.h and so on).

adriangrigore · 2024-06-23T15:12:49Z

I took the flag from here https://github.com/golang/go/blob/ceb95ea6aef52c1fb472d3539c6ef68670778b5b/src/cmd/dist/build.c#L482, not sure if it applies to Plan 9, and I think it's preferable to have identical copies in drawterm and Plan 9. If I were to add #ifdefs, I'd probably add them to the Plan 9 versions also to keep them precisely in sync. That's why I opted for -Wno-unknown-pragmas.

adriangrigore · 2024-06-23T15:31:49Z

plan9port removes them completely https://github.com/9fans/plan9port/blob/master/include/mp.h#L137 or comments them out https://github.com/9fans/plan9port/blob/master/include/mp.h#L151, I understand your argument of #idefing them to keep consistency with the current codebase, I would agree with that for consistency purposes.

adriangrigore · 2024-06-23T15:35:20Z

Shall we go with consistency then?

adriangrigore · 2024-06-23T15:47:54Z

Although, not all them were #ifdef-ed, some just had their #pragmas removed https://github.com/9fans/drawterm/blob/main/include/libsec.h, https://github.com/9fans/drawterm/blob/main/include/mp.h.

adriangrigore · 2024-06-23T16:05:50Z

If you prefer #ifdefs, 9legacy solution would probably be create some patches to ifdef them in Plan 9 too I think. To keep them perfectly in sync, wih no changes to the Plan 9 versions, -Wno-unknown-pragmas would probably be the solution.

adriangrigore · 2024-06-23T16:24:29Z

Or just live with the warnings.

0intro · 2024-06-23T16:49:59Z

The pragma are meant to be interpreted by the Plan 9 C compiler only. I'm not very comfortable keeping them, risking to be handled by the GCC preprocessor, which could lead to side effects.

Either deleting them or #ifdef sounds good to me.

adriangrigore · 2024-06-23T17:00:24Z

The pragma are meant to be interpreted by the Plan 9 C compiler only. I'm not very comfortable keeping them, risking to be handled by the GCC preprocessor, which could lead to side effects.

Either deleting them or #ifdef sounds good to me.

Ok, I'll probably #ifdef them then.

adriangrigore · 2024-06-23T17:53:22Z

Ok, #ifdef-ed, not sure if this is ok 0f4e314#diff-e9399bd85711a4c93d1a01968311639e3355a8b3dce252f026d44cd7650ae913R130, if ok, I think you can merge.

adriangrigore · 2024-06-23T18:05:31Z

Hmm... this might require merging 93a43be

adriangrigore · 2024-06-23T18:22:21Z

I don't understand which (if any of the patches) to libmp, libsec, libauthsrv from this repo have been merged in Plan 9 libs, if not, we'll have to merge them.

adriangrigore · 2024-06-23T18:42:17Z

Hmm... this might require merging 93a43be

I see block files are done in assembly, I added the C versions 15a79f4#diff-ede5614f90d7b8d84cda78003b911a92e627073420f71965b843c0c4bbab4921R50 for sha2block64 and sha2block128.

adriangrigore · 2024-06-23T18:50:08Z

1c8b499#diff-60bc2862e39ce285a55d63a7f349f7eb7e5724d0f1bc0baa0cc18a28e0ff5936 this affects libmp (not merged).

adriangrigore · 2024-06-23T18:53:29Z

6fb8584 and e10503f look merged.

adriangrigore · 2024-06-23T18:57:34Z

1125f09#diff-ba43ca4048f51025813c140fdcc7f53f77817dd416f1aa445900c524e5090b86L1 affects libmp, not merged.

adriangrigore · 2024-06-23T19:01:51Z

9320b94#diff-7cbc4f84d9558c6a8a3236a3e94b85584d7d80805284758fb4ad0abe11836844L61 looks meged

0intro · 2024-06-23T19:06:05Z

I don't understand which (if any of the patches) to libmp, libsec, libauthsrv from this repo have been merged in Plan 9 libs, if not, we'll have to merge them.

Merging is always complicated because you have to compare two pieces of code that evolved independently.

adriangrigore · 2024-06-23T19:10:13Z

I don't understand which (if any of the patches) to libmp, libsec, libauthsrv from this repo have been merged in Plan 9 libs, if not, we'll have to merge them.

Merging is always complicated because you have to compare two pieces of code that evolved independently.

I assume they started from the same sources, and I assume the idea was for them to be sync-ed, if so, they don't seem to have a lot of changes between them. Please take a look at libsec, libmp and libauthsrv commit history in this repo, there's not a lof of changes. Doesn't seem hard to merge. Changes are minor.

0intro · 2024-06-23T19:12:39Z

1125f09#diff-ba43ca4048f51025813c140fdcc7f53f77817dd416f1aa445900c524e5090b86L1 affects libmp, not merged.

For that kind of changes, you have to re-apply the changes Russ did on your libmp: sync with Plan 9 commit to be sure there are no regression.

adriangrigore · 2024-06-23T19:13:47Z

1125f09#diff-ba43ca4048f51025813c140fdcc7f53f77817dd416f1aa445900c524e5090b86L1 affects libmp, not merged.

For that kind of changes, you have to re-apply the changes Russ did on your libmp: sync with Plan 9 commit to be sure there are no regression.

Yup, exactly! Doesn't seem hard! :)

Add ChaCha20 stream cipher (RFC7539). http://9legacy.org/9legacy/patch/libsec-chacha.diff

adriangrigore · 2024-06-23T19:51:05Z

Ok ,merged, patches for 9legacy if interested.

libmp-gcc-warnings-drawterm.diff

diff --git a/libmp/strtomp.c b/libmp/strtomp.c
index 9c64c33..26e3751 100644
--- a/libmp/strtomp.c
+++ b/libmp/strtomp.c
@@ -32,13 +32,13 @@ init(void)
 	memset(tab.t10, INVAL, sizeof(tab.t10));
 
 	for(p = set64; *p; p++)
-		tab.t64[*p] = p-set64;
+		tab.t64[(uchar)*p] = p-set64;
 	for(p = set32; *p; p++)
-		tab.t32[*p] = p-set32;
+		tab.t32[(uchar)*p] = p-set32;
 	for(p = set16; *p; p++)
-		tab.t16[*p] = (p-set16)%16;
+		tab.t16[(uchar)*p] = (p-set16)%16;
 	for(p = set10; *p; p++)
-		tab.t10[*p] = (p-set10);
+		tab.t10[(uchar)*p] = (p-set10);
 
 	tab.inited = 1;
 }

libmp-sun-fixes-drawterm.diff

diff --git a/libmp/dat.h b/libmp/dat.h
index 7c834ac..8542909 100644
--- a/libmp/dat.h
+++ b/libmp/dat.h
@@ -1,4 +1,4 @@
-#define	mpdighi  (mpdigit)(1<<(Dbits-1))
+#define	mpdighi  (mpdigit)(1U<<(Dbits-1))
 #define DIGITS(x) ((Dbits - 1 + (x))/Dbits)
 
 // for converting between int's and mpint's

Now, I really don't want to write sha2block64 and sha2block128 in assembler now. :D

adriangrigore · 2024-06-23T20:01:50Z

Ok, #ifdef-ed, not sure if this is ok 0f4e314#diff-e9399bd85711a4c93d1a01968311639e3355a8b3dce252f026d44cd7650ae913R130, if ok, I think you can merge.

Please review this also, if I didn't miss anything when merging repo changes (I don't think so), it's fine to merge now, except for the asm version of sha2block64 and sha2block128 which I don't think affects us at all.

0intro · 2024-06-23T20:31:06Z

Thanks. I'll will do a final review.

adriangrigore · 2024-06-24T13:04:44Z

Perhaps you might consider merging to a separate branch for now until everything is complete?

0intro

I think your changes are ready to be merged on the main branch.
You will be able to open new PRs for the remaining changes.

0intro · 2024-06-24T19:12:42Z

libsec/Makefile

@@ -51,7 +51,7 @@ OFILES=\
 	sha2block64.$O\
 	sha2_128.$O\
 	sha2block128.$O\
-	smallprimes.$O
+	smallprimes.$O\


This is not necessary, but it doesn't harm.

I guess I preferred single line diffs as I have to add more stuff there. Your call!

0intro · 2024-06-24T20:43:56Z

I'm ready to merge into main. Let me know if it's good for you.

adriangrigore · 2024-06-24T21:17:44Z

Ok to merge!

adriangrigore · 2024-06-25T14:02:53Z

I think this also closes #12

Make.win32: add -fcommon

4c945eb

adriangrigore changed the title ~~Add -fcommon, define u64int, sync libsec with Plan 9~~ Add -fcommon, define u64int, sync libsec, libmp with Plan 9 Jun 23, 2024

adriangrigore changed the title ~~Add -fcommon, define u64int, sync libsec, libmp with Plan 9~~ Add -fcommon, define u64int, sync libsec, libmp, libauthsrv with Plan 9 Jun 23, 2024

adriangrigore changed the title ~~Add -fcommon, define u64int, sync libsec, libmp, libauthsrv with Plan 9~~ Add -fcommon, define u64int, sync libsec, libmp, libauthsrv with Plan 9, define usize, add chacha20 Jun 23, 2024

adriangrigore changed the title ~~Add -fcommon, define u64int, sync libsec, libmp, libauthsrv with Plan 9, define usize, add chacha20~~ Add -fcommon, -Wno-unknown-pragmas, define u64int, sync libsec, libmp, libauthsrv with Plan 9, define usize, add chacha20 Jun 23, 2024

adriangrigore added 2 commits June 23, 2024 20:13

include/lib.h: define u64int

bb00700

libsec: sync with Plan 9

15a79f4

adriangrigore changed the title ~~Add Make.win32 -fcommon, -Wno-unknown-pragmas, define u64int, sync libsec, libmp, libauthsrv with Plan 9, define usize, add chacha20~~ Add Make.win32 -fcommon, define u64int, sync libsec, libmp, libauthsrv with Plan 9, define usize, add chacha20 Jun 23, 2024

adriangrigore added 4 commits June 23, 2024 22:37

libmp: sync with Plan 9

947a96a

libauthsrv: sync with Plan 9

e67eaf0

include/lib.h: define usize

00be3a3

libsec: add chacha20

9f1b25c

Add ChaCha20 stream cipher (RFC7539). http://9legacy.org/9legacy/patch/libsec-chacha.diff

libsec: add missing \ in Makefile

693ebe2

adriangrigore changed the title ~~Add Make.win32 -fcommon, define u64int, sync libsec, libmp, libauthsrv with Plan 9, define usize, add chacha20~~ Add Make.win32 -fcommon, define u64int, sync libsec, libmp, libauthsrv with Plan 9, define usize, add chacha20, libsec: add mising \ Jun 23, 2024

0intro approved these changes Jun 24, 2024

View reviewed changes

0intro merged commit ba4a812 into 9fans:main Jun 24, 2024
1 check passed

0intro mentioned this pull request Jun 25, 2024

Make.win32: enable linking with recent mingw64 #12

Closed

Add Make.win32 -fcommon, define u64int, sync libsec, libmp, libauthsrv with Plan 9, define usize, add chacha20, libsec: add mising \ #16

Add Make.win32 -fcommon, define u64int, sync libsec, libmp, libauthsrv with Plan 9, define usize, add chacha20, libsec: add mising \ #16

Conversation

adriangrigore commented Jun 22, 2024

0intro commented Jun 22, 2024

adriangrigore commented Jun 23, 2024

adriangrigore commented Jun 23, 2024 • edited Loading

0intro commented Jun 23, 2024

adriangrigore commented Jun 23, 2024 • edited Loading

0intro commented Jun 23, 2024

adriangrigore commented Jun 23, 2024

adriangrigore commented Jun 23, 2024 • edited Loading

adriangrigore commented Jun 23, 2024

adriangrigore commented Jun 23, 2024

adriangrigore commented Jun 23, 2024

adriangrigore commented Jun 23, 2024

0intro commented Jun 23, 2024

adriangrigore commented Jun 23, 2024

adriangrigore commented Jun 23, 2024

adriangrigore commented Jun 23, 2024

adriangrigore commented Jun 23, 2024

adriangrigore commented Jun 23, 2024

adriangrigore commented Jun 23, 2024

adriangrigore commented Jun 23, 2024 • edited Loading

adriangrigore commented Jun 23, 2024

adriangrigore commented Jun 23, 2024

0intro commented Jun 23, 2024

adriangrigore commented Jun 23, 2024

0intro commented Jun 23, 2024

adriangrigore commented Jun 23, 2024

adriangrigore commented Jun 23, 2024

adriangrigore commented Jun 23, 2024 • edited Loading

0intro commented Jun 23, 2024

adriangrigore commented Jun 24, 2024

0intro left a comment

Choose a reason for hiding this comment

0intro Jun 24, 2024

Choose a reason for hiding this comment

adriangrigore Jun 24, 2024 • edited Loading

Choose a reason for hiding this comment

0intro commented Jun 24, 2024

adriangrigore commented Jun 24, 2024

adriangrigore commented Jun 25, 2024

adriangrigore commented Jun 23, 2024 •

edited

Loading

adriangrigore commented Jun 23, 2024 •

edited

Loading

adriangrigore commented Jun 23, 2024 •

edited

Loading

adriangrigore commented Jun 23, 2024 •

edited

Loading

adriangrigore commented Jun 23, 2024 •

edited

Loading

adriangrigore Jun 24, 2024 •

edited

Loading