Commit 7e6d47cc authored by unknown's avatar unknown
Browse files

Fix merge error

parent 0bcaf5cf

extra/yassl/taocrypt/src/asn.cpp

+2 −2
Original line number Diff line number Diff line
@@ -743,8 +743,8 @@ void CertDecoder::GetName(NameType nt) 
                memcpy(&ptr[idx], "/emailAddress=", 14);

                idx += 14;



                memcpy(&ptr[idx], source_.get_current(), length);

                idx += length;

                memcpy(&ptr[idx], source_.get_current(), length2);

                idx += length2;

            }



            source_.advance(length2);