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

diff --git a/crypt.c b/crypt.c
index 34eeb407ed6a33a2487e449dcb87b297b89c6e85..cf1cabecbad80cdca6d69cf2bbc2165427a84ed8 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -18,15 +18,10 @@
 
 /** \file crypt.c openssl-based RSA encryption/decryption routines */
 
-#include <openssl/pem.h>
 #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 c670755cc4834c431dbd77a967c0750cc7406a1d..2f51ff52977d0f413ab7cfb5eb9384524289adb7 100644 (file)
--- a/crypt.h
+++ b/crypt.h
@@ -1,5 +1,24 @@
-#include <openssl/pem.h>
+/*
+ * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ *
+ *     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 <openssl/pem.h>
 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 20efdce4e233c4a1f67a50c83a12b5b02cd9a94c..7d7953215b7a8a0c7a52bc1c0c39d3eb432d54ef 100644 (file)
--- 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;