summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/ssh/rsa.c4
-rw-r--r--usr.bin/ssh/rsa.h4
-rw-r--r--usr.bin/ssh/ssh-agent.c8
-rw-r--r--usr.bin/ssh/ssh-keygen.c4
4 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/ssh/rsa.c b/usr.bin/ssh/rsa.c
index f69f99606bb..113ee7fc423 100644
--- a/usr.bin/ssh/rsa.c
+++ b/usr.bin/ssh/rsa.c
@@ -60,7 +60,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: rsa.c,v 1.22 2001/03/26 23:23:23 markus Exp $");
+RCSID("$OpenBSD: rsa.c,v 1.23 2001/06/27 05:42:24 markus Exp $");
#include "rsa.h"
#include "log.h"
@@ -121,7 +121,7 @@ rsa_private_decrypt(BIGNUM *out, BIGNUM *in, RSA *key)
}
void
-generate_additional_parameters(RSA *rsa)
+rsa_generate_additional_parameters(RSA *rsa)
{
BIGNUM *aux;
BN_CTX *ctx;
diff --git a/usr.bin/ssh/rsa.h b/usr.bin/ssh/rsa.h
index 70756f83c0d..2f596d49151 100644
--- a/usr.bin/ssh/rsa.h
+++ b/usr.bin/ssh/rsa.h
@@ -11,7 +11,7 @@
* called by a name other than "ssh" or "Secure Shell".
*/
-/* RCSID("$OpenBSD: rsa.h,v 1.13 2001/06/26 17:27:24 markus Exp $"); */
+/* RCSID("$OpenBSD: rsa.h,v 1.14 2001/06/27 05:42:24 markus Exp $"); */
#ifndef RSA_H
#define RSA_H
@@ -21,6 +21,6 @@
void rsa_public_encrypt(BIGNUM *, BIGNUM *, RSA *);
int rsa_private_decrypt(BIGNUM *, BIGNUM *, RSA *);
-void generate_additional_parameters(RSA *);
+void rsa_generate_additional_parameters(RSA *);
#endif /* RSA_H */
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c
index 288eb6914c0..eb4f69d9a22 100644
--- a/usr.bin/ssh/ssh-agent.c
+++ b/usr.bin/ssh/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.59 2001/06/26 05:33:34 markus Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.60 2001/06/27 05:42:25 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -36,7 +36,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.59 2001/06/26 05:33:34 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.60 2001/06/27 05:42:25 markus Exp $");
#include <openssl/evp.h>
#include <openssl/md5.h>
@@ -381,7 +381,7 @@ process_add_identity(SocketEntry *e, int version)
buffer_get_bignum(&e->input, k->rsa->p); /* q */
/* Generate additional parameters */
- generate_additional_parameters(k->rsa);
+ rsa_generate_additional_parameters(k->rsa);
break;
case 2:
type_name = buffer_get_string(&e->input, NULL);
@@ -406,7 +406,7 @@ process_add_identity(SocketEntry *e, int version)
buffer_get_bignum2(&e->input, k->rsa->q);
/* Generate additional parameters */
- generate_additional_parameters(k->rsa);
+ rsa_generate_additional_parameters(k->rsa);
break;
default:
buffer_clear(&e->input);
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index 758ab65a1b3..5060643316e 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.67 2001/06/27 05:35:42 markus Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.68 2001/06/27 05:42:25 markus Exp $");
#include <openssl/evp.h>
#include <openssl/pem.h>
@@ -260,7 +260,7 @@ do_convert_private_ssh2_from_blob(char *blob, int blen)
buffer_get_bignum_bits(&b, key->rsa->iqmp);
buffer_get_bignum_bits(&b, key->rsa->q);
buffer_get_bignum_bits(&b, key->rsa->p);
- generate_additional_parameters(key->rsa);
+ rsa_generate_additional_parameters(key->rsa);
break;
}
rlen = buffer_len(&b);