[gcr: 34/34] Merge branch 'main' into 'master'




commit 464faa55541d4054fa4c73910857090d4fb83e7a
Merge: 029faac4 c70dd867
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sat Apr 9 11:04:57 2022 +0000

    Merge branch 'main' into 'master'
    
    Create gcr4
    
    Closes #53
    
    See merge request GNOME/gcr!82

 .editorconfig                                      |   20 +
 .gitlab-ci.yml                                     |   19 +-
 README.md                                          |    7 +
 docs/gck/pkcs11-links.md                           |    4 +-
 .../gcr-ui.toml.in => gcr-gtk3/gcr-gtk3.toml.in}   |    0
 .../{ui => gcr-gtk3}/images/certificate-widget.png |  Bin
 docs/{ui => gcr-gtk3}/images/combo-selector.png    |  Bin
 docs/{ui => gcr-gtk3}/images/import-button.png     |  Bin
 docs/{ui => gcr-gtk3}/images/key-widget.png        |  Bin
 docs/{ui => gcr-gtk3}/images/list-selector.png     |  Bin
 docs/{ui => gcr-gtk3}/images/tree-selector.png     |  Bin
 docs/{ui => gcr-gtk3}/images/viewer-widget.png     |  Bin
 docs/{ui => gcr-gtk3}/meson.build                  |   16 +-
 docs/{ui => gcr-gtk3}/widget-gallery.md            |    0
 docs/gcr-gtk4/gcr-gtk4.toml.in                     |   44 +
 docs/gcr-gtk4/meson.build                          |   31 +
 docs/gcr/{gcr-base.toml.in => gcr.toml.in}         |    0
 docs/gcr/meson.build                               |   12 +-
 docs/meson.build                                   |   14 +-
 gck/Gck-1.metadata                                 |    3 +
 gck/gck-attributes.c                               |  436 +-----
 gck/gck-deprecated.h                               |  130 --
 gck/gck-enumerator.c                               |  155 +-
 gck/gck-interaction.c                              |  176 ---
 gck/gck-misc.c                                     |   22 +-
 gck/gck-mock.c                                     |   38 +-
 gck/gck-module.c                                   |  149 +-
 gck/gck-modules.c                                  |   12 +-
 gck/gck-object-cache.c                             |   48 +-
 gck/gck-object.c                                   |  171 +-
 gck/gck-password.c                                 |   43 +-
 gck/gck-private.h                                  |   14 -
 gck/gck-session.c                                  |  260 ++-
 gck/gck-slot.c                                     |   71 +-
 gck/gck-uri.c                                      |   65 +-
 gck/gck.h                                          |  206 +--
 gck/gck.symbols                                    |    2 -
 gck/meson.build                                    |    5 +-
 gck/test-gck-crypto.c                              |   46 +-
 gck/test-gck-enumerator.c                          |   74 +-
 gck/test-gck-module.c                              |    6 +-
 gck/test-gck-modules.c                             |    9 +-
 gck/test-gck-object.c                              |   39 +-
 gck/test-gck-session.c                             |   31 +-
 gck/test-gck-slot.c                                |    4 +-
 gck/test-gck-uri.c                                 |   66 +-
 {ui => gcr-gtk3}/fixtures/ca-certificates.crt      |    0
 {ui => gcr-gtk3}/fixtures/der-certificate.crt      |  Bin
 {ui => gcr-gtk3}/fixtures/der-rsa-2048.p10         |  Bin
 {ui => gcr-gtk3}/fixtures/email.p12                |  Bin
 {ui => gcr-gtk3}/fixtures/pem-dsa-1024.key         |    0
 {ui => gcr-gtk3}/frob-certificate.c                |    3 +-
 gcr-gtk3/gcr-certificate-widget.c                  |  677 ++++++++
 gcr-gtk3/gcr-certificate-widget.h                  |   33 +
 {ui => gcr-gtk3}/gcr-crypto-types.xml              |    1 +
 .../gcr-gtk3.h                                     |   25 +-
 ui/gcr-ui.pc.in => gcr-gtk3/gcr-gtk3.pc.in         |    0
 ui/gcr-ui.symbols => gcr-gtk3/gcr-gtk3.symbols     |    0
 gcr-gtk3/gcr-section.c                             |  204 +++
 gcr-gtk3/gcr-section.h                             |   29 +
 {ui => gcr-gtk3}/gcr-secure-entry-buffer.c         |    0
 {ui => gcr-gtk3}/gcr-secure-entry-buffer.h         |    0
 {ui => gcr-gtk3}/gcr.gresource.xml                 |    0
 {ui => gcr-gtk3}/icons/16x16/gcr-gnupg.png         |  Bin
 {ui => gcr-gtk3}/icons/16x16/gcr-key-pair.png      |  Bin
 {ui => gcr-gtk3}/icons/16x16/gcr-key.png           |  Bin
 {ui => gcr-gtk3}/icons/16x16/gcr-password.png      |  Bin
 {ui => gcr-gtk3}/icons/16x16/gcr-smart-card.png    |  Bin
 {ui => gcr-gtk3}/icons/22x22/gcr-gnupg.png         |  Bin
 {ui => gcr-gtk3}/icons/22x22/gcr-key-pair.png      |  Bin
 {ui => gcr-gtk3}/icons/22x22/gcr-key.png           |  Bin
 {ui => gcr-gtk3}/icons/22x22/gcr-password.png      |  Bin
 {ui => gcr-gtk3}/icons/22x22/gcr-smart-card.png    |  Bin
 {ui => gcr-gtk3}/icons/24x24/gcr-gnupg.png         |  Bin
 {ui => gcr-gtk3}/icons/24x24/gcr-key-pair.png      |  Bin
 {ui => gcr-gtk3}/icons/24x24/gcr-key.png           |  Bin
 {ui => gcr-gtk3}/icons/24x24/gcr-password.png      |  Bin
 {ui => gcr-gtk3}/icons/24x24/gcr-smart-card.png    |  Bin
 {ui => gcr-gtk3}/icons/256x256/gcr-gnupg.png       |  Bin
 {ui => gcr-gtk3}/icons/256x256/gcr-password.png    |  Bin
 {ui => gcr-gtk3}/icons/256x256/gcr-smart-card.png  |  Bin
 {ui => gcr-gtk3}/icons/32x32/gcr-gnupg.png         |  Bin
 {ui => gcr-gtk3}/icons/32x32/gcr-key-pair.png      |  Bin
 {ui => gcr-gtk3}/icons/32x32/gcr-key.png           |  Bin
 {ui => gcr-gtk3}/icons/32x32/gcr-password.png      |  Bin
 {ui => gcr-gtk3}/icons/32x32/gcr-smart-card.png    |  Bin
 {ui => gcr-gtk3}/icons/48x48/gcr-gnupg.png         |  Bin
 {ui => gcr-gtk3}/icons/48x48/gcr-key-pair.png      |  Bin
 {ui => gcr-gtk3}/icons/48x48/gcr-key.png           |  Bin
 {ui => gcr-gtk3}/icons/48x48/gcr-password.png      |  Bin
 {ui => gcr-gtk3}/icons/48x48/gcr-smart-card.png    |  Bin
 {ui => gcr-gtk3}/icons/meson.build                 |    0
 {ui => gcr-gtk3}/icons/render-icons.py             |    4 +-
 {ui => gcr-gtk3}/icons/src/gcr-gnupg.svg           |    0
 {ui => gcr-gtk3}/icons/src/gcr-key-and-keypair.svg |    0
 {ui => gcr-gtk3}/icons/src/gcr-password.svg        |    0
 {ui => gcr-gtk3}/icons/src/gcr-smart-card.svg      |    0
 gcr/libgcr-base.map => gcr-gtk3/libgcr-gtk3.map    |    0
 gcr-gtk3/meson.build                               |  156 ++
 gcr-gtk4/gcr-certificate-widget.c                  |  684 ++++++++
 gcr-gtk4/gcr-certificate-widget.h                  |   30 +
 gcr-gtk4/gcr-gtk4.h                                |   20 +
 gcr-gtk4/gcr-section.c                             |  222 +++
 gcr-gtk4/gcr-section.h                             |   30 +
 ui/libgcr-ui.map => gcr-gtk4/libgcr-gtk4.map       |    0
 gcr-gtk4/meson.build                               |  129 ++
 gcr/frob-certificate-request.c                     |    2 +-
 gcr/frob-openpgp.c                                 |    2 +-
 gcr/frob-parser.c                                  |    2 +-
 gcr/gcr-base.h                                     |   65 -
 gcr/gcr-callback-output-stream.h                   |    3 +-
 gcr/gcr-certificate-chain.c                        |    2 +-
 gcr/gcr-certificate-chain.h                        |    8 +-
 gcr/gcr-certificate-extensions.h                   |    2 +-
 gcr/gcr-certificate-request.c                      |    2 +-
 gcr/gcr-certificate-request.h                      |    8 +-
 gcr/gcr-certificate.c                              |    2 +-
 gcr/gcr-certificate.h                              |   10 +-
 gcr/gcr-collection.c                               |  169 --
 gcr/gcr-collection.h                               |   80 -
 gcr/gcr-column.h                                   |    4 +
 gcr/gcr-comparable.c                               |    9 +-
 gcr/gcr-comparable.h                               |   17 +-
 gcr/gcr-deprecated-base.h                          |   79 -
 gcr/gcr-filter-collection.c                        |  372 -----
 gcr/gcr-filter-collection.h                        |   76 -
 gcr/gcr-fingerprint.h                              |    8 +-
 gcr/gcr-gnupg-collection.c                         |  738 ---------
 gcr/gcr-gnupg-collection.h                         |   69 -
 gcr/gcr-gnupg-importer.c                           |    4 +-
 gcr/gcr-gnupg-importer.h                           |    8 +-
 gcr/gcr-gnupg-key.h                                |    8 +-
 gcr/gcr-gnupg-records.h                            |    4 -
 gcr/gcr-gnupg-util.h                               |    4 -
 gcr/gcr-icons.h                                    |    8 +-
 gcr/gcr-import-interaction.c                       |   27 +-
 gcr/gcr-import-interaction.h                       |   21 +-
 gcr/gcr-importer.c                                 |  133 +-
 gcr/gcr-importer.h                                 |   21 +-
 gcr/gcr-key-mechanisms.c                           |    2 +-
 gcr/gcr-key-mechanisms.h                           |    4 -
 gcr/gcr-library.c                                  |   10 -
 gcr/gcr-library.h                                  |    8 +-
 gcr/gcr-mock-prompter.c                            |    4 +-
 gcr/gcr-mock-prompter.h                            |    8 +-
 gcr/gcr-openpgp.h                                  |    4 -
 gcr/gcr-openssh.c                                  |    4 +-
 gcr/gcr-openssh.h                                  |    4 -
 gcr/gcr-parser.c                                   |    2 +-
 gcr/gcr-parser.h                                   |    8 +-
 gcr/gcr-pkcs11-certificate.c                       |    2 +-
 gcr/gcr-pkcs11-certificate.h                       |    8 +-
 gcr/gcr-pkcs11-importer.c                          |   22 +-
 gcr/gcr-pkcs11-importer.h                          |    4 -
 gcr/gcr-prompt.c                                   |   30 +-
 gcr/gcr-prompt.h                                   |   21 +-
 gcr/gcr-record.h                                   |    4 -
 gcr/gcr-secret-exchange.h                          |    8 +-
 gcr/gcr-secure-memory.h                            |    8 +-
 gcr/gcr-simple-certificate.c                       |   23 +-
 gcr/gcr-simple-certificate.h                       |    8 +-
 gcr/gcr-simple-collection.c                        |  193 ---
 gcr/gcr-simple-collection.h                        |   65 -
 gcr/gcr-single-collection.c                        |  151 --
 gcr/gcr-single-collection.h                        |   45 -
 gcr/gcr-ssh-agent-service.c                        |    2 +-
 gcr/gcr-ssh-askpass.h                              |    8 +-
 gcr/gcr-subject-public-key.c                       |    6 +-
 gcr/gcr-subject-public-key.h                       |    4 -
 gcr/gcr-system-prompt.c                            |    4 +-
 gcr/gcr-system-prompt.h                            |    8 +-
 gcr/gcr-system-prompter.c                          |    4 +-
 gcr/gcr-system-prompter.h                          |    8 +-
 gcr/gcr-trust.c                                    |   14 +-
 gcr/gcr-trust.h                                    |    8 +-
 gcr/gcr-types.h                                    |    8 +-
 gcr/gcr-union-collection.c                         |  339 ----
 gcr/gcr-union-collection.h                         |   77 -
 gcr/gcr-version.h.in                               |    2 +-
 gcr/gcr.h                                          |   28 +-
 gcr/{gcr-base.symbols => gcr.symbols}              |    0
 gcr/libgcr.map                                     |    8 +
 gcr/meson.build                                    |  116 +-
 gcr/test-certificate-chain.c                       |    2 +-
 gcr/test-certificate.c                             |    2 +-
 gcr/test-filter-collection.c                       |  272 ----
 gcr/test-fingerprint.c                             |    4 +-
 gcr/test-gnupg-collection.c                        |  249 ---
 gcr/test-gnupg-process.c                           |    2 +-
 gcr/test-openpgp.c                                 |    2 +-
 gcr/test-openssh.c                                 |    2 +-
 gcr/test-parser.c                                  |    2 +-
 gcr/test-pkcs11-certificate.c                      |    2 +-
 gcr/test-secret-exchange.c                         |    2 +-
 gcr/test-simple-certificate.c                      |    2 +-
 gcr/test-ssh-askpass.c                             |    2 +-
 gcr/test-subject-public-key.c                      |   12 +-
 gcr/test-system-prompt.c                           |    2 +-
 gcr/test-trust.c                                   |    2 +-
 gcr/test-util.c                                    |    2 +-
 meson.build                                        |   34 +-
 meson_options.txt                                  |   11 +-
 meson_post_install.py                              |   23 -
 po/POTFILES.in                                     |   40 +-
 tools/gtk3/meson.build                             |    7 +
 tools/gtk3/viewer.c                                |  139 ++
 tools/gtk4/meson.build                             |    7 +
 tools/gtk4/viewer.c                                |  139 ++
 tools/meson.build                                  |    7 +
 ui/GcrUi-3.metadata                                |    5 -
 ui/eggimagemenuitem.c                              |  734 ---------
 ui/eggimagemenuitem.h                              |   80 -
 ui/frob-combo-selector.c                           |   97 --
 ui/frob-gnupg-selector.c                           |   94 --
 ui/frob-import-button.c                            |  251 ---
 ui/frob-key.c                                      |   87 -
 ui/frob-prompt.c                                   |  279 ----
 ui/frob-request.c                                  |   97 --
 ui/frob-system-prompt.c                            |  145 --
 ui/frob-tree-selector.c                            |  211 ---
 ui/frob-unlock-options.c                           |   82 -
 ui/frob-unlock.c                                   |  123 --
 ui/gcr-certificate-basics-widget.c                 |   79 -
 ui/gcr-certificate-basics-widget.h                 |   65 -
 ui/gcr-certificate-details-widget.c                |   79 -
 ui/gcr-certificate-details-widget.h                |   65 -
 ui/gcr-certificate-exporter.c                      |  570 -------
 ui/gcr-certificate-exporter.h                      |   74 -
 ui/gcr-certificate-renderer-private.h              |   49 -
 ui/gcr-certificate-renderer.c                      |  960 ------------
 ui/gcr-certificate-renderer.h                      |   73 -
 ui/gcr-certificate-request-renderer.c              |  531 -------
 ui/gcr-certificate-request-renderer.h              |   71 -
 ui/gcr-certificate-widget.c                        |  245 ---
 ui/gcr-certificate-widget.h                        |   73 -
 ui/gcr-collection-model.c                          | 1654 --------------------
 ui/gcr-collection-model.h                          |  102 --
 ui/gcr-combo-selector.c                            |  250 ---
 ui/gcr-combo-selector.h                            |   67 -
 ui/gcr-deprecated.h                                |   55 -
 ui/gcr-dialog-util.c                               |  171 --
 ui/gcr-dialog-util.h                               |   40 -
 ui/gcr-display-scrolled.c                          |  173 --
 ui/gcr-display-scrolled.h                          |   57 -
 ui/gcr-display-view.c                              | 1232 ---------------
 ui/gcr-display-view.h                              |  116 --
 ui/gcr-failure-renderer.c                          |  228 ---
 ui/gcr-failure-renderer.h                          |   67 -
 ui/gcr-gnupg-renderer.c                            |  852 ----------
 ui/gcr-gnupg-renderer.h                            |   77 -
 ui/gcr-import-button.c                             |  592 -------
 ui/gcr-import-button.h                             |   74 -
 ui/gcr-key-renderer.c                              |  481 ------
 ui/gcr-key-renderer.h                              |   66 -
 ui/gcr-key-widget.c                                |  210 ---
 ui/gcr-key-widget.h                                |   61 -
 ui/gcr-list-selector.c                             |  442 ------
 ui/gcr-list-selector.h                             |   71 -
 ui/gcr-live-search.c                               |  656 --------
 ui/gcr-live-search.h                               |   84 -
 ui/gcr-pkcs11-import-dialog.c                      |  271 ----
 ui/gcr-pkcs11-import-dialog.h                      |   62 -
 ui/gcr-pkcs11-import-dialog.ui                     |  255 ---
 ui/gcr-pkcs11-import-interaction.c                 |  249 ---
 ui/gcr-pkcs11-import-interaction.h                 |   38 -
 ui/gcr-prompt-dialog.c                             | 1060 -------------
 ui/gcr-prompt-dialog.h                             |   63 -
 ui/gcr-prompter-tool.c                             |  257 ---
 ui/gcr-prompter.desktop.in.in                      |    9 -
 ui/gcr-renderer.c                                  |  326 ----
 ui/gcr-renderer.h                                  |   88 --
 ui/gcr-tree-selector.c                             |  346 ----
 ui/gcr-tree-selector.h                             |   70 -
 ui/gcr-ui.h                                        |   58 -
 ui/gcr-unlock-options-widget.c                     |  501 ------
 ui/gcr-unlock-options-widget.h                     |   82 -
 ui/gcr-unlock-options-widget.ui                    |  117 --
 ui/gcr-unlock-renderer.c                           |  345 ----
 ui/gcr-unlock-renderer.h                           |   83 -
 ui/gcr-viewer-tool.c                               |  126 --
 ui/gcr-viewer-widget.c                             |  680 --------
 ui/gcr-viewer-widget.h                             |   62 -
 ui/gcr-viewer-window.c                             |  201 ---
 ui/gcr-viewer-window.h                             |   67 -
 ui/gcr-viewer.c                                    |  181 ---
 ui/gcr-viewer.desktop.in.in                        |    7 -
 ui/gcr-viewer.h                                    |   85 -
 ui/meson.build                                     |  265 ----
 288 files changed, 3617 insertions(+), 24360 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]