diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-07-08 06:02:40 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-07-08 06:02:40 +0000 |
commit | cb1f595c229551038d09ec2eede8a72f63dcb1ec (patch) | |
tree | c3f614e644ea1990edb213cc3b19072d3be04892 /sbin | |
parent | 32b062905cc85547942ab8b0be2d49828e42932e (diff) |
Bad merge
Diffstat (limited to 'sbin')
-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 */ |