Changeset 808 for openssl/trunk/crypto/evp/encode.c

Timestamp:

Aug 7, 2014, 8:25:37 PM (11 years ago)

Author:

dmik

Message:

openssl: Merge version 1.0.0n from vendor to trunk.

Location:

openssl/trunk

Files:

• . (modified) (1 prop)
• crypto/evp/encode.c (modified) (3 diffs)

openssl/trunk/crypto/evp/encode.c ¶

@@ -236 +236 @@
              const unsigned char *in, int inl)
         {
-        int seof= -1,eof=0,rv= -1,ret=0,i,v,tmp,n,ln,tmp2,exp_nl;
+        int seof= -1,eof=0,rv= -1,ret=0,i,v,tmp,n,ln,exp_nl;
         unsigned char *d;
 
@@ -320 +320 @@
                          * accept the '\n' */
                         if ((v != B64_EOF) && (n >= 64)) exp_nl=1;
-                        tmp2=v;
                         if (n > 0)
                                 {
@@ -326 +325 @@
                                 n=0;
                                 if (v < 0) { rv=0; goto end; }
+                                if (eof > v) { rv=-1; goto end; }
                                 ret+=(v-eof);
                                 }