summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-07-04 05:02:23 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-07-04 05:02:23 +0000
commitf7297dd79d37768c5cdd55ca15d2cf13963b7281 (patch)
tree82d2dbbe6a4243077c37fc3d681042c82ba58922
parent680b276aad588b1006b5199a66e374d3f0936079 (diff)
- markus@cvs.openbsd.org 2001/06/27 05:42:25
[rsa.c rsa.h ssh-agent.c ssh-keygen.c] s/generate_additional_parameters/rsa_generate_additional_parameters/ http://www.humppa.com/
-rw-r--r--ChangeLog6
-rw-r--r--rsa.c4
-rw-r--r--rsa.h4
-rw-r--r--ssh-agent.c8
-rw-r--r--ssh-keygen.c4
5 files changed, 15 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 67bcb492..27d34d0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,10 @@
- markus@cvs.openbsd.org 2001/06/27 05:35:42
[ssh-keygen.c]
use cyberflex_inq_class to inquire class.
+ - markus@cvs.openbsd.org 2001/06/27 05:42:25
+ [rsa.c rsa.h ssh-agent.c ssh-keygen.c]
+ s/generate_additional_parameters/rsa_generate_additional_parameters/
+ http://www.humppa.com/
20010629
- (bal) Removed net_aton() since we don't use it any more
@@ -5916,4 +5920,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1364 2001/07/04 05:00:11 mouring Exp $
+$Id: ChangeLog,v 1.1365 2001/07/04 05:02:23 mouring Exp $
diff --git a/rsa.c b/rsa.c
index f69f9960..113ee7fc 100644
--- a/rsa.c
+++ b/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/rsa.h b/rsa.h
index 70756f83..2f596d49 100644
--- a/rsa.h
+++ b/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/ssh-agent.c b/ssh-agent.c
index 41dd777c..309b9d41 100644
--- a/ssh-agent.c
+++ b/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>
@@ -385,7 +385,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);
@@ -410,7 +410,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/ssh-keygen.c b/ssh-keygen.c
index cd5d5e55..e085c12c 100644
--- a/ssh-keygen.c
+++ b/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>
@@ -264,7 +264,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);