diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-04-07 09:59:38 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-04-07 09:59:38 +0200 |
| commit | 5d834decbe062273393acfcf172fdd29ead6a166 (patch) | |
| tree | 1eeea5cf915f7779aaa77421327caaa7525e91e0 /include | |
| parent | 53adf0648c330357103e4a7103c3d7f05c0c4bcf (diff) | |
| parent | 7b3d284f4bad78d61e9f5d32ec5aa1efc19ce733 (diff) | |
| download | barebox-5d834decbe062273393acfcf172fdd29ead6a166.tar.gz barebox-5d834decbe062273393acfcf172fdd29ead6a166.tar.xz | |
Merge branch 'for-next/state'
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/keystore.h | 4 | ||||
| -rw-r--r-- | include/state.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/crypto/keystore.h b/include/crypto/keystore.h index 29915854b8..89d962628b 100644 --- a/include/crypto/keystore.h +++ b/include/crypto/keystore.h @@ -12,6 +12,7 @@ #ifdef CONFIG_CRYPTO_KEYSTORE int keystore_get_secret(const char *name, const u8 **secret, int *secret_len); int keystore_set_secret(const char *name, const u8 *secret, int secret_len); +void keystore_forget_secret(const char *name); #else static inline int keystore_get_secret(const char *name, const u8 **secret, int *secret_len) { @@ -21,6 +22,9 @@ static inline int keystore_set_secret(const char *name, const u8 *secret, int se { return 0; } +static inline void keystore_forget_secret(const char *name) +{ +} #endif #endif diff --git a/include/state.h b/include/state.h index bc9a574093..63164f92e5 100644 --- a/include/state.h +++ b/include/state.h @@ -18,6 +18,7 @@ struct state *state_by_name(const char *name); struct state *state_by_node(const struct device_node *node); int state_get_name(const struct state *state, char const **name); +int state_load_no_auth(struct state *state); int state_load(struct state *state); int state_save(struct state *state); void state_info(void); |