This commit is contained in:
Zhi Guan
2016-06-06 22:04:44 +02:00
parent 2bf25bd29f
commit 2cb43b7f80
142 changed files with 7768 additions and 1678 deletions

View File

@@ -66,6 +66,8 @@ tests:
lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
update: depend
depend:
@[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
@@ -88,3 +90,12 @@ sm9_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
sm9_err.o: ../../include/openssl/safestack.h ../../include/openssl/sm9.h
sm9_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
sm9_err.o: sm9_err.c
sm9_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
sm9_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
sm9_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
sm9_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
sm9_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
sm9_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
sm9_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sm9.h
sm9_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h sm9.h
sm9_lib.o: sm9_lcl.h sm9_lib.c

View File

@@ -49,6 +49,7 @@
*
*/
#include <openssl/err.h>
#include <openssl/sm9.h>
#include "sm9_lcl.h"
@@ -104,7 +105,7 @@ int SM9_encrypt(SM9_PUBLIC_PARAMS *params,
const char *id, size_t idlen)
{
SM9err(SM9_F_SM9_ENCRYPT, SM9_R_NOT_IMPLEMENTED);
return NULL;
return 0;
}
int SM9_decrypt(SM9_PUBLIC_PARAMS *params,