[Opensc-commits] [OpenSC/OpenSC] dd4afa: openpgp-tool: fix buffer overflow on serials with ...

[Vincent P. <no...@gi...>]

  Branch: refs/heads/master
  Home:   https://github.com/OpenSC/OpenSC
  Commit: dd4afa02878ba0247dae8e56f36a86d6d87d11ff
      https://github.com/OpenSC/OpenSC/commit/dd4afa02878ba0247dae8e56f36a86d6d87d11ff
  Author: Vincent Pelletier <plr...@gm...>
  Date:   2021-09-19 (Sun, 19 Sep 2021)

  Changed paths:
    M src/tools/openpgp-tool.c

  Log Message:
  -----------
  openpgp-tool: fix buffer overflow on serials with MSb set

Fixes the following crash:
  $ openpgp-tool --card-info
  Using reader with a card: Linux Foundation Multifunction Composite Gadget - vincent [python-usb-f-ccid] 00 00
  AID:             d2:76:00:01:24:01:03:41:ff:65:a4:9b:68:64:00:00
  Version:         3.41
  Manufacturer:    unmanaged S/N range
  *** buffer overflow detected ***: terminated
  Abandon (core dumped)
"a4:9b:68:64" from the AID being the serial, and:
  (gdb) print (data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3])
  $12 = -1533319068
but
  (gdb) print (unsigned long) (data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3])
  $13 = 18446744072176232548

Avoid the shifts and cast altogether.


  Commit: d2fddc4f75fd0e05038ceb4d92f1a7171772523a
      https://github.com/OpenSC/OpenSC/commit/d2fddc4f75fd0e05038ceb4d92f1a7171772523a
  Author: Vincent Pelletier <plr...@gm...>
  Date:   2021-09-19 (Sun, 19 Sep 2021)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  .gitignore: Add entries for existing unittests.


  Commit: 34967686e3f478b16d0a2a9dcb535dddad9eb5e1
      https://github.com/OpenSC/OpenSC/commit/34967686e3f478b16d0a2a9dcb535dddad9eb5e1
  Author: Vincent Pelletier <plr...@gm...>
  Date:   2021-09-19 (Sun, 19 Sep 2021)

  Changed paths:
    M src/tools/Makefile.am
    M src/tools/Makefile.mak
    A src/tools/openpgp-tool-helpers.c
    A src/tools/openpgp-tool-helpers.h
    M src/tools/openpgp-tool.c

  Log Message:
  -----------
  tools: Split openpgp-tool's prettify_* functions into another file.

No change to source code other than the relocation.
In preparation for unit testing.


  Commit: 3680e78109ff26320be6745c529d53649868b060
      https://github.com/OpenSC/OpenSC/commit/3680e78109ff26320be6745c529d53649868b060
  Author: Vincent Pelletier <plr...@gm...>
  Date:   2021-09-19 (Sun, 19 Sep 2021)

  Changed paths:
    M src/tools/openpgp-tool-helpers.c
    M src/tools/openpgp-tool-helpers.h
    M src/tools/openpgp-tool.c

  Log Message:
  -----------
  tools: Constify openpgp-tool's prettify_* functions' arguments.

prettify_name: Use a separate buffer to hold the result. This adds a limit to
the name length, chosen arbitrarily at 99 bytes (+ null).

prettify_language: Use a separate buffer to hold the result. No functional
change expected.


  Commit: 65781d6c3765d1c1210f25823f1829c43e62b94a
      https://github.com/OpenSC/OpenSC/commit/65781d6c3765d1c1210f25823f1829c43e62b94a
  Author: Vincent Pelletier <plr...@gm...>
  Date:   2021-09-19 (Sun, 19 Sep 2021)

  Changed paths:
    M src/tools/openpgp-tool-helpers.c

  Log Message:
  -----------
  tools: Add EDDSA support in openpgp-tool's prettify_algorithm.


  Commit: daebea56120f3d1bc12ba7c1dab5f5787d432f7c
      https://github.com/OpenSC/OpenSC/commit/daebea56120f3d1bc12ba7c1dab5f5787d432f7c
  Author: Vincent Pelletier <plr...@gm...>
  Date:   2021-09-19 (Sun, 19 Sep 2021)

  Changed paths:
    M .gitignore
    M src/tests/unittests/Makefile.am
    A src/tests/unittests/openpgp-tool.c

  Log Message:
  -----------
  tests: Add tests for openpgp-tool prettify_* functions.


Compare: https://github.com/OpenSC/OpenSC/compare/e4fdbebee333...daebea56120f