diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-20 16:13:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-20 16:13:23 -0800 |
| commit | 1a4edd9072d3826f1b1234a9b3cc69fcfdebdbfa (patch) | |
| tree | f57a889e4b66b3f5069321ce845655637000a477 | |
| parent | 7e16838d94b566a17b65231073d179bc04d590c8 (diff) | |
| parent | 59cca653a601372e9b4a430d867377a3e4a36d76 (diff) | |
| download | blackbird-obmc-linux-1a4edd9072d3826f1b1234a9b3cc69fcfdebdbfa.tar.gz blackbird-obmc-linux-1a4edd9072d3826f1b1234a9b3cc69fcfdebdbfa.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
digsig: changed type of the timestamp
| -rw-r--r-- | include/linux/digsig.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/digsig.h b/include/linux/digsig.h index b01558b15814..6f85a070bb45 100644 --- a/include/linux/digsig.h +++ b/include/linux/digsig.h @@ -30,7 +30,7 @@ enum digest_algo { struct pubkey_hdr { uint8_t version; /* key format version */ - time_t timestamp; /* key made, always 0 for now */ + uint32_t timestamp; /* key made, always 0 for now */ uint8_t algo; uint8_t nmpi; char mpi[0]; @@ -38,7 +38,7 @@ struct pubkey_hdr { struct signature_hdr { uint8_t version; /* signature format version */ - time_t timestamp; /* signature made */ + uint32_t timestamp; /* signature made */ uint8_t algo; uint8_t hash; uint8_t keyid[8]; |
