Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4176
b: refs/heads/master
c: 176c365
h: refs/heads/master
v: v3
  • Loading branch information
Adrian Bunk authored and David S. Miller committed Jul 6, 2005
1 parent 4fcd1d8 commit 63c5515
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 28e8c3ad9464de54a632f00ab3df88fa5f4652d1
refs/heads/master: 176c3652c544b6f8d4bb1984c58c10080f45dbf0
10 changes: 9 additions & 1 deletion trunk/crypto/api.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <linux/init.h>
#include <linux/crypto.h>
#include <linux/errno.h>
#include <linux/kmod.h>
#include <linux/rwsem.h>
#include <linux/slab.h>
#include "internal.h"
Expand All @@ -33,7 +34,7 @@ static inline void crypto_alg_put(struct crypto_alg *alg)
module_put(alg->cra_module);
}

struct crypto_alg *crypto_alg_lookup(const char *name)
static struct crypto_alg *crypto_alg_lookup(const char *name)
{
struct crypto_alg *q, *alg = NULL;

Expand All @@ -54,6 +55,13 @@ struct crypto_alg *crypto_alg_lookup(const char *name)
return alg;
}

/* A far more intelligent version of this is planned. For now, just
* try an exact match on the name of the algorithm. */
static inline struct crypto_alg *crypto_alg_mod_lookup(const char *name)
{
return try_then_request_module(crypto_alg_lookup(name), name);
}

static int crypto_init_flags(struct crypto_tfm *tfm, u32 flags)
{
tfm->crt_flags = 0;
Expand Down
10 changes: 0 additions & 10 deletions trunk/crypto/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <linux/highmem.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/kmod.h>
#include <asm/kmap_types.h>

extern enum km_type crypto_km_types[];
Expand All @@ -42,15 +41,6 @@ static inline void crypto_yield(struct crypto_tfm *tfm)
cond_resched();
}

struct crypto_alg *crypto_alg_lookup(const char *name);

/* A far more intelligent version of this is planned. For now, just
* try an exact match on the name of the algorithm. */
static inline struct crypto_alg *crypto_alg_mod_lookup(const char *name)
{
return try_then_request_module(crypto_alg_lookup(name), name);
}

#ifdef CONFIG_CRYPTO_HMAC
int crypto_alloc_hmac_block(struct crypto_tfm *tfm);
void crypto_free_hmac_block(struct crypto_tfm *tfm);
Expand Down

0 comments on commit 63c5515

Please sign in to comment.