From 084adb601f2d375395c6cdcedf8af91f1065fe4e Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Mon, 9 Oct 2006 16:22:20 +0000
Subject: Feh, wrong vendor branch merge proceedure, clean up before trying
 again.

svn path=/openssl/vendor/0.9.8d; revision=374
---
 openssl/vendor/0.9.8d/demos/maurice/loadkeys.c | 72 --------------------------
 1 file changed, 72 deletions(-)
 delete mode 100644 openssl/vendor/0.9.8d/demos/maurice/loadkeys.c

(limited to 'openssl/vendor/0.9.8d/demos/maurice/loadkeys.c')

diff --git a/openssl/vendor/0.9.8d/demos/maurice/loadkeys.c b/openssl/vendor/0.9.8d/demos/maurice/loadkeys.c
deleted file mode 100644
index 82fd22a9..00000000
--- a/openssl/vendor/0.9.8d/demos/maurice/loadkeys.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* NOCW */
-/*
-        Please read the README file for condition of use, before
-        using this software.
-
-        Maurice Gittens  <mgittens@gits.nl>   January 1997
-
-*/
-
-#include <unistd.h>
-#include <stdio.h>
-#include <netinet/in.h>
-#include <fcntl.h>
-#include <strings.h>
-#include <stdlib.h>
-
-#include <openssl/rsa.h>
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-#include <openssl/err.h>
-#include <openssl/pem.h>
-#include <openssl/ssl.h>
-
-EVP_PKEY * ReadPublicKey(const char *certfile)
-{
-  FILE *fp = fopen (certfile, "r");   
-  X509 *x509;
-  EVP_PKEY *pkey;
-
-  if (!fp) 
-     return NULL; 
-
-  x509 = PEM_read_X509(fp, NULL, 0, NULL);
-
-  if (x509 == NULL) 
-  {  
-     ERR_print_errors_fp (stderr);
-     return NULL;   
-  }
-
-  fclose (fp);
-  
-  pkey=X509_extract_key(x509);
-
-  X509_free(x509);
-
-  if (pkey == NULL) 
-     ERR_print_errors_fp (stderr);
-
-  return pkey; 
-}
-
-EVP_PKEY *ReadPrivateKey(const char *keyfile)
-{
-	FILE *fp = fopen(keyfile, "r");
-	EVP_PKEY *pkey;
-
-	if (!fp)
-		return NULL;
-
-	pkey = PEM_read_PrivateKey(fp, NULL, 0, NULL);
-
-	fclose (fp);
-
-  	if (pkey == NULL) 
-		ERR_print_errors_fp (stderr);   
-
-	return pkey;
-}
-
-
-- 
cgit v1.2.3