diff options
author | des <des@FreeBSD.org> | 2002-03-18 10:09:43 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2002-03-18 10:09:43 +0000 |
commit | 6534271ec8abc00a8016a575a8e7151d944ef5a8 (patch) | |
tree | a7d90beaf7fa4922f64c5a6eca7154fa082e43a1 /crypto/openssh/rsa.h | |
parent | d3e3318ac7d7a176fefa5849509c01442694b4c7 (diff) | |
download | FreeBSD-src-6534271ec8abc00a8016a575a8e7151d944ef5a8.zip FreeBSD-src-6534271ec8abc00a8016a575a8e7151d944ef5a8.tar.gz |
Fix conflicts.
Diffstat (limited to 'crypto/openssh/rsa.h')
-rw-r--r-- | crypto/openssh/rsa.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/crypto/openssh/rsa.h b/crypto/openssh/rsa.h index f5e0c96..5ea6e28 100644 --- a/crypto/openssh/rsa.h +++ b/crypto/openssh/rsa.h @@ -1,3 +1,6 @@ +/* $OpenBSD: rsa.h,v 1.15 2002/03/04 17:27:39 stevesk Exp $ */ +/* $FreeBSD$ */ + /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -11,18 +14,14 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$OpenBSD: rsa.h,v 1.11 2001/03/26 23:23:24 markus Exp $"); */ -/* RCSID("$FreeBSD$"); */ - #ifndef RSA_H #define RSA_H #include <openssl/bn.h> #include <openssl/rsa.h> -void rsa_public_encrypt __P((BIGNUM * out, BIGNUM * in, RSA * prv)); -int rsa_private_decrypt __P((BIGNUM * out, BIGNUM * in, RSA * prv)); - -void generate_additional_parameters __P((RSA *rsa)); +void rsa_public_encrypt(BIGNUM *, BIGNUM *, RSA *); +int rsa_private_decrypt(BIGNUM *, BIGNUM *, RSA *); +void rsa_generate_additional_parameters(RSA *); #endif /* RSA_H */ |