From 3580fe47cc87b25aa0497eb54387e1165ba17407 Mon Sep 17 00:00:00 2001 From: Andre Date: Wed, 1 Nov 2006 13:19:18 +0100 Subject: [PATCH] move LOAD_PUBLIC_KEY and LOAD_PRIVATE_KEY to crypt.h and use LOAD_PUBLIC_KEY instead of hardcoding its value in server.c. Also, add a GPL header to crypt.h --- crypt.c | 7 +------ crypt.h | 26 +++++++++++++++++++++++++- server.c | 2 +- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/crypt.c b/crypt.c index 34eeb407..cf1cabec 100644 --- a/crypt.c +++ b/crypt.c @@ -18,15 +18,10 @@ /** \file crypt.c openssl-based RSA encryption/decryption routines */ -#include #include "para.h" #include "error.h" #include "string.h" - -/** \cond used to distinguish between loading of private/public key */ -#define LOAD_PUBLIC_KEY 0 -#define LOAD_PRIVATE_KEY 1 -/** \endcond **/ +#include "crypt.h" static EVP_PKEY *load_key(const char *file, int private) { diff --git a/crypt.h b/crypt.h index c670755c..2f51ff52 100644 --- a/crypt.h +++ b/crypt.h @@ -1,5 +1,24 @@ -#include +/* + * Copyright (C) 2005-2006 Andre Noll + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + */ + /** \file crypt.h prototypes for the RSA crypt functions */ + +#include int para_decrypt_challenge(char *key_file, long unsigned *challenge_nr, unsigned char *buf, int rsa_inlen); int para_encrypt_challenge(RSA* rsa, long unsigned challenge_nr, @@ -9,3 +28,8 @@ int para_encrypt_buffer(RSA* rsa, unsigned char *inbuf, const unsigned len, int para_decrypt_buffer(char *key_file, unsigned char *outbuf, unsigned char *inbuf, int rsa_inlen); int get_rsa_key(char *key_file, RSA **rsa, int private); + +/** \cond used to distinguish between loading of private/public key */ +#define LOAD_PUBLIC_KEY 0 +#define LOAD_PRIVATE_KEY 1 +/** \endcond **/ diff --git a/server.c b/server.c index 20efdce4..7d795321 100644 --- a/server.c +++ b/server.c @@ -308,7 +308,7 @@ static void populate_user_list(void) { u = para_malloc(sizeof(struct user)); u->name = para_strdup(n); u->rsa = para_malloc(sizeof(RSA)); - ret = get_rsa_key(k, &u->rsa, 0 /* public */); + ret = get_rsa_key(k, &u->rsa, LOAD_PUBLIC_KEY); if (ret < 0) break; u->perms = 0; -- 2.39.2