removed obsolete PEM code in pluto/libstrongswan
This commit is contained in:
Martin Willi
@@ -36,7 +36,6 @@ modecfg.c modecfg.h \
|
||||
nat_traversal.c nat_traversal.h \
|
||||
ocsp.c ocsp.h \
|
||||
packet.c packet.h \
|
||||
pem.c pem.h \
|
||||
pgpcert.c pgpcert.h \
|
||||
pkcs7.c pkcs7.h \
|
||||
plutomain.c \
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
#include "defs.h"
|
||||
#include "log.h"
|
||||
#include "id.h"
|
||||
#include "pem.h"
|
||||
#include "certs.h"
|
||||
#include "whack.h"
|
||||
#include "builder.h"
|
||||
@@ -69,72 +68,6 @@ public_key_t* cert_get_public_key(const cert_t cert)
|
||||
}
|
||||
}
|
||||
|
||||
/* load a coded key or certificate file with autodetection
|
||||
* of binary DER or base64 PEM ASN.1 formats and armored PGP format
|
||||
*/
|
||||
bool load_coded_file(char *filename, prompt_pass_t *pass, const char *type,
|
||||
chunk_t *blob, bool *pgp)
|
||||
{
|
||||
err_t ugh = NULL;
|
||||
|
||||
FILE *fd = fopen(filename, "r");
|
||||
|
||||
if (fd)
|
||||
{
|
||||
int bytes;
|
||||
fseek(fd, 0, SEEK_END );
|
||||
blob->len = ftell(fd);
|
||||
rewind(fd);
|
||||
blob->ptr = malloc(blob->len);
|
||||
bytes = fread(blob->ptr, 1, blob->len, fd);
|
||||
fclose(fd);
|
||||
plog(" loaded %s file '%s' (%d bytes)", type, filename, bytes);
|
||||
|
||||
*pgp = FALSE;
|
||||
|
||||
/* try DER format */
|
||||
if (is_asn1(*blob))
|
||||
{
|
||||
DBG(DBG_PARSING,
|
||||
DBG_log(" file coded in DER format");
|
||||
)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* try PEM format */
|
||||
ugh = pemtobin(blob, pass, filename, pgp);
|
||||
|
||||
if (ugh == NULL)
|
||||
{
|
||||
if (*pgp)
|
||||
{
|
||||
DBG(DBG_PARSING,
|
||||
DBG_log(" file coded in armored PGP format");
|
||||
)
|
||||
return TRUE;
|
||||
}
|
||||
if (is_asn1(*blob))
|
||||
{
|
||||
DBG(DBG_PARSING,
|
||||
DBG_log(" file coded in PEM format");
|
||||
)
|
||||
return TRUE;
|
||||
}
|
||||
ugh = "file coded in unknown format, discarded";
|
||||
}
|
||||
|
||||
/* a conversion error has occured */
|
||||
plog(" %s", ugh);
|
||||
free(blob->ptr);
|
||||
*blob = chunk_empty;
|
||||
}
|
||||
else
|
||||
{
|
||||
plog(" could not open %s file '%s'", type, filename);
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Passphrase callback to read from whack fd
|
||||
*/
|
||||
|
||||
@@ -66,8 +66,6 @@ extern public_key_t* cert_get_public_key(const cert_t cert);
|
||||
extern chunk_t cert_get_encoding(cert_t cert);
|
||||
extern private_key_t* load_private_key(char* filename, prompt_pass_t *pass,
|
||||
key_type_t type);
|
||||
extern bool load_coded_file(char *filename, prompt_pass_t *pass,
|
||||
const char *type, chunk_t *blob, bool *pgp);
|
||||
extern bool load_cert(char *filename, const char *label, cert_t *cert);
|
||||
extern bool load_host_cert(char *filename, cert_t *cert);
|
||||
extern bool load_ca_cert(char *filename, cert_t *cert);
|
||||
|
||||
@@ -28,13 +28,11 @@
|
||||
#include <library.h>
|
||||
#include <debug.h>
|
||||
#include <asn1/asn1.h>
|
||||
#include <asn1/pem.h>
|
||||
|
||||
#include "constants.h"
|
||||
#include "defs.h"
|
||||
#include "log.h"
|
||||
#include "id.h"
|
||||
#include "pem.h"
|
||||
#include "x509.h"
|
||||
#include "ca.h"
|
||||
#include "whack.h"
|
||||
|
||||
-127
@@ -1,127 +0,0 @@
|
||||
/* Loading of PEM encoded files with optional encryption
|
||||
* Copyright (C) 2001-2009 Andreas Steffen
|
||||
*
|
||||
* HSR Hochschule fuer Technik Rapperswil
|
||||
*
|
||||
* 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. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/* decrypt a PEM encoded data block using DES-EDE3-CBC
|
||||
* see RFC 1423 PEM: Algorithms, Modes and Identifiers
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <stddef.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <freeswan.h>
|
||||
|
||||
#include <library.h>
|
||||
#include <asn1/pem.h>
|
||||
|
||||
#include "constants.h"
|
||||
#include "defs.h"
|
||||
#include "log.h"
|
||||
#include "whack.h"
|
||||
#include "pem.h"
|
||||
|
||||
/**
|
||||
* Converts a PEM encoded file into its binary form
|
||||
* RFC 1421 Privacy Enhancement for Electronic Mail, February 1993
|
||||
* RFC 934 Message Encapsulation, January 1985
|
||||
*/
|
||||
err_t pemtobin(chunk_t *blob, prompt_pass_t *pass, const char* label, bool *pgp)
|
||||
{
|
||||
chunk_t password = chunk_empty;
|
||||
|
||||
/* do we prompt for the passphrase? */
|
||||
if (pass && pass->prompt && pass->fd != NULL_FD)
|
||||
{
|
||||
int i;
|
||||
chunk_t blob_copy;
|
||||
err_t ugh = "invalid passphrase, too many trials";
|
||||
status_t status;
|
||||
|
||||
whack_log(RC_ENTERSECRET, "need passphrase for '%s'", label);
|
||||
|
||||
for (i = 0; i < MAX_PROMPT_PASS_TRIALS; i++)
|
||||
{
|
||||
int n;
|
||||
|
||||
if (i > 0)
|
||||
{
|
||||
whack_log(RC_ENTERSECRET, "invalid passphrase, please try again");
|
||||
}
|
||||
n = read(pass->fd, pass->secret, PROMPT_PASS_LEN);
|
||||
|
||||
if (n == -1)
|
||||
{
|
||||
err_t ugh = "read(whackfd) failed";
|
||||
|
||||
whack_log(RC_LOG_SERIOUS,ugh);
|
||||
return ugh;
|
||||
}
|
||||
|
||||
pass->secret[n-1] = '\0';
|
||||
|
||||
if (strlen(pass->secret) == 0)
|
||||
{
|
||||
err_t ugh = "no passphrase entered, aborted";
|
||||
|
||||
whack_log(RC_LOG_SERIOUS, ugh);
|
||||
return ugh;
|
||||
}
|
||||
|
||||
blob_copy = chunk_clone(*blob);
|
||||
password = chunk_create(pass->secret, strlen(pass->secret));
|
||||
|
||||
status = pem_to_bin(blob, password, pgp);
|
||||
if (status != INVALID_ARG)
|
||||
{
|
||||
if (status == SUCCESS)
|
||||
{
|
||||
whack_log(RC_SUCCESS, "valid passphrase");
|
||||
}
|
||||
else
|
||||
{
|
||||
whack_log(RC_LOG_SERIOUS, "%N, aborted", status_names, status);
|
||||
}
|
||||
free(blob_copy.ptr);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* blob is useless after wrong decryption, restore the original */
|
||||
free(blob->ptr);
|
||||
*blob = blob_copy;
|
||||
}
|
||||
whack_log(RC_LOG_SERIOUS, ugh);
|
||||
return ugh;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (pass)
|
||||
{
|
||||
password = chunk_create(pass->secret, strlen(pass->secret));
|
||||
}
|
||||
if (pem_to_bin(blob, password, pgp) == SUCCESS)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
return "pem to bin conversion failed";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
/* Loading of PEM encoded files with optional encryption
|
||||
* Copyright (C) 2001-2009 Andreas Steffen
|
||||
*
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
*
|
||||
* 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. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
extern err_t pemtobin(chunk_t *blob, prompt_pass_t *pass, const char* label,
|
||||
bool *pgp);
|
||||
Reference in New Issue
Block a user