Skip to content
Snippets Groups Projects
Commit 87422f0a authored by Henrik (Grubba) Grubbström's avatar Henrik (Grubba) Grubbström
Browse files

Added cbc module.

Updated to comply with the new "standard".

Rev: src/modules/_Crypto/Makefile:1.4
Rev: src/modules/_Crypto/precompiled_crypto.h:1.4
parent 36483288
No related branches found
No related tags found
No related merge requests found
...@@ -22,7 +22,7 @@ CFLAGS=-Wall -O -shared -fpic $(IFLAGS) $(CPPFLAGS) -pedantic -Wall ...@@ -22,7 +22,7 @@ CFLAGS=-Wall -O -shared -fpic $(IFLAGS) $(CPPFLAGS) -pedantic -Wall
LDFLAGS=-shared -fpic -R$(SSLROOT)/lib -L$(SSLROOT)/lib LDFLAGS=-shared -fpic -R$(SSLROOT)/lib -L$(SSLROOT)/lib
LOADLIBES=-lcrypto -lssl LOADLIBES=-lcrypto -lssl
OBJS=crypto.o md5.o md2.o idea.o des.o invert.o OBJS=crypto.o md5.o md2.o idea.o des.o invert.o cbc.o
# The actual rules # The actual rules
......
...@@ -32,9 +32,8 @@ ...@@ -32,9 +32,8 @@
struct pike_crypto { struct pike_crypto {
struct object *object; struct object *object;
INT32 block_size; INT32 block_size;
INT32 overflow_len; INT32 backlog_len;
unsigned char *iv; unsigned char *backlog;
unsigned char *overflow;
}; };
struct pike_md2 { struct pike_md2 {
...@@ -50,8 +49,7 @@ struct pike_md5 { ...@@ -50,8 +49,7 @@ struct pike_md5 {
}; };
struct pike_idea { struct pike_idea {
unsigned char key[8]; IDEA_KEY_SCHEDULE key;
IDEA_KEY_SCHEDULE e_key, d_key;
}; };
struct pike_des { struct pike_des {
...@@ -63,6 +61,13 @@ struct pike_des { ...@@ -63,6 +61,13 @@ struct pike_des {
unsigned overflow_len; unsigned overflow_len;
}; };
struct pike_cbc {
struct object *object;
unsigned char *iv;
INT32 block_size;
INT32 mode;
};
/* /*
* Defines * Defines
*/ */
...@@ -75,6 +80,8 @@ struct pike_des { ...@@ -75,6 +80,8 @@ struct pike_des {
#define PIKE_IDEA ((struct pike_idea *)(fp->current_storage)) #define PIKE_IDEA ((struct pike_idea *)(fp->current_storage))
#define PIKE_DES ((struct pike_des *)(fp->current_storage)) #define PIKE_DES ((struct pike_des *)(fp->current_storage))
#define PIKE_CBC ((struct pike_cbc *)(fp->current_storage))
/* /*
* Globals * Globals
*/ */
...@@ -83,6 +90,8 @@ struct pike_des { ...@@ -83,6 +90,8 @@ struct pike_des {
* Prototypes * Prototypes
*/ */
void assert_is_crypto_module(struct object *);
/* /*
* Module linkage * Module linkage
*/ */
...@@ -112,4 +121,9 @@ void init_invert_efuns(void); ...@@ -112,4 +121,9 @@ void init_invert_efuns(void);
void init_invert_programs(void); void init_invert_programs(void);
void exit_invert(void); void exit_invert(void);
/* /precompiled/crypto/cbc */
void init_cbc_efuns(void);
void init_cbc_programs(void);
void exit_cbc(void);
#endif /* PRECOMPILED_X_H */ #endif /* PRECOMPILED_X_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment