7 files changed, 70 insertions, 36 deletions

diff --git a/src/lib/libssl/src/demos/maurice/Makefile b/src/lib/libssl/src/demos/maurice/Makefile
index fa67dcca81..f9bf62276e 100644
--- a/src/lib/libssl/src/demos/maurice/Makefile
+++ b/src/lib/libssl/src/demos/maurice/Makefile
@@ -1,6 +1,6 @@
 CC=cc
-CFLAGS= -g -I../../include
-LIBS= -L/usr/local/ssl/lib -L../.. -lcrypto
+CFLAGS= -g -I../../include -Wall
+LIBS=  -L../.. -lcrypto
 EXAMPLES=example1 example2 example3 example4
 
 all: $(EXAMPLES) 
@@ -17,7 +17,43 @@ example3: example3.o
 example4: example4.o
         $(CC) -o example4 example4.o $(LIBS)
 
-        
 clean:  
         rm -f $(EXAMPLES) *.o
 
+test: all
+        @echo
+        @echo Example 1 Demonstrates the sealing and opening APIs
+        @echo Doing the encrypt side...
+        ./example1 <README >t.t
+        @echo Doing the decrypt side...
+        ./example1 -d <t.t >t.2
+        diff t.2 README
+        rm -f t.t t.2
+        @echo  example1 is OK
+
+        @echo
+        @echo Example2 Demonstrates rsa encryption and decryption
+        @echo   and it should just print \"This the clear text\"
+        ./example2
+
+        @echo
+        @echo Example3 Demonstrates the use of symmetric block ciphers
+        @echo in this case it uses EVP_des_ede3_cbc
+        @echo i.e. triple DES in Cipher Block Chaining mode
+        @echo Doing the encrypt side...
+        ./example3 ThisIsThePassword <README >t.t
+        @echo Doing the decrypt side...
+        ./example3 -d ThisIsThePassword <t.t >t.2
+        diff t.2 README
+        rm -f t.t t.2
+        @echo  example3 is OK
+
+        @echo
+        @echo Example4 Demonstrates base64 encoding and decoding
+        @echo Doing the encrypt side...
+        ./example4 <README >t.t
+        @echo Doing the decrypt side...
+        ./example4 -d <t.t >t.2
+        diff t.2 README
+        rm -f t.t t.2
+        @echo example4 is OK
diff --git a/src/lib/libssl/src/demos/maurice/example1.c b/src/lib/libssl/src/demos/maurice/example1.c
index 77730d3232..0e70523a33 100644
--- a/src/lib/libssl/src/demos/maurice/example1.c
+++ b/src/lib/libssl/src/demos/maurice/example1.c
@@ -13,13 +13,13 @@
 #include <strings.h>
 #include <stdlib.h>
 
-#include "rsa.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
-#include "err.h"
-#include "pem.h"
-#include "ssl.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>
 
 #include "loadkeys.h"
 
diff --git a/src/lib/libssl/src/demos/maurice/example2.c b/src/lib/libssl/src/demos/maurice/example2.c
index 99f7b22440..57bce10b5e 100644
--- a/src/lib/libssl/src/demos/maurice/example2.c
+++ b/src/lib/libssl/src/demos/maurice/example2.c
@@ -10,13 +10,13 @@
 #include <stdio.h>
 #include <strings.h>
 
-#include "rsa.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
-#include "err.h"
-#include "pem.h"
-#include "ssl.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>
 
 #include "loadkeys.h"
 
@@ -33,7 +33,6 @@ int main()
         EVP_PKEY *pubKey;
         EVP_PKEY *privKey;
         int len;
-        FILE *fp;
 
         ERR_load_crypto_strings();
 
@@ -72,6 +71,5 @@ int main()
         EVP_PKEY_free(pubKey);
         free(buf);
         free(buf2);
+        return 0;
 }
-
-
diff --git a/src/lib/libssl/src/demos/maurice/example3.c b/src/lib/libssl/src/demos/maurice/example3.c
index fcaff00c37..c8462a47c3 100644
--- a/src/lib/libssl/src/demos/maurice/example3.c
+++ b/src/lib/libssl/src/demos/maurice/example3.c
@@ -8,9 +8,10 @@
 */
 
 #include <stdio.h>
+#include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <evp.h>
+#include <openssl/evp.h>
 
 #define STDIN           0
 #define STDOUT          1
@@ -47,9 +48,9 @@ void do_cipher(char *pw, int operation)
 {
         char buf[BUFLEN];
         char ebuf[BUFLEN + 8];
-        unsigned int ebuflen, rc;
+        unsigned int ebuflen; /* rc; */
         unsigned char iv[EVP_MAX_IV_LENGTH], key[EVP_MAX_KEY_LENGTH];
-        unsigned int ekeylen, net_ekeylen; 
+        /* unsigned int ekeylen, net_ekeylen;  */
         EVP_CIPHER_CTX ectx;
         
         memcpy(iv, INIT_VECTOR, sizeof(iv));
@@ -82,5 +83,3 @@ void do_cipher(char *pw, int operation)
 
         write(STDOUT, ebuf, ebuflen); 
 }
-
-
diff --git a/src/lib/libssl/src/demos/maurice/example4.c b/src/lib/libssl/src/demos/maurice/example4.c
index d436a20019..ce629848b7 100644
--- a/src/lib/libssl/src/demos/maurice/example4.c
+++ b/src/lib/libssl/src/demos/maurice/example4.c
@@ -8,9 +8,10 @@
 */
 
 #include <stdio.h>
+#include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <evp.h>
+#include <openssl/evp.h>
 
 #define STDIN           0
 #define STDOUT          1
@@ -44,7 +45,7 @@ void do_encode()
 {
         char buf[BUFLEN];
         char ebuf[BUFLEN+24];
-        unsigned int ebuflen, rc;
+        unsigned int ebuflen;
         EVP_ENCODE_CTX ectx;
         
         EVP_EncodeInit(&ectx);
@@ -78,7 +79,7 @@ void do_decode()
 {
         char buf[BUFLEN];
         char ebuf[BUFLEN+24];
-        unsigned int ebuflen, rc;
+        unsigned int ebuflen;
         EVP_ENCODE_CTX ectx;
         
         EVP_DecodeInit(&ectx);
diff --git a/src/lib/libssl/src/demos/maurice/loadkeys.c b/src/lib/libssl/src/demos/maurice/loadkeys.c
index 7c89f071f3..0f3464753a 100644
--- a/src/lib/libssl/src/demos/maurice/loadkeys.c
+++ b/src/lib/libssl/src/demos/maurice/loadkeys.c
@@ -14,13 +14,13 @@
 #include <strings.h>
 #include <stdlib.h>
 
-#include "rsa.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
-#include "err.h"
-#include "pem.h"
-#include "ssl.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)
 {
diff --git a/src/lib/libssl/src/demos/maurice/loadkeys.h b/src/lib/libssl/src/demos/maurice/loadkeys.h
index e42c6f8dc4..d8fde86eb7 100644
--- a/src/lib/libssl/src/demos/maurice/loadkeys.h
+++ b/src/lib/libssl/src/demos/maurice/loadkeys.h
@@ -10,7 +10,7 @@
 #ifndef LOADKEYS_H_SEEN
 #define LOADKEYS_H_SEEN
 
-#include "evp.h"
+#include <openssl/evp.h>
 
 EVP_PKEY * ReadPublicKey(const char *certfile);
 EVP_PKEY *ReadPrivateKey(const char *keyfile);