diff options
author | marha <marha@users.sourceforge.net> | 2014-09-02 18:48:52 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-09-02 18:48:52 +0200 |
commit | dea8f13d8104872dec9243abe06f3d9e4c807ccd (patch) | |
tree | b01e5b901eaca45f1e3aa2b6fddfd45ca271ee75 /openssl/demos/maurice/loadkeys.h | |
parent | 3293021e6f582c7348667e7638941620134525e1 (diff) | |
parent | 04168ae281bfbd714ddf6b90d98eac892508dde8 (diff) | |
download | vcxsrv-dea8f13d8104872dec9243abe06f3d9e4c807ccd.tar.gz vcxsrv-dea8f13d8104872dec9243abe06f3d9e4c807ccd.tar.bz2 vcxsrv-dea8f13d8104872dec9243abe06f3d9e4c807ccd.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
openssl/crypto/opensslconf.h
Diffstat (limited to 'openssl/demos/maurice/loadkeys.h')
-rw-r--r-- | openssl/demos/maurice/loadkeys.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/openssl/demos/maurice/loadkeys.h b/openssl/demos/maurice/loadkeys.h deleted file mode 100644 index d8fde86eb..000000000 --- a/openssl/demos/maurice/loadkeys.h +++ /dev/null @@ -1,19 +0,0 @@ -/* NOCW */ -/* - Please read the README file for condition of use, before - using this software. - - Maurice Gittens <mgittens@gits.nl> January 1997 - -*/ - -#ifndef LOADKEYS_H_SEEN -#define LOADKEYS_H_SEEN - -#include <openssl/evp.h> - -EVP_PKEY * ReadPublicKey(const char *certfile); -EVP_PKEY *ReadPrivateKey(const char *keyfile); - -#endif - |