Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
G
GLib
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 1,168
    • Issues 1,168
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 48
    • Merge Requests 48
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • GNOME
  • GLib
  • Merge Requests
  • !522

Merged
Opened Dec 10, 2018 by Fredrik Ternerot@fredtrot
  • Report abuse
Report abuse

gtlscertificate: Add support for TPM keys in PEM files

Add support for creating GTlsCertificate from PEM file containing the 'TSS2 PRIVATE KEY' guard string used for TPM protected keys.

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gitlab.gnome.org/fredtrot/glib.git tpm-keys-in-pem-files
git checkout -b fredtrot/glib-tpm-keys-in-pem-files FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff fredtrot/glib-tpm-keys-in-pem-files

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 34
  • Commits 3
  • Pipelines 4
  • Changes 8
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
Labels
GTlsBackend
Assign labels
  • View project labels
Reference: GNOME/glib!522

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.