diff options
| author |   niklas <niklas@openbsd.org> | 1999-07-08 06:02:39 +0000 |
|---|---|---|
| committer | niklas <niklas@openbsd.org> | 1999-07-08 06:02:39 +0000 |
| commit | 134301cd99d1cac4fc988e771ac49000cde194e3 (patch) | |
| tree | 8bdd2851f6bdbed3fd6423083566f125810f7a3f | |
| parent | Fix references to -i, -o and -h. (diff) | |
| download | wireguard-openbsd-134301cd99d1cac4fc988e771ac49000cde194e3.tar.xz wireguard-openbsd-134301cd99d1cac4fc988e771ac49000cde194e3.zip | |
Bad merge
| -rw-r--r-- | sbin/isakmpd/pkcs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/isakmpd/pkcs.c b/sbin/isakmpd/pkcs.c index b31fb2dd3f3..03830424299 100644 --- a/sbin/isakmpd/pkcs.c +++ b/sbin/isakmpd/pkcs.c @@ -1,4 +1,4 @@ -/* $Id: pkcs.c,v 1.9 1999/07/07 22:10:44 niklas Exp $ */ +/* $Id: pkcs.c,v 1.10 1999/07/08 06:02:39 niklas Exp $ */ /* * Copyright (c) 1998 Niels Provos. All rights reserved. @@ -342,8 +342,8 @@ int pkcs_generate_rsa_keypair (struct rsa_public_key *pubk, struct rsa_private_key *seck, u_int32_t bits) { -- /* XXX Always fail until we interface legal (in the US) RSA code. */ -- return 0; + /* XXX Always fail until we interface legal (in the US) RSA code. */ + return 0; } /* Generate a random prime with at most bits significant bits */ |