Hi David,
Welcome to CiC.
I think you're getting far too hung up in numerical measurements rather than just using what the vast majority of people will see - which I'd guess would be the Adobe size, since many more people will use that application compared to the others. Or you might want to check the camera manual to see what Canon say it is and use those figures. (which may be the same as Adobe)
Particularly; why get bogged down in masked pixels?
99.99999999999999% of users don't even know they're there, far less will ever see them.
The physical size of 'full frame' should be 36 x 24mm as George has noted. The '35mm' refers to the width of the roll of
film; i.e. the 24mm dimension plus a bit each side for sprocket holes, since the 36mm dimension of frame was along the length of the film.
Wikipedia article:
https://en.wikipedia.org/wiki/35mm_format
Hope that's helpful, if only for the background info. to remove any confusion, I appreciate that for 3D modelling you do need absolute figures and being a coder myself, although not at your level, I do appreciate your desire to get it right.
Cheers, Dave