'passwd' tool.

[openssl.git] / apps / enc.c

diff --git a/apps/enc.c b/apps/enc.c
index d033e380c4febf2e8acf3123ed2264d118500227..0beb6377d7a873699cde067f85d01c326fa69a76 100644 (file)
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -82,6 +82,8 @@ int set_hex(char *in,unsigned char *out,int size);
 
 int MAIN(int argc, char **argv)
        {
+       static const char magic[]="Salted__";
+       char mbuf[8];   /* should be 1 smaller than magic */
        char *strbuf=NULL;
        unsigned char *buff=NULL,*bufsize=NULL;
        int bsize=BSIZE,verbose=0;
@@ -91,7 +93,7 @@ int MAIN(int argc, char **argv)
        char *str=NULL;
        char *hkey=NULL,*hiv=NULL,*hsalt = NULL;
        int enc=1,printkey=0,i,base64=0;
-       int debug=0,olb64=0,nosalt=1;
+       int debug=0,olb64=0,nosalt=0;
        const EVP_CIPHER *cipher=NULL,*c;
        char *inf=NULL,*outf=NULL;
        BIO *in=NULL,*out=NULL,*b64=NULL,*benc=NULL,*rbio=NULL,*wbio=NULL;
@@ -243,7 +245,7 @@ bad:
                        BIO_printf(bio_err,"rc2     :128 bit key RC2 encryption\n");
 #endif
 #ifndef NO_BF
-                       BIO_printf(bio_err,"bf      :128 bit key BlowFish encryption\n");
+                       BIO_printf(bio_err,"bf      :128 bit key Blowfish encryption\n");
 #endif
 #ifndef NO_RC4
                        BIO_printf(bio_err," -%-5s :128 bit key RC4 encryption\n",
@@ -446,19 +448,29 @@ bad:
                                                                "invalid hex salt value\n");
                                                        goto end;
                                                }
-                                       } else RAND_bytes(salt, PKCS5_SALT_LEN);
+                                       } else if (RAND_pseudo_bytes(salt, PKCS5_SALT_LEN) < 0)
+                                               goto end;
                                        /* If -P option then don't bother writing */
-                                       if((printkey != 2) && (BIO_write(wbio,
-                                                       (unsigned char *) salt,
-                                                       PKCS5_SALT_LEN) != PKCS5_SALT_LEN)) {
+                                       if((printkey != 2)
+                                          && (BIO_write(wbio,magic,
+                                                        sizeof magic-1) != sizeof magic-1
+                                              || BIO_write(wbio,
+                                                           (char *)salt,
+                                                           PKCS5_SALT_LEN) != PKCS5_SALT_LEN)) {
                                                BIO_printf(bio_err,"error writing output file\n");
                                                goto end;
                                        }
-                               } else if(BIO_read(rbio, (unsigned char *)salt,
+                               } else if(BIO_read(rbio,mbuf,sizeof mbuf) != sizeof mbuf
+                                         || BIO_read(rbio,
+                                                     (unsigned char *)salt,
                                    PKCS5_SALT_LEN) != PKCS5_SALT_LEN) {
                                        BIO_printf(bio_err,"error reading input file\n");
                                        goto end;
+                               } else if(memcmp(mbuf,magic,sizeof magic-1)) {
+                                   BIO_printf(bio_err,"bad magic number\n");
+                                   goto end;
                                }
+
                                sptr = salt;
                        }
 
@@ -552,6 +564,7 @@ bad:
                BIO_printf(bio_err,"bytes written:%8ld\n",BIO_number_written(out));
                }
 end:
+       ERR_print_errors(bio_err);
        if (strbuf != NULL) Free(strbuf);
        if (buff != NULL) Free(buff);
        if (in != NULL) BIO_free(in);