summaryrefslogtreecommitdiff
path: root/crypto/libdes/rpw.c
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/libdes/rpw.c')
-rw-r--r--crypto/libdes/rpw.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/crypto/libdes/rpw.c b/crypto/libdes/rpw.c
index 3ca4cec85688..0b6b1519b074 100644
--- a/crypto/libdes/rpw.c
+++ b/crypto/libdes/rpw.c
@@ -1,9 +1,9 @@
/* crypto/des/rpw.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@mincom.oz.au)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* This package is an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
+ * by Eric Young (eay@cryptsoft.com).
* The implementation was written so as to conform with Netscapes SSL.
*
* This library is free for commercial and non-commercial use as long as
@@ -11,7 +11,7 @@
* apply to all code found in this distribution, be it the RC4, RSA,
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
* included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@mincom.oz.au).
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
*
* Copyright remains Eric Young's, and as such any Copyright notices in
* the code are not to be removed.
@@ -31,12 +31,12 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* "This product includes cryptographic software written by
- * Eric Young (eay@mincom.oz.au)"
+ * Eric Young (eay@cryptsoft.com)"
* The word 'cryptographic' can be left out if the rouines from the library
* being used are not cryptographic related :-).
* 4. If you include any Windows specific code (or a derivative thereof) from
* the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@mincom.oz.au)"
+ * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
*
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -56,21 +56,16 @@
* [including the GNU Public Licence.]
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
#include <stdio.h>
-#include "des.h"
+#include <openssl/des.h>
-int main(argc,argv)
-int argc;
-char *argv[];
+int main(int argc, char *argv[])
{
des_cblock k,k1;
int i;
printf("read passwd\n");
- if ((i=des_read_password((C_Block *)k,"Enter password:",0)) == 0)
+ if ((i=des_read_password(&k,"Enter password:",0)) == 0)
{
printf("password = ");
for (i=0; i<8; i++)
@@ -80,7 +75,7 @@ char *argv[];
printf("error %d\n",i);
printf("\n");
printf("read 2passwds and verify\n");
- if ((i=des_read_2passwords((C_Block *)k,(C_Block *)k1,
+ if ((i=des_read_2passwords(&k,&k1,
"Enter verified password:",1)) == 0)
{
printf("password1 = ");